Commit Graph

317 Commits

Author SHA1 Message Date
Wang Kejun 6062a4a3c4 extraFileCommit 2023-11-10 19:18:04 +08:00
Wang Kejun 088b3f0ef7 fix ts warning 2023-11-10 14:04:41 +08:00
Wang Kejun 1477f417a9 extrafilecommit 适配小程序传函数 2023-11-10 12:26:50 +08:00
wangwenchen adf55a7ce8 去掉bridge 2023-11-09 21:30:45 +08:00
Wang Kejun c32bc01be7 搬迁 2023-11-09 12:15:11 +08:00
Wang Kejun 17974a9b9c wechatuser、wechatlogin、wechatqrcode 移到components 2023-11-09 11:11:55 +08:00
Wang Kejun 1a669e6b00 添加权限 修正取值错误 2023-11-08 21:08:53 +08:00
Wang Kejun e7d8fd36ad 修正 icon引用路径问题 2023-11-08 21:00:49 +08:00
Wang Kejun 87b8bf9d4f extracommit 临时代码 2023-11-08 20:48:53 +08:00
Wang Kejun 3004a5a6aa oakicon 引用frontend 2023-11-08 20:14:51 +08:00
Wang Kejun 83559d4b17 增加 tsconfig.lib,json 及user、token、mobile移到components下 2023-11-08 18:35:11 +08:00
qsc fa89f269ce Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-11-08 15:22:38 +08:00
wangwenchen e1789a1543 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-11-07 18:20:42 +08:00
wangwenchen 3bad91de3a userEntityGrant 2023-11-07 18:20:41 +08:00
Wang Kejun d4553faeec 组件样式 由上层组件样式包裹 2023-11-07 14:29:57 +08:00
Wang Kejun a1bc6f9493 extraFile2 改 extraFile 2023-11-06 18:48:49 +08:00
Wang Kejun 8467b45c93 移除style2 ,函数放在config里 2023-11-06 17:57:36 +08:00
wangwenchen dc94ff1eb0 解决冲突 2023-11-06 10:21:36 +08:00
wangwenchen 9b7ebed7a7 bridge 2023-11-06 10:19:40 +08:00
Xu Chang 69afb89fcd userEntityGrant的相关改动和页面 2023-11-04 18:45:07 +08:00
Xu Chang e22bcda45f userEntityGrant 2023-11-04 15:31:53 +08:00
Wang Kejun 3f66903a7f weixin-js-sdk 升级及 @types/react 升级 2023-11-04 12:11:39 +08:00
wangwenchen 28830909a0 build 2023-10-27 14:19:12 +08:00
wenjiarui 130efc4874 fix笔误 2023-10-26 16:48:14 +08:00
梁朝伟 e180377205 fix:address实体remark非必填 2023-10-25 17:25:45 +08:00
qsc 37977a80c5 articleMenu treeCell修改 2023-10-25 16:36:09 +08:00
qsc 9b04eeb741 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-25 15:57:22 +08:00
qsc 1329a487a3 build 2023-10-25 15:56:02 +08:00
Wang Kejun 992b104b01 调整 sessionMessage 发客服消息判断 2023-10-25 15:27:38 +08:00
Wang Kejun a4d3bf4b5c 小程序端 extrafile/commit 2023-10-25 12:45:11 +08:00
qsc 6833edab1e Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-25 12:21:41 +08:00
qsc 7a0a8e3fc7 extraFile upload chooseMessageFileByMp()修改 2023-10-25 12:21:38 +08:00
wenjiarui b4a93807b4 extraFileCommit修改 2023-10-25 11:42:12 +08:00
qsc 2053b5e78c articleMenu extraFile 修改 2023-10-24 10:38:18 +08:00
Wang Kejun 960681a2e8 sessionMessage openId存在才发送微信客服消息 2023-10-23 20:14:46 +08:00
qsc 1acbdfa7d3 upload 边界情况:用动作保存 2023-10-23 18:49:29 +08:00
Wang Kejun 7bce1dc06d 微信发送图片消息 2023-10-22 12:13:05 +08:00
Wang Kejun 4db7235871 extraFile 实现微信图片显示 暂支持image 2023-10-20 20:19:33 +08:00
Wang Kejun 03dafed548 增加 todo实体对象 2023-10-20 12:34:37 +08:00
Wang Kejun 55342a4873 build 2023-10-17 18:53:59 +08:00
梁朝伟 3c1afc8704 user实体增加账户字段 2023-10-17 17:24:57 +08:00
Wang Kejun fb6d793a4a build 2023-10-17 15:42:44 +08:00
Wang Kejun de32625bfd build 2023-10-16 20:34:34 +08:00
Wang Kejun 49ef53ae59 build 2023-10-13 19:28:20 +08:00
wenjiarui 2fd4b31f68 autoUplaodd 2023-10-13 19:11:02 +08:00
Wang Kejun 1aa00bab55 去掉不必要的参数 2023-10-13 11:47:57 +08:00
Wang Kejun 2a67be5926 微信api调用调整 2023-10-13 11:43:51 +08:00
Wang Kejun 95d1d789ba build 2023-10-12 18:45:18 +08:00
qsc 9a4c27233a Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-12 17:15:15 +08:00
qsc 7256c92b0b createMaterial 添加appType 2023-10-12 17:15:07 +08:00
Xu Chang b14ba4d211 merge 2023-10-12 17:09:37 +08:00
Xu Chang 32b191ce01 增加了account对象 2023-10-12 17:04:01 +08:00
wenjiarui eda8081ecf 模板消息显示修改 2023-10-12 15:23:38 +08:00
Wang Kejun 9d80f0882c build 2023-10-12 14:04:23 +08:00
qsc 6c252c3067 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-12 14:00:57 +08:00
qsc d87b9b591e wechatUser去掉remark、language 2023-10-12 13:59:12 +08:00
Wang Kejun 5a5422c58d build 2023-10-12 12:23:14 +08:00
wenjiarui 889bc37e09 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-12 10:36:26 +08:00
wenjiarui 101a7b81b7 模板消息配置 2023-10-12 10:36:20 +08:00
Wang Kejun 40bf1ed898 extrafile/upload removeitem后 过滤 2023-10-12 10:28:43 +08:00
qsc 9c01ba8dd6 wechatMenu菜单默认开启 2023-10-12 10:16:27 +08:00
wenjiarui a4856cf0f0 模板消息配置 2023-10-11 18:59:52 +08:00
qsc 200317d291 build 2023-10-11 17:53:48 +08:00
qsc 9c0827a28f Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-11 17:51:15 +08:00
qsc 14574b27bc application 2023-10-11 17:49:01 +08:00
Wang Kejun b6c73cf373 build 2023-10-11 17:48:03 +08:00
qsc 810bc665ef Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-11 09:46:57 +08:00
qsc 49ec699d8e wechatPublicTag 2023-10-11 09:25:53 +08:00
Xu Chang 4903b992bd 调通qiniu的delete file,brc适配改动 2023-10-10 22:00:26 +08:00
Wang Kejun c0d5c9c4b1 extrafile 图片显示组件, 可展示预览 2023-10-10 20:16:55 +08:00
wangwenchen bd979ccca0 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-10 15:49:53 +08:00
wangwenchen ae09b099b7 session 2023-10-10 15:49:52 +08:00
Wang Kejun a2487b4b95 extrafile 拖拽排序 2023-10-10 15:49:03 +08:00
Wang Kejun 2a04a8a121 extrafile upload 小程序端 缺少状态的渲染 2023-10-10 12:43:56 +08:00
wenjiarui 986aa17d48 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-09 14:45:42 +08:00
wenjiarui b76972733d mergeconfilct 2023-10-09 14:45:38 +08:00
wangwenchen a8aad2a51a Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-10-09 14:26:13 +08:00
wangwenchen 912436af41 session 2023-10-09 14:26:12 +08:00
wenjiarui 7234e2c73f platformList修改 2023-10-08 18:57:40 +08:00
Xu Chang c9484c0fa1 extraFile的watcher和一些重构 2023-10-08 13:37:41 +08:00
Xu Chang 7daedef769 extrafile2 2023-10-05 19:29:10 +08:00
Xu Chang 5ce7619b3e 重构了platform/system/application的管理页面 2023-09-29 23:27:33 +08:00
Xu Chang d4a6422297 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-29 20:24:35 +08:00
Xu Chang 559f140186 systemPanel重构 2023-09-29 20:24:33 +08:00
wangwenchen c1511a03a0 编译后代码 2023-09-27 19:42:06 +08:00
wangwenchen 0f475035ea 解决冲突 2023-09-27 19:40:57 +08:00
wangwenchen 40e42ea3c7 sessionmessage 2023-09-27 19:36:16 +08:00
qsc 8bee0689df Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-27 18:20:05 +08:00
qsc 137c7fc634 关注公众号自动回复管理 2023-09-27 18:01:19 +08:00
Wang Kejun 62e7891a81 移除react-router-dom 对pageheader和errorpage 进行调整 2023-09-27 13:14:17 +08:00
Xu Chang 8951aeca19 拆分了messageType和template的关联 2023-09-26 19:54:07 +08:00
Xu Chang 30d1093f60 cos的部分重构,以及userWechatPublicTag的结构变更 2023-09-26 18:31:12 +08:00
Xu Chang 0690e3be9b build 2023-09-25 14:07:03 +08:00
Wang Kejun afefc65639 后端 上传微信素材适配 2023-09-24 14:55:03 +08:00
qsc 48784ed889 Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-22 19:18:10 +08:00
qsc 6881bea7f7 wechatmenu 2023-09-22 19:18:02 +08:00
Xu Chang 2d732106cd Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-22 18:52:31 +08:00
Xu Chang 071d8f25d3 增加了extraFileUpload组件 2023-09-22 18:52:15 +08:00
qsc 9c08856b6d Merge branch 'dev' of codeup.aliyun.com:61c14a7efa282c88e103c23f/oak-general-business into dev 2023-09-22 12:25:12 +08:00
qsc 99feadbbac wehchatMenu 2023-09-22 12:22:27 +08:00
Xu Chang 2f157bf423 增加了uploadMedia的aspect声明 2023-09-22 11:00:00 +08:00
Xu Chang 166a72ea8f extraFile2的部分代码 2023-09-21 22:32:02 +08:00
wenjiarui 7431214099 upload 2023-09-20 17:52:19 +08:00
wenjiarui 5164024000 fix 2023-09-15 15:25:24 +08:00
wenjiarui 0503738571 extraFile 2023-09-15 13:41:20 +08:00
Xu Chang 7f1bde5991 移除了对react-scripts的依赖 2023-09-15 09:58:24 +08:00
Wang Kejun e684c71099 build 2023-09-14 19:26:56 +08:00
Xu Chang b6b83fa0fb 升级TS到5版(编译还有问题) 2023-09-14 18:19:47 +08:00
Wang Kejun c15c8fdd49 build 2023-09-13 15:48:51 +08:00
wenjiarui f7c71d9398 mergefromdev 2023-09-13 15:21:18 +08:00
wenjiarui 52673b8960 extraFile 2023-09-13 15:08:50 +08:00
Wang Kejun 454220ae0a lib 2023-09-09 09:52:27 +08:00
Wang Kejun bfe63596fc message 增加platformId 2023-09-08 16:18:03 +08:00
Wang Kejun de261f3ce9 pc端用户管理 2023-09-07 19:28:48 +08:00
wenjiarui 662f835ce7 mergeConfilct 2023-09-07 15:04:42 +08:00
Wang Kejun ccd5e076e0 前端 引用oak-frontend-base/es 2023-09-05 17:36:16 +08:00
Wang Kejun 6247000190 支持es编译 2023-09-05 16:43:42 +08:00