Commit Graph

390 Commits

Author SHA1 Message Date
wenjiarui 0da3254838 fix 2023-05-14 20:07:34 +08:00
Xu Chang 7bf49f2b6d relation相关的大量代码 2023-05-10 19:42:49 +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 5fd5d095c7 扫码跳转页 文字调整 2023-04-28 12:40:34 +08:00
Wang Kejun 726f2de7e6 fix wechatqrcode/scan 页面显示内容不对 2023-04-28 12:36:52 +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
梁朝伟 c9659a7c8b fix 2023-04-26 11:57:37 +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 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
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
wenjiarui 8cda173e06 build 2023-04-14 20:24: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
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
wangcheng 3a422a1523 提交build文件 2023-04-13 11:46:08 +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 ca4dd2a0e4 改schema 2023-04-12 16:10:30 +08:00
wangcheng ed05cfca3a build文件 2023-04-12 14:13:54 +08:00
wenjiarui 97e03ecfb8 userRlation&subscriptionlist修改entityDict 2023-04-11 20:32:02 +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
wangcheng dcd4f36c69 lib文件 2023-04-10 17:52:30 +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 43bdaeb51b build的一些修正 2023-04-05 14:22:20 +08:00
Wang Kejun b0aa05c33b 扫码 projection去掉buffer 2023-04-01 00:19:41 +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 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 16ee3f75d3 build 2023-03-22 14:34:35 +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
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
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 55977ceabf 对初始relations的判断 2023-03-14 11:32:29 +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
Xu Chang 73a48c9627 适配了front的改动,改变了mp订阅message的函数名 2023-03-03 18:49:55 +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
Xu Chang 9543bf1538 编译出enum类型的storage 2023-02-21 17:56:23 +08:00
Xu Chang 2c9bc28130 修改了userRelation中的listeners属性 2023-02-21 17:30:15 +08:00
Xu Chang 0b6a0b42cb 增加了公众号发跳转小程序认领授权的逻辑 2023-02-20 08:51:58 +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
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 2edf8308e6 lib 2023-02-17 13:52:38 +08:00
Wang Kejun a15762f66e lib 2023-02-17 13:46:57 +08:00
wenjiarui 28a96a0a7c 修改wechatQrCode生成时取application逻辑 2023-02-16 12:00:44 +08:00
Xu Chang 5e2f3983b9 build 2023-02-15 15:59:47 +08:00
Xu Chang c6b4777665 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-15 15:57:50 +08:00
Xu Chang 73a818b7df message和notification的逻辑(未测试) 2023-02-15 15:57:48 +08:00
Wang Kejun f68a2d9b13 小程序码 根据环境使用page url 2023-02-15 14:38:25 +08:00
Wang Kejun 6456a7112f 生成二维码 库qr-image 改成 qecode.react 2023-02-15 14:21:17 +08:00
Wang Kejun f883fa7b14 一些ts waring 及antd 5.2.1 2023-02-15 12:36:13 +08:00
wenjiarui 62984acf2a userEntityGrant支持传入二维码类型 2023-02-15 11:03:29 +08:00
Xu Chang e816133c26 重构了message及相关对象,重构了初始化逻辑,适配了frontend的改动 2023-02-13 19:34:30 +08:00
Xu Chang 71be449b38 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-02-10 12:03:26 +08:00
Xu Chang e06ff541b7 wechatEndpoint暂时支持公开访问,测试小程序线上数据 2023-02-10 12:03:21 +08:00
Wang Kejun 269a966fe6 lib 2023-02-10 11:33:14 +08:00
Xu Chang 2b80f96de3 重构了一下token 2023-02-09 16:52:56 +08:00
Xu Chang 224740cd26 aspectwrapper的返回结构适配,以及token中loginWechat去更新用户信息 2023-02-09 14:37:59 +08:00
Wang Kejun d95164a323 lib 2023-02-09 00:29:45 +08:00
Wang Kejun 0f2296b363 mobile/me 样式调整 2023-02-09 00:28:15 +08:00
Xu Chang 9116ec3a19 完善了公众号用户getUserInfo 2023-02-08 20:49:51 +08:00
Wang Kejun c65043e2c1 小程序获取手机号 errmsg处理 2023-02-08 15:18:42 +08:00
Xu Chang 9709fd2c63 在初始化的时候注入处理被merge用户的逻辑 2023-02-08 15:12:38 +08:00
Xu Chang ae8c87450c token中对shadow用户的处理,以及注入对merge用户查询 2023-02-08 11:38:57 +08:00
Xu Chang 9ea5dbe5d2 build 2023-02-06 21:54:15 +08:00
Wang Kejun 29021b3c01 lib 2023-02-05 20:15:02 +08:00
Xu Chang c461ea0e25 修正了userRelation.byMobile中的几个问题 2023-02-05 12:43:39 +08:00
Xu Chang ad900e64d4 修改以适配front对filter的改动 2023-02-02 16:59:47 +08:00
Xu Chang 0e0ee688ff build暨2.3.5-publish 2023-02-01 21:07:39 +08:00
Wang Kejun 45c818421f 二维码添加 授权是 relations中文翻译 entity不存在 不执行t函数 2023-02-01 16:13:02 +08:00
Xu Chang e8f4738d2e token中取数据的一个小问题 2023-02-01 14:38:26 +08:00
Xu Chang b8199b94bd wechatPublicTag的一些代码暨2.3.4-publish 2023-01-31 21:06:50 +08:00
Xu Chang 219c9474e6 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-01-31 16:36:45 +08:00
Xu Chang ac6e04adc9 application的feature处理了历史缓存的情况 2023-01-31 16:36:31 +08:00
Wang Kejun 5d59f94d56 weChatLoginGrant组件 增加disabled属性 2023-01-31 16:24:27 +08:00
Xu Chang ee262c0f35 merge 2023-01-31 16:19:23 +08:00
Xu Chang 452a148627 wechatPublicTag的一些业务代码,application初始化时处理了一个边界 2023-01-31 16:18:10 +08:00
Xu Chang d9a73291ac extraFile-gallery在创建filter的时候有bug 2023-01-30 17:10:47 +08:00
Xu Chang 7ef242ec49 auth/mobile 2023-01-30 10:55:07 +08:00
Xu Chang ef518fbdfc 重编译 2023-01-19 20:56:48 +08:00
Xu Chang 666df7f216 适配了oak-domain对声明的简化 2023-01-19 14:58:23 +08:00
Xu Chang 0b9f319dd8 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-01-19 09:21:00 +08:00
Xu Chang f9beba6c1e userRelationList页面上监听relations的变化 2023-01-18 23:09:09 +08:00
Xu Chang f1e8f2584d userRelation中action的设置 2023-01-18 22:04:06 +08:00
Xu Chang be2fd0af0e 在onUser页面上授予权限时,action的统一 2023-01-18 17:12:31 +08:00
Wang Kejun 948e3be220 授权记录 先隐藏 2023-01-17 19:43:36 +08:00
Wang Kejun ed6f35194a 作为组件时 隐藏返回键 2023-01-17 19:22:19 +08:00
Wang Kejun cc5408ab88 config 短信设置 2023-01-17 17:22:04 +08:00
Xu Chang 814e478222 增加了platform和system的反指指针,修正了userRelation中的一些动作 2023-01-16 19:38:08 +08:00
Xu Chang 5bc27d3c1a userRelationList优化了一个出错处理(似乎没效果) 2023-01-15 12:50:34 +08:00
Wang Kejun f049eaff65 message userid 不存在加filter 2023-01-12 13:43:37 +08:00
Wang Kejun c82be0fa53 config.passport 可能未设置 2023-01-12 12:34:03 +08:00
Wang Kejun 90f41198a4 样式调整 2023-01-11 15:19:04 +08:00
Wang Kejun feaf8fd604 授权页面 less调整 2023-01-11 14:56:55 +08:00
Wang Kejun b4bb999373 增加 头像上传组件 2023-01-11 12:36:23 +08:00
Xu Chang fce06b9f72 适配了新的relation 2023-01-10 21:54:40 +08:00
Wang Kejun c87d9eae32 个人信息 2023-01-10 17:20:19 +08:00
Xu Chang 8f7f960e4b UserManager改成对root和普通用户通用 2023-01-09 18:41:14 +08:00
梁朝伟 89a693b23a fix 2023-01-09 11:30:50 +08:00
Wang Kejun 85a1e5f103 message 调整 2023-01-08 15:14:10 +08:00
Xu Chang 09be4a7a73 token-me-less的小更改 2023-01-07 10:19:56 +08:00