From d0f16da00a441b824be4b60f041be5a2c1bd247d Mon Sep 17 00:00:00 2001
From: jxx <283591387@qq.com.com>
Date: Sun, 31 May 2020 23:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90iview=E7=BA=A7=E8=81=94?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6cascader=E5=88=B0=E6=A1=86=E6=9E=B6volform?=
=?UTF-8?q?=E3=80=81viewgrid=E7=BB=84=E4=BB=B6=E4=B8=AD=EF=BC=9B=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E7=BA=A7=E8=81=94=E6=93=8D=E4=BD=9C=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basic/ViewGridConfig/methods.js | 4 +-
Vol.Vue/src/components/basic/VolForm.vue | 14 +-
.../src/views/document/docApi/doc_volform.vue | 103 +-
Vol.Vue/src/views/document/docApi/param.js | 2 +-
.../src/views/document/docApi/sourceCode.js | 1232 +++++++++++++----
Vol.Vue/src/views/document/log.vue | 215 ++-
Vol.Vue/src/views/document/vueDev.vue | 517 ++++++-
7 files changed, 1759 insertions(+), 328 deletions(-)
diff --git a/Vol.Vue/src/components/basic/ViewGridConfig/methods.js b/Vol.Vue/src/components/basic/ViewGridConfig/methods.js
index 17a55d3b..718b6243 100644
--- a/Vol.Vue/src/components/basic/ViewGridConfig/methods.js
+++ b/Vol.Vue/src/components/basic/ViewGridConfig/methods.js
@@ -367,8 +367,10 @@ let methods = {
if (sourceObj.hasOwnProperty(key)) {
let newVal = sourceObj[key];
let kv_type = this.keyValueType[keyLeft + key];
+
if (kv_type == 'selectList'
- || kv_type == 'checkbox') {
+ || kv_type == 'checkbox'
+ || kv_type == "cascader") { // 2020.05.31增加iview组件Cascader
if (newVal != "" && newVal != undefined && typeof newVal == 'string') {
newVal = newVal.split(',');
} else if (kv_type == 'checkbox') {
diff --git a/Vol.Vue/src/components/basic/VolForm.vue b/Vol.Vue/src/components/basic/VolForm.vue
index 6bdb29d7..0d64526e 100644
--- a/Vol.Vue/src/components/basic/VolForm.vue
+++ b/Vol.Vue/src/components/basic/VolForm.vue
@@ -142,6 +142,15 @@
:remove-before="item.removeBefore"
:down-load="item.downLoad?true:false"
>
+
+
<template> - <div> - <div class="i-text"> - <h2>组件引入方式</h2> - </div> - <pre class="bg-ms"> - <code> - import VolForm from "@/components/basic/VolForm.vue"; - </code> - </pre> - <div class="i-text"> - <h2>表单</h2> - </div> - <VolForm - ref="myform" - :label-width="150" - :loadKey="true" - :formFileds="formFileds1" - :formRules="formRules1" - ></VolForm> - <div> - <Button type="info" long @click="reset">重置表单</Button> - </div> - <div> - <docParamTable name="form"></docParamTable> - </div> - </div> - </template> - <script> - import VolForm from "@/components/basic/VolForm.vue"; - import docParamTable from "./doc_ParamTable.vue"; - export default { - components: { VolForm, docParamTable }, - methods: { - reset() { - this.$refs.myform.reset(); - this.$Message.error("表单已重置"); - } - }, - data() { - return { - formFileds1: { - Variety: 1, - AgeRange: "", - DateRange: [], - City: "北京市", - AvgPrice: 8.88, - number1: 20, - mail: "", - Date: "", - IsTop: "", - Fruits: [], - Other: "", - extra1:"添加其他标签", - extra2:"添加其他标签可点击", - Switch: 1, - SelectList: ["北京市", "上海市", "天津市", "广州市", "重庆市"], - readonlyText: "还没想好....", - readonlyImg: - "https://imgs-1256993465.cos.ap-chengdu.myqcloud.com/h5pic/x2.jpg", - ProImg: - "https://imgs-1256993465.cos.ap-chengdu.myqcloud.com/h5pic/x3.jpg" - //多个图片可以用逗号隔开 - }, - formRules1: [ - //两列的表单,formRules数据格式为:[[{},{}]] - [ - { - dataKey: "city", - title: "自动绑定数据源", - required: true, - field: "City", - data: [], - type: "select" - }, - { - title: "手动绑定数据源", - dataKey: "age", - placeholder: "在这里可设置提示描述", - //如果这里绑定了data数据,后台不会加载此数据源 - data: [{ key: 1, value: "是" }, { key: 0, value: "否" }], - required: false, - field: "Variety", - type: "select" - } - ], - [ - { - title: "手机号", - required: true, //设置为必选项 - field: "AgeRange", - type: "phone", - onKeyPress: $event => { - if ($event.keyCode == 13) { - this.$Message.error(this.formFileds1.AgeRange + ""); - } - } - }, - { - title: "date日期", - field: "Date", - type: "datetime" - } - ], - [ - { - title: "多选日期", - range: true, //设置为true可以选择开始与结束日期 - required: false, - field: "DateRange", - type: "date" - }, - { - type: "number", - title: "数字", - required: true, - placeholder: "你可以自己定义placeholder显示的文字", - field: "number1" - } - ], - [ - { - type: "decimal", - title: "最大最小decimal值", - max: 10, - min: 2, - required: true, - field: "AvgPrice" - }, - { - title: "邮箱", - field: "mail", - range: true, //设置为true可以选择开始与结束日期 - required: false, - type: "mail" - } - ], - [ - { - title: "额外标签", - required: true, - type: "text", - field: "extra1", - extra: { - icon: "ios-search", - style: "color:red", - text: "这里可以显示额外标签" - } - }, - { - title: "可点击额外标签", - field: "extra2", - type: "text", - extra: { - icon: "ios-search", - text: "点击可触发事件", - click: item => { - this.$Message.error("点击标签触发的事件"); - } - } - } - ], - [ - { - dataKey: "city", - title: "多选", - required: true, - field: "SelectList", - data: [], - colSize: 12, - type: "selectList" - } - ], - [ - { - title: "自定义验证", - required: true, - field: "Other", - validator: (rule, val) => { - if (val != "234") { - return "必须输入【234】"; - } - return ""; - } - }, - { - title: "Switch", - field: "Switch", - dataKey: "enable", //这里会从后台自动绑定数据源 - data: [], - required: false, - type: "switch" - } - ], - [ - //readonlyImg - { - title: "checkbox", - //如果这里绑定了data数据,后台不会加载此数据源 - data: [ - { key: 0, value: "冬瓜" }, - { key: 1, value: "西瓜" }, - { key: 2, value: "南瓜" }, - { key: 3, value: "哈密瓜" } - ], - field: "Fruits", - type: "checkbox" - }, - { - title: "字段只读", - readonly: true, //设置readonly或disabled都行 - field: "readonlyText", - type: "text" - } - ], - [ - { - title: "备注", - required: true, - field: "IsTop", - min: 3, - max: 5, - placeholder: "至少输入3个字符,最多只能输入5个字符", - colSize: 12, //设置12,此列占100%宽度 - type: "textarea" - } - ], - [ - { - title: "图片只读", - readonly: true, //设置readonly或disabled都行 - field: "readonlyImg", - type: "img" - }, - { - title: "可上传图片", - field: "ProImg", - type: "img", - maxSize: 0.2, //最大0.2M图片 - //上传参数可参照volupload组件 - url: "/api/App_Appointment/Upload" - } - ] - ] - }; - } - }; - </script>-
`, + form: `
`, uploadExcel: ``, uploadImg: ``, volmenu: ``, viewGrid: `` } -export default codeString \ No newline at end of file +export default codeString diff --git a/Vol.Vue/src/views/document/log.vue b/Vol.Vue/src/views/document/log.vue index fc8bd978..ddb31be0 100644 --- a/Vol.Vue/src/views/document/log.vue +++ b/Vol.Vue/src/views/document/log.vue @@ -44,61 +44,163 @@ export default { return { active: 0, log: [ -{"date":"2020-05-07 14:46:08","desc":"增加(导入、下载导入模板、导出表数据)时可以指定导入与导出字段(默认为界面上可以看到的字段)"}, - {"date":"2020-05-03 12:12:08","desc":"增加代码生成页面对checkbox编辑时多选的支持"}, - {"date":"2020-05-02 20:03:49","desc":"完善编辑器静态页面发布上传图片功能"}, - {"date":"2020-05-01 21:43:26","desc":"增加可根据用户信息自定义数据源"}, - {"date":"2020-04-27 11:00:50","desc":"更新数据库最新菜单表的脚本"}, - {"date":"2020-04-27 10:36:55","desc":"添加全局缓存与读写分离文档"}, - {"date":"2020-04-27 10:02:28","desc":"优化用户保存"}, - {"date":"2020-04-26 20:08:41","desc":"增加树形菜单与table"}, - {"date":"2020-04-25 20:36:49","desc":"文档整理"}, - {"date":"2020-04-25 20:00:56","desc":"预留非对称主外键关系配置功能,待开发"}, - {"date":"2020-04-25 11:16:57","desc":"优化白色主题菜单颜色"}, - {"date":"2020-04-25 10:18:45","desc":"添加获取用户权限的重载方法"}, - {"date":"2020-04-25 10:09:10","desc":"优化上传组件图片选择器默认大小图"}, - {"date":"2020-04-24 18:10:44","desc":"增加EF更新时并发重试处理"}, - {"date":"2020-04-24 11:45:29","desc":"修复导出数据源为自定义sql,类型转换异常的问题"}, - {"date":"2020-04-21 23:00:06","desc":"增加没有编辑或新建权限时,也可以通过buttons属性添加自定义弹出框按钮"}, - {"date":"2020-04-21 20:17:25","desc":"修复首页字符拼写错误"}, - {"date":"2020-04-21 10:58:15","desc":"将默认皮肤黑色改为蓝色"}, - {"date":"2020-04-20 14:43:39","desc":"修复动态刷新数据源文档描述错误的问题"}, - {"date":"2020-04-14 19:55:14","desc":"增加Mysql数据库使用Dapper批量修改实体功能"}, - {"date":"2020-04-11 21:20:04","desc":"增加项目部署及部署错误处理文档"}, - {"date":"2020-04-11 18:49:33","desc":"移除使用了C#8.0语法的代码"}, -{"date":"2020-04-10 13:05:23","desc":"修复自定义sql数据源key为数字时,表单查询时条件不起作用的问题"}, -{"date":"2020-04-10 10:01:43","desc":"添加table列为编辑列时可formatter操作"}, -{"date":"2020-04-07 23:43:16","desc":"完善文档"}, -{"date":"2020-04-07 22:02:49","desc":"增加数字排版"}, -{"date":"2020-04-07 21:41:24","desc":"增加主从表,可单独对从表上传图片(文件)功能"}, -{"date":"2020-04-05 21:21:18","desc":"优化菜单保存后提示信息"}, -{"date":"2020-04-05 20:48:02","desc":"优化排序字段"}, -{"date":"2020-04-05 11:29:36","desc":"修复实体全属性校验判断错误的问题"}, -{"date":"2020-04-04 12:44:56","desc":"优化voltable组件单独使用时数据绑定select的key类型"}, -{"date":"2020-04-03 23:13:05","desc":"移除无用代码,增加一对多(不限从表数量)实战开发"}, -{"date":"2020-04-03 23:07:04","desc":"添加最新菜单脚本"}, -{"date":"2020-04-02 18:26:41","desc":"优化皮肤样式"}, -{"date":"2020-04-02 17:47:23","desc":"增加换皮肤功能"}, -{"date":"2020-04-02 17:43:59","desc":"修复点击非标准菜单可以重复显示的问题"}, -{"date":"2020-04-02 17:36:23","desc":"增加皮肤切换功能"}, -{"date":"2020-03-31 18:37:56","desc":"增加Dapper对mysql数据库Guid映射"}, -{"date":"2020-03-31 13:47:14","desc":"增加查询按钮组非递归深拷贝"}, -{"date":"2020-03-30 20:42:58","desc":"添加一对一从表编辑或新建时,可设置hidden属性控制按钮显示/隐藏"}, -{"date":"2020-03-29 09:56:00","desc":"优化菜单保存验证"}, -{"date":"2020-03-28 19:30:39","desc":"增加文件上传时可选择追加文件"}, -{"date":"2020-03-27 20:17:57","desc":"优化axios请求失败提示"}, -{"date":"2020-03-25 17:10:01","desc":"优化扩展排序"}, -{"date":"2020-03-24 10:10:30","desc":"移除mysql连接字符串AllowLoadLocalInfile属性"}, -{"date":"2020-03-23 19:10:26","desc":"修改代码生成器文档参数描述"}, -{"date":"2020-03-19 23:28:22","desc":"文档整理"}, -{"date":"2020-03-19 21:50:16","desc":"修复table表格属性为img多图片时不能预览大图的问题"}, -{"date":"2020-03-18 22:10:29","desc":"导出数据时,默认导出table上可见的列"}, -{"date":"2020-03-18 22:07:11","desc":"修改备注说明"}, -{"date":"2020-03-17 13:00:17","desc":"优化菜单自定义按权限按钮显示"}, -{"date":"2020-03-15 21:55:10","desc":"添加预请求过期时间"}, -{"date":"2020-03-15 20:42:55","desc":"移除后台校验日期限制"}, -{"date":"2020-03-15 20:42:13","desc":"优化多值in查询"}, -{"date":"2020-03-15 20:41:41","desc":"优化table图片显示"}, + { + date: "2020-05-31 23:15:20", + desc: + "集成iview级联组件cascader到框架volform、viewgrid组件中;增加级联操作文档" + }, + { date: "2020-05-31 21:15:33", desc: "移除无用文件夹test" }, + { + date: "2020-05-31 15:45:37", + desc: "优化角色管理页面及角色service代码" + }, + { date: "2020-05-30 20:13:09", desc: "mysql最新脚本" }, + { date: "2020-05-29 14:57:23", desc: "修复mysql异常说明" }, + { + date: "2020-05-25 00:43:43", + desc: "角色权限分配,权限列表改为树形菜单" + }, + { + date: "2020-05-25 00:16:10", + desc: "修复http同时发起多个请求时,遮罩层不能正确关闭的问题" + }, + { date: "2020-05-24 20:35:15", desc: "增加代码生成器常用问题描述" }, + { date: "2020-05-17 15:17:01", desc: "优化首页tab选项卡border样式" }, + { + date: "2020-05-17 15:04:17", + desc: + "修复代码生成器mysql获取表结构没有区分数据库的问题(感谢jerry指正)" + }, + { date: "2020-05-12 10:08:23", desc: "优化手动上传组件图片选择器" }, + { + date: "2020-05-08 11:16:44", + desc: "添加mysql写入日志异常提示解决办法" + }, + { date: "2020-05-08 11:13:09", desc: "补全mysql数据库字典编号" }, + { + date: "2020-05-07 18:43:31", + desc: "修改菜单与角色的父级id出现循环依赖时,给出提示并禁止修改" + }, + { + date: "2020-05-07 14:46:08", + desc: + "增加(导入、下载导入模板、导出表数据)时可以指定导入与导出字段(默认为界面上可以看到的字段)" + }, + { + date: "2020-05-03 12:12:08", + desc: "增加代码生成页面对checkbox编辑时多选的支持" + }, + { + date: "2020-05-02 20:03:49", + desc: "完善编辑器静态页面发布上传图片功能" + }, + { date: "2020-05-01 21:43:26", desc: "增加可根据用户信息自定义数据源" }, + { date: "2020-04-27 11:00:50", desc: "更新数据库最新菜单表的脚本" }, + { date: "2020-04-27 10:36:55", desc: "添加全局缓存与读写分离文档" }, + { date: "2020-04-27 10:02:28", desc: "优化用户保存" }, + { date: "2020-04-26 20:08:41", desc: "增加树形菜单与table" }, + { date: "2020-04-25 20:36:49", desc: "文档整理" }, + { + date: "2020-04-25 20:00:56", + desc: "预留非对称主外键关系配置功能,待开发" + }, + { date: "2020-04-25 11:16:57", desc: "优化白色主题菜单颜色" }, + { date: "2020-04-25 10:18:45", desc: "添加获取用户权限的重载方法" }, + { + date: "2020-04-25 10:09:10", + desc: "优化上传组件图片选择器默认大小图" + }, + { date: "2020-04-24 18:10:44", desc: "增加EF更新时并发重试处理" }, + { + date: "2020-04-24 11:45:29", + desc: "修复导出数据源为自定义sql,类型转换异常的问题" + }, + { + date: "2020-04-21 23:00:06", + desc: + "增加没有编辑或新建权限时,也可以通过buttons属性添加自定义弹出框按钮" + }, + { date: "2020-04-21 20:17:25", desc: "修复首页字符拼写错误" }, + { date: "2020-04-21 10:58:15", desc: "将默认皮肤黑色改为蓝色" }, + { + date: "2020-04-20 14:43:39", + desc: "修复动态刷新数据源文档描述错误的问题" + }, + { + date: "2020-04-14 19:55:14", + desc: "增加Mysql数据库使用Dapper批量修改实体功能" + }, + { date: "2020-04-11 21:20:04", desc: "增加项目部署及部署错误处理文档" }, + { date: "2020-04-11 18:49:33", desc: "移除使用了C#8.0语法的代码" }, + { + date: "2020-04-10 13:05:23", + desc: "修复自定义sql数据源key为数字时,表单查询时条件不起作用的问题" + }, + { + date: "2020-04-10 10:01:43", + desc: "添加table列为编辑列时可formatter操作" + }, + { date: "2020-04-07 23:43:16", desc: "完善文档" }, + { date: "2020-04-07 22:02:49", desc: "增加数字排版" }, + { + date: "2020-04-07 21:41:24", + desc: "增加主从表,可单独对从表上传图片(文件)功能" + }, + { date: "2020-04-05 21:21:18", desc: "优化菜单保存后提示信息" }, + { date: "2020-04-05 20:48:02", desc: "优化排序字段" }, + { + date: "2020-04-05 11:29:36", + desc: "修复实体全属性校验判断错误的问题" + }, + { + date: "2020-04-04 12:44:56", + desc: "优化voltable组件单独使用时数据绑定select的key类型" + }, + { + date: "2020-04-03 23:13:05", + desc: "移除无用代码,增加一对多(不限从表数量)实战开发" + }, + { date: "2020-04-03 23:07:04", desc: "添加最新菜单脚本" }, + { date: "2020-04-02 18:26:41", desc: "优化皮肤样式" }, + { date: "2020-04-02 17:47:23", desc: "增加换皮肤功能" }, + { + date: "2020-04-02 17:43:59", + desc: "修复点击非标准菜单可以重复显示的问题" + }, + { date: "2020-04-02 17:36:23", desc: "增加皮肤切换功能" }, + { + date: "2020-03-31 18:37:56", + desc: "增加Dapper对mysql数据库Guid映射" + }, + { date: "2020-03-31 13:47:14", desc: "增加查询按钮组非递归深拷贝" }, + { + date: "2020-03-30 20:42:58", + desc: "添加一对一从表编辑或新建时,可设置hidden属性控制按钮显示/隐藏" + }, + { date: "2020-03-29 09:56:00", desc: "优化菜单保存验证" }, + { date: "2020-03-28 19:30:39", desc: "增加文件上传时可选择追加文件" }, + { date: "2020-03-27 20:17:57", desc: "优化axios请求失败提示" }, + { date: "2020-03-25 17:10:01", desc: "优化扩展排序" }, + { + date: "2020-03-24 10:10:30", + desc: "移除mysql连接字符串AllowLoadLocalInfile属性" + }, + { date: "2020-03-23 19:10:26", desc: "修改代码生成器文档参数描述" }, + { date: "2020-03-19 23:28:22", desc: "文档整理" }, + { + date: "2020-03-19 21:50:16", + desc: "修复table表格属性为img多图片时不能预览大图的问题" + }, + { + date: "2020-03-18 22:10:29", + desc: "导出数据时,默认导出table上可见的列" + }, + { date: "2020-03-18 22:07:11", desc: "修改备注说明" }, + { date: "2020-03-17 13:00:17", desc: "优化菜单自定义按权限按钮显示" }, + { date: "2020-03-15 21:55:10", desc: "添加预请求过期时间" }, + { date: "2020-03-15 20:42:55", desc: "移除后台校验日期限制" }, + { date: "2020-03-15 20:42:13", desc: "优化多值in查询" }, + { date: "2020-03-15 20:41:41", desc: "优化table图片显示" }, { date: "2020-03-14 14:32:50", desc: "添加table编辑demo,增加文档说明" @@ -442,8 +544,7 @@ export default { }, { date: "2019-11-13 23:46:01", - desc: - "增加代码生成器页面手动同步表结构的功能" + desc: "增加代码生成器页面手动同步表结构的功能" }, { date: "2019-11-13 23:38:35", diff --git a/Vol.Vue/src/views/document/vueDev.vue b/Vol.Vue/src/views/document/vueDev.vue index 4e43c07c..83a5f39a 100644 --- a/Vol.Vue/src/views/document/vueDev.vue +++ b/Vol.Vue/src/views/document/vueDev.vue @@ -76,6 +76,14 @@ export default { return { active: 0, items: [ + { + title: "完整前端功能扩展", + content: [ + `其他功能扩展,如:查询前后,保存前后等,参照sellOrder.js或viewGrid组件api` + ], + tips: ` 前端功能扩展覆盖了常用操作,可通过扩展实现任意功能`, + img: "" + }, { title: "第一个扩展:动态添加按钮", content: [ @@ -627,6 +635,505 @@ export default { tips: `在前端表的扩展js中,onInit与onInited初始化要统计的字段,后台在xxxService.cs中重写查询方法,并实现要统计的字段即可完成表格统计,无需其他操作`, img: "https://doc-vue-1256993465.cos.ap-chengdu.myqcloud.com/09.png" }, + { + title: "级联操作", + content: [ + `