Commit Graph

342 Commits

Author SHA1 Message Date
Xu Chang fbe64bdfe5 userRelation 2022-11-24 17:36:02 +08:00
Xu Chang c4935899fe build 2022-11-23 18:11:15 +08:00
Xu Chang a4b1721ce9 mergeandbuild 2022-11-23 17:45:55 +08:00
Wang Kejun da5a80de2a fix merge出来问题 2022-11-23 15:51:21 +08:00
Wang Kejun 612a7a8adf fix getApplication 笔误 2022-11-23 15:46:19 +08:00
Wang Kejun f28612c9b7 fix 2022-11-23 15:27:43 +08:00
Wang Kejun 476b283002 修正 2022-11-23 15:22:55 +08:00
Wang Kejun 425ff9a099 build 2022-11-23 15:20:03 +08:00
Wang Kejun f2c5643158 修复 ts 2022-11-22 15:05:16 +08:00
Xu Chang 227c07a345 先干掉编译中的错误 2022-11-22 13:32:16 +08:00
Xu Chang d3b8805112 适配2.0版本框架,还差一点 2022-11-22 12:54:57 +08:00
Xu Chang 90e6fbcb4f 2.0.1 2022-11-22 11:45:04 +08:00
Wang Kejun 19ba888f2c application 2022-11-22 11:42:18 +08:00
Wang Kejun fca8cf256b 授权登录组件 2022-11-21 18:16:48 +08:00
Wang Kejun db168b9cf4 调整 2022-11-17 16:04:48 +08:00
Wang Kejun 99d5bf0b54 微信登录ui 2022-11-17 09:53:10 +08:00
Wang Kejun 3074ab5aba 模拟微信登录 未完成 2022-11-16 17:41:29 +08:00
Wang Kejun fe5b232faa 修正 2022-11-16 14:37:46 +08:00
Wang Kejun f930cddcd2 转让 回收关系 待测试 2022-11-16 14:24:11 +08:00
Wang Kejun 076def8819 授权接收 2022-11-16 14:07:02 +08:00
Wang Kejun a610f2b46e 调整 2022-11-16 11:04:56 +08:00
Wang Kejun f4a6147d0a web 扫码后中间页处理 2022-11-16 10:58:24 +08:00
Wang Kejun b2ea032d65 web download组件 2022-11-15 20:13:03 +08:00
Wang Kejun d91bb08aac 生成二维码的组件 及 授权详情 2022-11-15 19:14:00 +08:00
Wang Kejun 1ccb777c6f 按时间倒序排 2022-11-15 10:11:46 +08:00
Wang Kejun c0f9169d4b 记录 可以禁用 2022-11-15 10:10:36 +08:00
Wang Kejun bf508951d7 修正 一些错误 及 新增查看邀请记录 2022-11-14 18:58:54 +08:00
Wang Kejun fab2978347 设置模版 keyword 2022-11-14 12:13:36 +08:00
Wang Kejun a95f570654 应用 config配置 2022-11-11 17:54:07 +08:00
Wang Kejun bf6592f0d0 platform application system 相关页面 2022-11-11 14:33:21 +08:00
Wang Kejun 158c5eee21 平台详情 未完成 2022-11-10 18:08:02 +08:00
Wang Kejun c19733a144 platform config配置 todo需要对每项输入进行文字说明 2022-11-10 16:19:41 +08:00
Wang Kejun c41b28cb80 amap 2022-11-09 11:52:29 +08:00
Wang Kejun ce2fdcb197 result组件 2022-11-09 09:28:45 +08:00
Wang Kejun 1810aebaa2 result 2022-11-03 12:44:37 +08:00
Wang Kejun b7440947fb svg 复制到 lib 2022-11-03 00:20:52 +08:00
Xu Chang 165217a179 exception.name的可靠处理 2022-11-02 20:45:37 +08:00
Xu Chang ab65a79bff Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2022-11-02 18:17:08 +08:00
Xu Chang 95d36942a2 build 2022-11-02 18:17:05 +08:00
Wang Kejun c491aa5623 errorpage 2022-11-02 14:14:33 +08:00
Wang Kejun 69dbd362be lib 2022-11-02 13:41:18 +08:00
Xu Chang 6856ed8696 userRelation的小bug 2022-11-02 12:42:22 +08:00
Wang Kejun 63c6990e42 lib 2022-11-02 11:58:33 +08:00
Xu Chang 89a534326e Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2022-11-02 10:27:27 +08:00
Xu Chang 966396387c 全局token的判断和application的数据完整 2022-11-02 10:27:20 +08:00
Wang Kejun d83c224465 调整 2022-11-01 21:30:21 +08:00
Wang Kejun 8167b3ebbd 修正 上传组件 闪烁问题 2022-11-01 20:54:25 +08:00
Xu Chang 8931a255db Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2022-11-01 17:55:10 +08:00
Xu Chang 309b9e0634 userRelation中的小bug 2022-11-01 17:54:48 +08:00
Wang Kejun 7c409b9c0b 上传组件 增加 showUploadList 2022-11-01 15:30:40 +08:00
Wang Kejun 9fb90b5487 图片 如果没有上传可直接删除 不需要提示 2022-11-01 12:06:32 +08:00
Wang Kejun 85996a9b44 lib 2022-11-01 11:37:39 +08:00
Wang Kejun 494f0b5bab less 2022-10-31 22:58:48 +08:00
Wang Kejun 747d5f9181 less 2022-10-31 22:47:53 +08:00
Wang Kejun 7e493ff030 upload 修改 及 去掉td组件 2022-10-31 20:55:17 +08:00
Xu Chang cf73297d82 user过程中的一个小bug 2022-10-31 11:24:14 +08:00
梁朝伟 54c361786b fix 2022-10-31 10:51:45 +08:00
Xu Chang 21d1cc6a90 修改了user和system之间的多对多关系 2022-10-30 21:44:46 +08:00
Xu Chang fe5be894f9 backendContext在检查用户时的结果不返回给客户端 2022-10-29 20:17:03 +08:00
Xu Chang 02c60d6269 merge 2022-10-29 18:20:38 +08:00
Xu Chang edd965fed9 重构了exceptionHandler 2022-10-29 18:19:45 +08:00
Wang Kejun f03beec741 lib 2022-10-29 17:24:04 +08:00
Wang Kejun d5740f5a61 message modal 替换 2022-10-29 14:39:35 +08:00
梁朝伟 908f05caad Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2022-10-29 14:32:37 +08:00
梁朝伟 294f80b174 fix 2022-10-29 14:32:32 +08:00
Wang Kejun d8cdf83a47 input组件 临时解决中文不能输入 2022-10-28 18:23:29 +08:00
Xu Chang 44c23c6659 userRelation中一些BUG的修正 2022-10-27 20:07:21 +08:00
Xu Chang f6cb02cb58 userRelation的部分相关代码 2022-10-27 10:49:30 +08:00
wangwenchen a5a511b9c0 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2022-10-24 21:31:33 +08:00
wangwenchen 96d93b0981 fix 2022-10-24 21:29:24 +08:00
Xu Chang d218b8011f Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2022-10-20 19:19:28 +08:00
Xu Chang 268a2b9ee7 修正了一部分页面的语法,适配新的OakComponent 2022-10-20 19:19:25 +08:00
Wang Kejun 26c9beb915 fix 获取isroot错误 2022-10-20 10:52:00 +08:00
Xu Chang 0ec97a142e build-lib 2022-10-19 16:31:46 +08:00
Xu Chang 6fd08f7b28 script中对area的处理 2022-10-19 13:20:35 +08:00
Wang Kejun a6c932bf6c fix 2022-10-18 19:54:15 +08:00
Wang Kejun 515cbda57c grid 组件 2022-10-18 18:51:34 +08:00
vvc1998 f526593e6c Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2022-10-18 18:03:03 +08:00
vvc1998 820c2b22e4 grid 2022-10-18 18:03:01 +08:00
Wang Kejun 8bf2fe279e 微调 2022-10-18 16:57:59 +08:00
Wang Kejun ea082302cf fix 2022-10-18 16:22:43 +08:00
Wang Kejun adb0376860 fix pageheader title字体大小问题 2022-10-18 15:18:42 +08:00
Wang Kejun f711358497 pages component --td换成--oak 2022-10-18 15:10:38 +08:00
Wang Kejun f8455c7a38 business 样式文件 调整 2022-10-18 14:46:37 +08:00
Wang Kejun 455b57f128 Typography 组件封装 2022-10-18 12:13:51 +08:00
Wang Kejun 7d1d164675 去掉mobile-react 的适配 2022-10-17 19:31:05 +08:00
Wang Kejun f45ed18087 empty 组件 2022-10-17 15:00:27 +08:00
Wang Kejun a37193df61 pageheader 样式 2022-10-16 20:00:59 +08:00
Wang Kejun 3be7287e3e 支持取 userinfo 2022-10-16 12:24:35 +08:00
Wang Kejun eeeeb56e0e fix 退出后 this.token 还存在 2022-10-16 10:35:06 +08:00
Xu Chang 5bfe5f2963 areaDebug.json 2022-10-15 21:52:16 +08:00
Xu Chang 189680e447 重写了一下areaDebug的生成和引用 2022-10-15 20:51:31 +08:00
Xu Chang 5282b09934 exception缺了一项 2022-10-15 13:59:56 +08:00
Wang Kejun a243d89bac this.state.oakFullpath 不存在容错 2022-10-14 14:30:08 +08:00
Xu Chang 965eacffe7 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2022-10-13 16:50:46 +08:00
Xu Chang 3a51c1f3e1 token中的小bug 2022-10-13 16:50:40 +08:00
Wang Kejun b5686d6c15 pageheader 调整 2022-10-13 16:03:55 +08:00
Xu Chang a7a7ab809e 增加了两个area树形查询的处理 2022-10-13 14:44:31 +08:00
Wang Kejun 5524286acb features token 增加 getUserInfo 获取当前用户信息 2022-10-12 16:41:59 +08:00
梁朝伟 5f786a3fb6 fix 2022-10-09 17:28:11 +08:00