Commit Graph

1076 Commits

Author SHA1 Message Date
wenjiarui 27ed2f6ac5 fi8x 2023-08-14 21:21:32 +08:00
Wang Kejun 6d6e850da4 修正 area data export 2023-08-14 20:47:02 +08:00
Xu Chang ed1300f4eb 编译器调整后Action的语句顺序有小的变化 2023-08-14 19:41:39 +08:00
Xu Chang 23130918d1 i18ns的编译 2023-08-14 19:12:29 +08:00
wenjiarui b2ae028203 build 2023-08-14 15:00:52 +08:00
wenjiarui 6729e4c78c build 2023-08-14 14:57:15 +08:00
Wang Kejun 7851ed5947 修正 模版接受时 弹出提示问题 2023-08-14 14:14:43 +08:00
Xu Chang 4ae7c24362 build 2023-08-14 13:47:32 +08:00
Xu Chang 2c6343e520 Merge branch 'auth' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into auth 2023-08-14 13:11:54 +08:00
Xu Chang 0abbf84045 调整了编译出来的entity定义的目录位置 2023-08-14 13:11:50 +08:00
Wang Kejun 30a5767c85 wechatlogin、parasite、articlleMenu 调整为entiydesc 2023-08-13 20:42:13 +08:00
Xu Chang 195b97fdd5 修正几个未适配新的编译器 2023-08-12 17:34:53 +08:00
Xu Chang 43754a75ae actionAuth的初始数据修正 2023-08-09 19:14:28 +08:00
Xu Chang 43a33da2bb 适配了对domain线filter的大改动 2023-08-09 18:59:44 +08:00
qsc fdf705b110 warning 修复 2023-08-09 17:47:50 +08:00
qsc 55ff76b408 warning 修复 2023-08-09 15:13:37 +08:00
wenjiarui deec91e0d8 build 2023-08-08 18:57:57 +08:00
wangwenchen ae3a64dd41 采集码过期优化 2023-08-08 18:56:29 +08:00
Xu Chang 6419d00cc4 merge 2023-08-08 12:34:44 +08:00
Xu Chang fb2964600f userEntityGrant在confirm时,openRootMode 2023-08-08 12:32:44 +08:00
wenjiarui 8024f75201 build 2023-08-07 17:47:42 +08:00
Wang Kejun e90c05a0e7 messageTypeTemplateId select free 2023-08-07 17:46:33 +08:00
Wang Kejun 7222f1c4b3 删除 miniprogram_mpm 2023-08-07 17:29:34 +08:00
Wang Kejun bc74762300 修正 player 加上projection 2023-08-07 17:14:03 +08:00
wenjiarui eb833e0ab2 修改登录逻辑 2023-08-07 14:59:55 +08:00
Wang Kejun f27a18bf3c locales resendAfter调整 2023-08-07 14:11:46 +08:00
qsc 3f6a5eb655 帮助文档页面添加更新功能 2023-08-06 20:22:09 +08:00
wenjiarui 4272b91be4 修改parasitechcker 2023-08-06 16:59:46 +08:00
qsc 2cb3ce7560 帮助文档article/upsert页面样式调整 2023-08-06 15:16:37 +08:00
梁朝伟 5be4f0e2e9 fix extraFile i18 2023-08-06 14:33:45 +08:00
Xu Chang 1f3d118920 merge dev 2023-08-04 11:26:07 +08:00
wenjiarui d531f6f218 采集吗样式 2023-08-03 20:39:47 +08:00
wenjiarui dce60f4331 buiild 2023-08-03 18:32:00 +08:00
wenjiarui 0596bff5e3 fix 2023-08-03 18:21:18 +08:00
Xu Chang 44e13f15e5 userRelation页面上的一些细节 2023-08-03 18:09:57 +08:00
wenjiarui e55b0248d4 修改parasitetrigger 2023-08-03 17:33:19 +08:00
Xu Chang cce3716067 修正了userRelation的一些样式 2023-08-03 16:50:25 +08:00
wenjiarui 33ec4d9a32 build 2023-08-03 13:57:44 +08:00
wenjiarui 23d81e1e55 build 2023-08-03 12:24:13 +08:00
wenjiarui 425d250ea2 lib 2023-08-03 12:02:17 +08:00
Xu Chang 1311f09e46 build 2023-08-03 11:35:26 +08:00
wangwenchen e91f60a97e lib 2023-08-02 18:14:36 +08:00
Xu Chang 9d49b2bcca token在loadTokenInfo时容个错 2023-08-02 17:39:36 +08:00
wangwenchen b04c1e5310 虚拟登陆 注册企业 2023-08-01 18:23:30 +08:00
Xu Chang 6fe0cb22fc system中的platform改成非必填 2023-08-01 15:54:21 +08:00
Xu Chang 6853ec4fc2 将user/login移到component里,微调了system结构 2023-08-01 15:47:56 +08:00
qsc b7b69f5b4d lib 2023-08-01 15:21:42 +08:00
qsc 708b590fdf general build 2023-08-01 14:26:25 +08:00
qsc c5347a3f32 general build 2023-08-01 14:24:03 +08:00
qsc 35091fa90b fix冲突 2023-08-01 13:51:48 +08:00
Xu Chang 79745b5eb8 为message-user增加了update权限 2023-07-28 11:32:50 +08:00
Xu Chang a7794749c2 将getUserIdsByActionAuth函数移除 2023-07-26 18:06:00 +08:00
Xu Chang 7c30864f89 重写了merge user所导致的对查询的改写,为了避免重复调用产生递归,此处使用新的filter来替代掉原来的 2023-07-26 15:24:10 +08:00
Xu Chang b9e2760195 rewriteOperation改成同步 2023-07-26 10:26:09 +08:00
Xu Chang cef9370ab4 重新调整了重写userRef导致的filter的逻辑 2023-07-25 18:40:50 +08:00
Xu Chang 03f015bbef 重写了对usermerge所产生的查询重写的逻辑 2023-07-25 17:25:54 +08:00
qsc 5b58692efb 帮助文档 2023-07-25 16:47:23 +08:00
Xu Chang 146a2f3e65 修正了userEntityGrant触发建立wechatQrCode事件的先后顺序 2023-07-25 11:47:03 +08:00
Xu Chang 160f84fd40 wechatQrCode也需要deduce 2023-07-25 10:27:03 +08:00
Xu Chang d381390fd4 增加了userEntityGrant的deduce配置 2023-07-25 10:19:46 +08:00
Xu Chang 23690ae3b8 适配一下domain的接口声明 2023-07-22 19:36:21 +08:00
Xu Chang 030702de5d 增加了actionAuth的初始数据,修改了一对多的子查询 2023-07-22 18:46:50 +08:00
梁朝伟 20931ba95e i18 增加对true和false的翻译 2023-07-17 19:13:22 +08:00
梁朝伟 0a11378e58 article list 加上filter条件 2023-07-14 11:40:02 +08:00
Wang Kejun 6c2b9b11b9 fix articleMenu 更新自身title 重名判断时 要排除自身 2023-07-14 11:31:33 +08:00
梁朝伟 7b42581b9b fix artcleMenu页面加上filter 2023-07-14 11:27:32 +08:00
梁朝伟 43f773af54 fix lib 2023-07-14 11:16:28 +08:00
qsc f0182669d5 帮助文档调整 2023-07-13 21:47:17 +08:00
Xu Chang bdbd825cfb message增加了deduce的权限推断,去掉了notification和messageSystem的多余推断 2023-07-13 21:46:18 +08:00
qsc a4f2f9f8c1 帮助文档页面调整 2023-07-13 21:42:47 +08:00
qsc 5f84e802ea Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-07-13 20:50:43 +08:00
qsc 3e08ef1abd 帮助文档展示页面调整 2023-07-13 20:48:08 +08:00
Xu Chang f1d9685128 增加了OakUserInfoLoadingException异常 2023-07-13 11:14:57 +08:00
Wang Kejun 3a5d8b1468 pageheader内容边距: 在576以上是10px ,在576px以下是5px 2023-07-12 14:05:41 +08:00
Xu Chang b93b6000e8 Merge branch 'auth' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into auth 2023-07-12 12:08:49 +08:00
qsc ea9341843b 帮助文档页面调整 2023-07-12 11:25:27 +08:00
梁朝伟 4695639d5c fix 2023-07-11 13:26:45 +08:00
梁朝伟 1d9a429a4d merge 2023-07-11 13:22:53 +08:00
qsc b3063e2c66 article默认展开修改 2023-07-11 10:12:54 +08:00
qsc 67d767cb00 article默认展开修改 2023-07-11 10:10:11 +08:00
Xu Chang 930a35c8c4 将wechatQrCode配置成selectFree的 2023-07-10 11:25:17 +08:00
qsc f816023411 修改 2023-07-07 19:19:48 +08:00
qsc a9d6192432 文章分类upsert页面修改 2023-07-06 16:06:31 +08:00
Xu Chang f8c4555a44 在创建userRelation时增加了对权限的判断 2023-07-06 12:42:00 +08:00
Wang Kejun 9a54622c10 lib 2023-07-05 11:58:56 +08:00
qsc d79163bb73 帮助文档修改 2023-07-05 11:36:46 +08:00
qsc 6e553992be 线 2023-07-03 21:11:55 +08:00
qsc ef03f6ede8 帮助文档 2023-07-03 21:05:13 +08:00
Wang Kejun 4f46c178d6 lib 2023-07-03 21:01:38 +08:00
qsc 8f61270028 帮助文档手机端适配 2023-07-03 20:45:51 +08:00
qsc df2a8651c2 复制链接 2023-07-03 20:10:57 +08:00
qsc 86b7bf046c 帮助文档 2023-07-03 19:09:56 +08:00
qsc 907c3152c0 帮助文档 2023-07-03 18:19:51 +08:00
qsc 3318724ea6 帮助文档 2023-07-03 13:12:44 +08:00
qsc e7a3fbee7d Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-07-03 13:09:00 +08:00
qsc e91507ef7f 帮助文档 2023-07-03 13:08:51 +08:00
Wang Kejun 3b30154048 lib 2023-07-03 11:45:08 +08:00
qsc e85c53c4b5 帮助文档 2023-06-29 14:21:23 +08:00
qsc 558fbdf149 ts报错 2023-06-29 10:07:08 +08:00
wenjiarui bc871e7327 fix 2023-06-28 21:41:51 +08:00
qsc 915cb80a3b lib 2023-06-28 19:53:42 +08:00
qsc 4cdac37238 修改 2023-06-28 19:16:28 +08:00
qsc 641f55ef44 帮助文档 2023-06-27 15:31:10 +08:00
qsc 43ea58b8c9 冲突 2023-06-27 15:23:39 +08:00
qsc 467d14394e 冲突 2023-06-27 15:20:18 +08:00
wenjiarui d4f9988cd4 build 2023-06-25 10:12:50 +08:00
Xu Chang a3352df67e user中增加了getUserIdsByActionAuth方法 2023-06-18 11:45:41 +08:00
Xu Chang 379b443942 笔误 2023-06-14 17:10:17 +08:00
Xu Chang a03c99b87e build 2023-06-14 17:02:47 +08:00
梁朝伟 2ecd2b99b8 extraFile/forUrl组件改动 2023-06-13 11:05:00 +08:00
Xu Chang 22a2c8e675 build 2023-06-12 19:54:51 +08:00
刘欣雨 914bbbfe46 'fix' 2023-06-09 20:37:20 +08:00
刘欣雨 c602243c6b 'fix' 2023-06-08 21:01:15 +08:00
梁朝伟 6457805296 merge 2023-06-08 13:26:21 +08:00
梁朝伟 3f0b2460df extraFile forUrl组件完成 extraFile组件改动 2023-06-08 12:45:23 +08:00
wangwenchen 17689ba1cf platfrom entityId 2023-06-07 19:11:52 +08:00
梁朝伟 3b528555e2 解析微信文章链接获取图片和标题 2023-06-01 18:33:35 +08:00
qsc acea725960 图片实现拖拽效果 排序 2023-05-30 12:49:53 +08:00
梁朝伟 a50d4a1435 线上先不显示微信账号绑定入口 2023-05-26 16:23:47 +08:00
梁朝伟 37e2e7a8ff application数据结构改动 2023-05-26 16:18:14 +08:00
Xu Chang f7a734f87e 修正了大量userRelation中的界面样式和代码 2023-05-26 15:46:01 +08:00
梁朝伟 9ed4eaf28c 支持微信公众号授权登录 2023-05-26 12:30:54 +08:00
Wang Kejun daf140d097 微信登录 处理backUrl的情况 2023-05-19 23:41:12 +08:00
wenjiarui c4ec64df7a build 2023-05-14 20:19:29 +08:00
wenjiarui 8b8cc1798c Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-05-14 20:07:37 +08:00
wenjiarui 0da3254838 fix 2023-05-14 20:07:34 +08:00
Wang Kejun f550967183 fix 2023-05-14 19:24:04 +08:00
Xu Chang 7bf49f2b6d relation相关的大量代码 2023-05-10 19:42:49 +08:00
Wang Kejun 75c517cc3c logingwechat 增加 wechatloginid参数 2023-05-10 12:18:15 +08:00
Wang Kejun 4f73b42ca2 lib 2023-05-08 14:42:47 +08:00
Xu Chang a0fca75ee5 重构并删除了role对象 2023-05-04 20:41:40 +08:00
wangcheng 26f59c4830 编译文件 2023-05-03 21:20:47 +08:00
Xu Chang f8379d6f83 关于auth的大量更新 2023-04-28 20:00:38 +08:00
Wang Kejun 8650443f59 fix wechatqrcode 执行过期 未生效 2023-04-28 13:32:31 +08:00
Wang Kejun 5fd5d095c7 扫码跳转页 文字调整 2023-04-28 12:40:34 +08:00
Wang Kejun 726f2de7e6 fix wechatqrcode/scan 页面显示内容不对 2023-04-28 12:36:52 +08:00
Wang Kejun be6a5d702d 增加 removeToken清除本地token 2023-04-28 11:15:30 +08:00
wangcheng d4a33bfa36 提交编译文件 2023-04-27 11:33:36 +08:00
wangcheng b34e486970 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-27 11:32:40 +08:00
wangcheng f01a7eff15 新增地铁管理 2023-04-27 11:32:25 +08:00
Wang Kejun 281ba714c7 lib 2023-04-26 13:25:45 +08:00
Wang Kejun f5d64a6545 wechatlogin 生成二维码 2023-04-26 12:48:03 +08:00
梁朝伟 c9659a7c8b fix 2023-04-26 11:57:37 +08:00
Wang Kejun 2e9437b4fa lib 2023-04-26 09:56:01 +08:00
Wang Kejun 8f2b10044e 绑定微信号 二维码 2023-04-26 09:52:16 +08:00
Wang Kejun 0ea17ac55e 去掉 lib下 actiontabpanel、actionbtnpanel 2023-04-25 14:43:27 +08:00
Wang Kejun 9c04b61a36 去掉 icon-font-awesome 2023-04-25 14:40:23 +08:00
Wang Kejun b90e0a7d86 去掉 userentitygrant cell button 2023-04-25 14:32:37 +08:00
wangcheng fa482db47b 提交lib文件 2023-04-25 10:17:20 +08:00
梁朝伟 dea4cb8a1b themeState 2023-04-25 10:12:48 +08:00
Wang Kejun 2f7bbe2984 lib 2023-04-25 09:56:00 +08:00
Wang Kejun b26338272f wechatUser refreshToken 2023-04-25 09:45:31 +08:00
Wang Kejun 6605d992fa user/info mobile$user取下user 2023-04-24 19:06:06 +08:00
wenjiarui 75bab03a7f Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-24 19:05:20 +08:00
wenjiarui e0957e5c8f 修改mergeUser时merge自己的bug 2023-04-24 19:05:16 +08:00
wangcheng 9b29f3e87a Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-24 15:26:35 +08:00
wangcheng 1c3207adbe 初始化地铁数据 2023-04-24 15:26:29 +08:00
Wang Kejun bbfe33720c 二维码 小程序 支持小时选择 2023-04-24 12:21:21 +08:00
wenjiarui c677499282 wechatUser.accessToken度 2023-04-24 12:15:15 +08:00
Wang Kejun 5083ea100a Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-23 16:42:41 +08:00
Wang Kejun 110477a5f0 二维码授权 增加分钟、小时选择 2023-04-23 16:42:00 +08:00
wangcheng db6b0a35cc 新增地铁线及站点entities 2023-04-23 16:38:08 +08:00
Wang Kejun 91f3162a2a 微信 jssdk 2023-04-20 15:14:23 +08:00
Wang Kejun 2ebcde733b 跳转小程序配置 2023-04-20 09:54:33 +08:00
Wang Kejun ceaf1004fb application 公众号增加小程序跳转配置 2023-04-19 23:05:25 +08:00
Wang Kejun 4bec5506b7 lib 2023-04-19 14:31:29 +08:00
Wang Kejun dbabfc0dc2 originalId 声明问题 2023-04-19 09:50:22 +08:00
Wang Kejun d406b70579 新增feature weiXinJsSdk 来支持jssdk api调用 2023-04-18 17:59:46 +08:00
wenjiarui 3bf5d75dad build 2023-04-17 19:21:09 +08:00
Xu Chang 98ce89072f token中的bug 2023-04-17 19:13:53 +08:00
Xu Chang 510c88b86a token中原先登录路径上的小bug 2023-04-17 11:39:01 +08:00
wenjiarui 46b9be2846 修改token在有同system下wechatUser但无当前system下wechatUser的逻辑 2023-04-17 11:23:19 +08:00
wenjiarui 8cda173e06 build 2023-04-14 20:24:05 +08:00
Xu Chang 6c96f6a331 没编译appdomain 2023-04-14 20:10:05 +08:00
Xu Chang ce00384ee2 2.5.8-publish 2023-04-14 18:07:21 +08:00
wenjiarui 8393958557 build 2023-04-14 12:23:52 +08:00
Wang Kejun 84bf078e00 ActionBtnPanel引用调整 2023-04-14 12:22:13 +08:00
wangcheng da2e085f8a 编译文件 2023-04-14 09:23:02 +08:00
wenjiarui 418fe68a4b build 2023-04-13 18:56:41 +08:00
wangcheng 9de904ff51 build文件 2023-04-13 13:46:34 +08:00
Xu Chang a0ad920507 actionPanel中的properties的修正 2023-04-13 12:39:17 +08:00
Xu Chang 04c8b71057 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-13 11:54:37 +08:00
Xu Chang 1da972b428 适配front 2023-04-13 11:54:22 +08:00
wangcheng 3a422a1523 提交build文件 2023-04-13 11:46:08 +08:00
wenjiarui 0c1bcb5c91 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-12 23:02:12 +08:00
wenjiarui b113760f34 fix 2023-04-12 23:02:10 +08:00
Wang Kejun c09f2ae6ba features extraFile getUrl声明 2023-04-12 22:51:16 +08:00
wenjiarui 17faf4bc26 build 2023-04-12 20:16:11 +08:00
Wang Kejun 903d6738a4 userrelation upsert 申明 2023-04-12 19:48:58 +08:00
wenjiarui fc24142008 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-12 19:27:01 +08:00
wenjiarui e530a156f3 修改schema 2023-04-12 19:26:58 +08:00
Wang Kejun 09657078db 小程序上传时, 打开文件失败提示 2023-04-12 17:03:54 +08:00
wenjiarui ca4dd2a0e4 改schema 2023-04-12 16:10:30 +08:00
wangcheng ed05cfca3a build文件 2023-04-12 14:13:54 +08:00
Xu Chang b6e4a25f14 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-12 13:41:57 +08:00
Xu Chang 16df186172 extrafile中的属性required设置 2023-04-12 13:41:42 +08:00
wenjiarui 97e03ecfb8 userRlation&subscriptionlist修改entityDict 2023-04-11 20:32:02 +08:00
wenjiarui 2f12abdef2 二维码异步修改 2023-04-11 17:41:14 +08:00
Xu Chang 64dca4a470 extrafile的定义 2023-04-11 15:43:13 +08:00
Wang Kejun 287c96fd52 extrafile properties 2023-04-11 15:13:04 +08:00
wenjiarui e67e77c718 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-10 18:16:33 +08:00
wenjiarui 58fedd15d5 fix 2023-04-10 18:16:29 +08:00
wangcheng dcd4f36c69 lib文件 2023-04-10 17:52:30 +08:00
Xu Chang 425f5d0af3 build中的一些小问题 2023-04-10 17:41:55 +08:00
梁朝伟 c8f73a8729 fix 2023-04-10 17:23:36 +08:00
梁朝伟 d90db33b25 fix 2023-04-10 16:37:21 +08:00
梁朝伟 43c9a82f45 fix properties 2023-04-10 09:21:40 +08:00
Xu Chang 3dda0abe2f Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-05 14:22:28 +08:00
Xu Chang 43bdaeb51b build的一些修正 2023-04-05 14:22:20 +08:00
Wang Kejun fa30041f86 extraFile disabled申明 2023-04-04 12:40:16 +08:00
wenjiarui f8e67846ca Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-04-03 10:39:24 +08:00
wenjiarui 25e797bb10 二维码注入当不需要取buffer时不去调用外部接口 2023-04-03 10:39:18 +08:00
Wang Kejun b0aa05c33b 扫码 projection去掉buffer 2023-04-01 00:19:41 +08:00
wenjiarui 8340ba774c logout循环注掉 2023-03-31 22:40:03 +08:00
wenjiarui 169c8f0735 token死循环先注掉 2023-03-31 22:35:47 +08:00
Xu Chang 887c33a610 增加了logout 2023-03-31 21:27:31 +08:00
wenjiarui 4a2ec48e7e 二维码创建逻辑改为trigger 2023-03-31 20:23:31 +08:00
Xu Chang b329f38eff 分离了selectionRewriter,前台也注入这个逻辑 2023-03-31 16:09:00 +08:00
Xu Chang 70825388c5 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-31 14:45:38 +08:00
Xu Chang 6f5817855f userLogin的业务逻辑重构 2023-03-31 14:45:25 +08:00
wenjiarui c76862bdc9 小程序二维码注入 2023-03-31 14:04:28 +08:00
Xu Chang c6cf1847c6 BackendContext实现了refineOpRecord 2023-03-30 19:53:54 +08:00
Xu Chang d31c3995b6 新的oper对象的编译,mergeUser时处理了已经merge指向本user的行 2023-03-30 19:33:52 +08:00
Xu Chang 6355b6c55d userRelation适配frontend的改动 2023-03-22 20:26:17 +08:00
Xu Chang 04b5f41c61 token在get时,接受context作为输入。userRelation的一个oakId没置 2023-03-22 17:33:47 +08:00
Xu Chang 566cc9c805 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-22 14:34:39 +08:00
Xu Chang 16ee3f75d3 build 2023-03-22 14:34:35 +08:00
wenjiarui 0585f09184 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-22 12:00:55 +08:00
wenjiarui 0725963f6a 当userENtityGrant过期时,推送过期消息 2023-03-22 12:00:51 +08:00
梁朝伟 23ca1c1256 commoni18增加detail 2023-03-22 10:47:46 +08:00
Wang Kejun c5a16eb037 token/me mobile样式小调整 2023-03-20 22:17:41 +08:00
Wang Kejun 1e11b81b72 公众号网页同步微信信息注释了,微信现在不能通过getuserinfo获取昵称头像了 2023-03-20 21:52:07 +08:00
Wang Kejun 6d4825ae24 修复 一处redirectToAfterConfirm没有传入到userentitygant组件中 2023-03-19 22:42:19 +08:00
梁朝伟 f48157d119 小程序editori 2023-03-18 16:15:23 +08:00
wenjiarui 6e026c1740 useruserEntityGrant默认qrCodeType为public 2023-03-18 12:25:10 +08:00
Xu Chang d34aed0b0f 2.5.5-publish 2023-03-17 19:57:50 +08:00
wenjiarui 296b335ffd 修改notification对message状态影响trigger 2023-03-17 19:37:08 +08:00
Xu Chang 7c7684b163 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-17 18:58:49 +08:00
Xu Chang 4081f5e23d notification中的bug以及message中的容错 2023-03-17 18:58:43 +08:00
Wang Kejun 1df1d615fb 小程序 跳到tabBar 必须switchTab 2023-03-17 16:56:22 +08:00
wenjiarui e3797247a2 loginByMobile处理mergedUser情况 2023-03-17 15:48:38 +08:00
wenjiarui 6e20f5f6e7 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-16 21:48:15 +08:00
wenjiarui 0967d37350 build 2023-03-16 21:48:13 +08:00
Wang Kejun 0a5ef37233 fix 授权领取 跳转修正 2023-03-16 21:47:27 +08:00
Wang Kejun 6feeb9fce9 fix 授权领取页面调整 2023-03-16 21:11:28 +08:00
Wang Kejun f251273f9c 授权 没有redirectTo 不显示 2023-03-16 18:58:58 +08:00
wenjiarui eb602169e5 userEntityGrant确认时生成relationblockblockTrigger 2023-03-16 18:53:34 +08:00
Wang Kejun d4421f721b 修复 wechatqrcode 一处笔误 2023-03-16 09:46:42 +08:00
wenjiarui 7c9dbe529b build 2023-03-15 21:58:36 +08:00
Wang Kejun 20beec54fb fix notification触发器 拼接url时 公众号的时候 加上域名 2023-03-15 15:55:21 +08:00
Xu Chang 30e90f396a build 2023-03-15 10:53:40 +08:00
Wang Kejun 496a59aca3 root 添加权限 手机号可以使用 2023-03-15 10:12:48 +08:00
Xu Chang 2f2a3b9add userRelation检查可用的relation 2023-03-14 20:15:33 +08:00
Xu Chang 5a0ce2996a userRelation的relations改成默认最高级别 2023-03-14 17:56:32 +08:00
Xu Chang e3098bcb9f application的feature修改了getApplication的返回声明 2023-03-14 16:12:33 +08:00
梁朝伟 e680702864 useRelation list properties定义小改 2023-03-14 11:37:27 +08:00
Xu Chang 3446885cc6 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-03-14 11:32:44 +08:00
Xu Chang 55977ceabf 对初始relations的判断 2023-03-14 11:32:29 +08:00
梁朝伟 b980e281fa 小程序editor改个icon显示 2023-03-14 10:53:59 +08:00
Xu Chang ea3d5f1dd8 修改了subscribeMessage的最后一个参数 2023-03-14 10:49:58 +08:00
Xu Chang c226fd32fe subscribeMessageMp增加了一个参数 2023-03-14 10:45:57 +08:00
Xu Chang 8c60e5c149 搬部分业务无关的抽象组件到front里 2023-03-10 17:47:16 +08:00
Xu Chang a4f863cdea 修改了新的componentToProps下的编译问题 2023-03-08 15:47:21 +08:00
wangwenchen 7f3e9ebe93 linniu改到@oak-frontend-base 2023-03-07 16:41:00 +08:00
Xu Chang a7e1a7f697 增加了colorDict的初始化 2023-03-07 15:14:02 +08:00
梁朝伟 81ea42685c fix 2023-03-07 10:58:11 +08:00
梁朝伟 b6a9b2f2a1 type 增加actionBtnPanelProps类型定义 2023-03-06 19:15:57 +08:00
梁朝伟 3415e5c7db i18增加创建时间和更新时间 2023-03-06 18:13:59 +08:00
Xu Chang 73a48c9627 适配了front的改动,改变了mp订阅message的函数名 2023-03-03 18:49:55 +08:00
Wang Kejun d0fd8d6fca 搜索组件 支持money类型 2023-03-03 11:27:10 +08:00
Wang Kejun f94b763aa4 message entities name修改 2023-03-01 17:30:48 +08:00
Xu Chang 07c38629ca 修改了token改变对页面的刷新,修改了context对初始化过程中出错的处理 2023-03-01 17:11:52 +08:00
wenjiarui a64e1f431d build 2023-02-28 06:17:34 +08:00
wenjiarui 351f873227 build 2023-02-27 20:03:26 +08:00
Xu Chang 6f1f8b34f8 build 2023-02-25 20:08:35 +08:00
Wang Kejun 31acbb1f75 解决ts申明问题 2023-02-25 20:04:03 +08:00
Xu Chang 1767a31066 编译中的一些问题,以及对Front的适配 2023-02-25 19:35:39 +08:00
Wang Kejun e9d9a2df2d 增加 搜索组件 2023-02-24 16:48:45 +08:00
Wang Kejun f1cf36d92b amap组件 2023-02-22 11:10:33 +08:00
Xu Chang 2983c7c732 新编译的storage 2023-02-21 18:57:51 +08:00
Xu Chang 9543bf1538 编译出enum类型的storage 2023-02-21 17:56:23 +08:00
Xu Chang 86003d290f Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-21 17:30:19 +08:00
Xu Chang 2c9bc28130 修改了userRelation中的listeners属性 2023-02-21 17:30:15 +08:00
Wang Kejun 7c3b649b67 lib 2023-02-21 17:18:22 +08:00
Xu Chang 75a7651331 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-21 16:33:46 +08:00
Xu Chang 46ef4b9e08 新的编译器对enumeration的支持 2023-02-21 16:33:42 +08:00
Wang Kejun 36c8bc85ba entityactionbtn 已改成 acttionBtnPanel 2023-02-21 15:17:18 +08:00
Xu Chang 4ffcb85bdd wechatQrCode 2023-02-20 09:27:54 +08:00
Xu Chang 0b6a0b42cb 增加了公众号发跳转小程序认领授权的逻辑 2023-02-20 08:51:58 +08:00
Xu Chang 7957b64257 手机号冲突的情况默认改成合并 2023-02-20 06:43:33 +08:00
Xu Chang a12f8656ee userEntityGrant中的OakRowInconsistencyException处理 2023-02-20 04:06:53 +08:00
Wang Kejun 3a00ccad61 去掉打印 2023-02-19 22:06:17 +08:00
Xu Chang 4c836ba649 userEntityGrant的临时生成二维码代码 2023-02-19 21:27:15 +08:00
Wang Kejun 0fb34a9fd4 小程序码 动态生成不物化 2023-02-19 21:21:31 +08:00
Wang Kejun 91096c8325 小程序 根据开发环境生成二维码 2023-02-19 18:02:16 +08:00
Wang Kejun 819406c409 fix 判断 图片base64正则 2023-02-17 20:21:35 +08:00
wenjiarui 1698de7f37 fixts 2023-02-17 19:48:04 +08:00
Wang Kejun 584122a23b 页面list按钮调整 2023-02-17 15:49:11 +08:00
Wang Kejun 3fe637b9fd application 调整小程序config声明 2023-02-17 15:26:09 +08:00
Wang Kejun 2edf8308e6 lib 2023-02-17 13:52:38 +08:00