From 31edbc1a45d80fd8c513230479533aa5862894b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9D=88=E3=83=BE=E9=AD=82?= <283591387@qq.com> Date: Mon, 23 Oct 2023 07:16:24 +0000 Subject: [PATCH 1/4] update README.md. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 靈ヾ魂 <283591387@qq.com> --- README.md | 60 +++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 4a10ddd6..09bf3a46 100644 --- a/README.md +++ b/README.md @@ -40,83 +40,83 @@ App、H5、微信小程序: [http://v2.volcore.xyz/app/guide](http://v2.volcore. sqlsugar: [https://www.donet5.com/](https://www.donet5.com/) ## 2023.05.13增加审批流程分支、条件功能 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/flow.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/flow2.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/flow3.png) +![Home](/imgs/flow.png) +![Home](/imgs/flow2.png) +![Home](/imgs/flow3.png) ## 框架移动端（uniapp）已发布,同样全自动生成代码,扫描小程序二维码即可查看 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/qrcode.png) +![Home](/imgs/qrcode.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/app-01.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/app-02.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m001.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m002.png) +![Home](/imgs/app-01.png) +![Home](/imgs/app-02.png) +![Home](/imgs/m001.png) +![Home](/imgs/m002.png) ## 框架已支持Vue3版本 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/v3.png) +![Home](/imgs/v3.png) ## 框架已增加低代码设计器 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/fd01.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/fd02.png) +![Home](/imgs/fd01.png) +![Home](/imgs/fd02.png) ## 框架2.0已更新(部分新增功能截图) 增加切换皮肤功能 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/h.png) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/home_them.png) +![Home](/imgs/h.png) +![Home](/imgs/home_them.png) 增加可复用的后台请求参数校验 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/validator.png) +![Home](/imgs/validator.png) 增加树形菜单与代码生成页面使用 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/x7tree.png) +![Home](/imgs/x7tree.png) 增加文本编辑器直接发布静态页面功能 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/editor.png) +![Home](/imgs/editor.png) 一对一多从表显示(只需要少量代码就可完成成，其他都由代码生成器生成) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/m1.png) +![Home](/imgs/m1.png) 表合并显示 (只需要几行代码完成代码生成器生成的页面实现扩展) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/span.png) +![Home](/imgs/span.png) 从图上传图片 (只需要几行代码完成代码生成器生成的页面实现扩展) -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/p1.png) +![Home](/imgs/p1.png) 一对多从表(不限从表数量)扩展 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/multi.png) +![Home](/imgs/multi.png) 图表 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/charts.png) +![Home](/imgs/charts.png) ## 1、只读基础表单 整个只读的基础表单的所有前后端代码，全部由代码生成器生成，代码生成器中几乎不需要配置，并支持并后端业务代码扩展，直接生成代码后，配置菜单权限即可 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table1.png) +![Home](/imgs/table1.png) ## 2、自动绑定下拉框数据表单 整个自动绑定下拉框数据表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，在代码生成器中只需要指定数据源编号，页面加载时会根据编号自动加载数据源并绑定 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table2.png) +![Home](/imgs/table2.png) ## 3、启用图片支持、审核表单 整个启用图片支持、审核表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，审核功能需要在菜单配置权限、代码生成器中勾选启用图片支持 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/table3.png) +![Home](/imgs/table3.png) ## 4、高级查询 整个表单的所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，查询字段、类型(下拉框、日期、TextArea等)、所在行与列都由代码生成器完成，不需要写任何代码 - ![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/tablesearch4.png) + ![Home](/imgs/tablesearch4.png) ## 5、主从表新建、编辑 主从表新建、编辑所有前后端代码，全部由代码生成器生成，并支持并后端业务代码扩展，新建、编辑从表配置、字段、类型(下拉框、日期、TextArea等)、所在行与列、字段是否只读、标签显示的长度等都由代码生成器完成，不需要写任何代码 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/editTbale2.png) +![Home](/imgs/editTbale2.png) ## 6、excel导入 excel导入整个页面都由代码生成器生成，导入的字段、字段是否必填，下载模板也由代码生成器上配置(自己根据实际需要决定是否采用此方法)，导入时会验证是否为空与数据的合法性，逻辑校验自己实现扩展方法即可 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/importTable1.png) +![Home](/imgs/importTable1.png) ## 7、H5开发 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/h5.jpg) +![Home](/imgs/h5.jpg) ## 8、权限分配 目前只实现了对用户的角色的Action进行权限分配 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/auth.png) +![Home](/imgs/auth.png) ## 9、代码生成器 代码生成器提供了20多种可配置的属性，可灵活配置显示、查询、编辑、导入、导出、主从关系等功能点击看代码生成器文档 -![Home](https://github.com/cq-panda/Vue.NetCore/blob/master/imgs/coder.png) +![Home](/imgs/coder.png) 其他功能。。。。。 -- Gitee From 0530e00cc00ad9a059678cae927f22c40f6d9c55 Mon Sep 17 00:00:00 2001 From: Zyc-Bryce Date: Wed, 25 Oct 2023 16:58:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vol.uniapp/pages/login/ConfigPage.vue | 57 +++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 vol.uniapp/pages/login/ConfigPage.vue diff --git a/vol.uniapp/pages/login/ConfigPage.vue b/vol.uniapp/pages/login/ConfigPage.vue new file mode 100644 index 00000000..6e8f6601 --- /dev/null +++ b/vol.uniapp/pages/login/ConfigPage.vue @@ -0,0 +1,57 @@ + + + \ No newline at end of file -- Gitee From 31fee6daaa4544f3c94f932352a798554db2db00 Mon Sep 17 00:00:00 2001 From: Zyc-Bryce Date: Wed, 25 Oct 2023 17:13:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=9C=B0=E5=9D=80=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vol.uniapp/pages.json | 12 ++++++++++++ vol.uniapp/pages/login/login.vue | 8 ++++++++ vol.uniapp/store/index.js | 3 ++- vol.uniapp/util/http.js | 15 +++++++++++++++ 4 files changed, 37 insertions(+), 1 deletion(-) diff --git a/vol.uniapp/pages.json b/vol.uniapp/pages.json index b6acc4ab..2ea37558 100644 --- a/vol.uniapp/pages.json +++ b/vol.uniapp/pages.json @@ -24,6 +24,18 @@ } } + }, + { + "path": "pages/login/ConfigPage", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationBarBackgroundColor": "#FFFFFF", + "app-plus": { // 隐藏系统导航栏 + "titleNView": false + } + } + }, { "path": "pages/menu/menu", diff --git a/vol.uniapp/pages/login/login.vue b/vol.uniapp/pages/login/login.vue index 5ae768b3..df77a6ed 100644 --- a/vol.uniapp/pages/login/login.vue +++ b/vol.uniapp/pages/login/login.vue @@ -19,6 +19,9 @@ :customStyle="{'border-radius': '10rpx'}" size="large" type="primary" text="登录"> + + 配置后台地址 + 演示帐号：admin666 密码：123456 @@ -53,6 +56,11 @@ } }, methods: { + goToConfig() { + uni.navigateTo({ + url: '/pages/login/ConfigPage' + }); + }, login() { if (this.base.isEmpty(this.userInfo.userName)) return this.$toast("请输入用户名"); diff --git a/vol.uniapp/store/index.js b/vol.uniapp/store/index.js index bd707a17..7b9a168e 100644 --- a/vol.uniapp/store/index.js +++ b/vol.uniapp/store/index.js @@ -36,7 +36,8 @@ const store = new Vuex.Store({ clearUserInfo(state) { state.permission = []; state.userInfo = null; - uni.clearStorage(app_user_token); + uni.removeStorageSync(app_user_token); + // uni.clearStorage(app_user_token); }, }, actions: { diff --git a/vol.uniapp/util/http.js b/vol.uniapp/util/http.js index 70011636..f5685097 100644 --- a/vol.uniapp/util/http.js +++ b/vol.uniapp/util/http.js @@ -7,6 +7,19 @@ if (process.env.NODE_ENV === 'development') { ipAddress = "https://api.volcore.xyz/" } +function instance() { + const backendUrl = uni.getStorageSync('backendUrl'); + if (!ipAddress) { + uni.navigateTo({ + url: '/pages/login/ConfigPage' + }); + } + if(backendUrl && ipAddress != backendUrl) + { + ipAddress = backendUrl; + } +} + function post(url, data, loading) { return request(url, 'POST', data, loading); } @@ -28,6 +41,7 @@ function request(url, method, data, loading) { if (url.startsWith("/")) { url = url.substr(1) } + instance(); url = ipAddress + url; var _header = {}; var _token = getToken(); @@ -110,6 +124,7 @@ function request(url, method, data, loading) { export default { + instance, get, post, request, -- Gitee From 6ab5a748fdbbc415454dd3dde2f08d0ca4f1296f Mon Sep 17 00:00:00 2001 From: Zyc-Bryce Date: Wed, 25 Oct 2023 17:20:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=90=8E=E5=8F=B0=E5=9C=B0=E5=9D=80=E6=8C=89=E9=92=AE=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vol.uniapp/pages/login/login.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vol.uniapp/pages/login/login.vue b/vol.uniapp/pages/login/login.vue index df77a6ed..7b8168d3 100644 --- a/vol.uniapp/pages/login/login.vue +++ b/vol.uniapp/pages/login/login.vue @@ -19,7 +19,7 @@ :customStyle="{'border-radius': '10rpx'}" size="large" type="primary" text="登录"> - + 配置后台地址 -- Gitee