5.0.212

modules/kdayun-app/src/main/resources/static/framework/theme.js

@@ -455,17 +455,17 @@ layui.define(['laytpl', 'element', 'layer', 'zlPinYin', 'common'], function (exp
 						}
 						.layui-tab-brief>.layui-tab-title .layui-this:after,
 						.layui-tab-brief>.layui-tab-more li.layui-this:after {
-							border-color:{{d.menuBgInput}};
+							border-color:`+ themeObj.kd_color_1 + `;
 						}
 						.layui-table tbody tr:hover,.layui-table-hover,.layui-table-click{
 							background-color:`+ (themeObj.kd_color_10 || '#f2f2f2') + `;
 						}
 						.layui-layer-tips.menuTips .layui-layer-content {
-							background-color:`+ (themeObj.childMenuTipsBgInput || THEME.colorReverse(themeObj.menuFontColorInput || "#FFFFFF")) + `;
+							background-color:`+ (themeObj.childMenuTipsBgInput || THEME.colorReverse(themeObj.menuFontColorInput || "#000000")) + `;
 							color:`+ (themeObj.menuFontColorInput || "#FFFFFF") + `;
 						}
 						.layui-layer-tips.menuTips .layui-layer-content i {
-							border-bottom-color:`+ (themeObj.childMenuTipsBgInput || "#FFFFFF") + `;
+							border-bottom-color:`+  (themeObj.childMenuTipsBgInput || THEME.colorReverse(themeObj.menuFontColorInput || "#000000")) + `;
 						}
 						.layui-input:hover,
 						.layui-textarea:hover,

modules/kdayun-app/src/main/resources/static/framework/zlPopSourceExt.js

@@ -27,8 +27,12 @@ layui.define(['zlContext', 'table', 'layer', 'zlConfig', 'tree'], function (expo
             }
             ret = layui.ComponentSettings[obj.$elem.attr('name')];
             if (ret) {
+                if (typeof ret === "function") {
+                    return ret();
+                } else {
                     return ret;
                 }
+            }
         },
         render: function ($elem, value, text) {
             var showvalue = (value == undefined ? ($elem.attr('value') == undefined ? "" : $elem.attr('value')) : value);

modules/kdayun-app/src/main/resources/static/framework/zlPopSourceForm.js

@@ -24,8 +24,12 @@ layui.define(['zlContext', 'zlDynamicCondition', 'table', 'layer', 'zlConfig'],
             }
             ret = layui.ComponentSettings[obj.$elem.attr('name')];
             if (ret) {
+                if (typeof ret === "function") {
+                    return ret();
+                } else {
                     return ret;
                 }
+            }
         },
         render: function ($elem, value, text) {
             obj.$elem = $elem

modules/kdayun-app/src/main/resources/static/framework/zlSelectEx.js

@@ -33,8 +33,12 @@ layui.define(['zlConfig', 'form'], function (exports) {
             }
             ret = layui.ComponentSettings[obj.$elem.attr('name')];
             if (ret) {
+                if (typeof ret === "function") {
+                    return ret();
+                } else {
                     return ret;
                 }
+            }
         },
         render: function ($elem, value, reload) {
             obj.$elem = $elem

modules/kdayun-app/src/main/resources/static/framework/zlSelectMultiple.js

@@ -36,8 +36,12 @@ layui.define(['zlConfig'], function (exports) {
             }
             ret = layui.ComponentSettings[obj.$elem.attr('name')];
             if (ret) {
+                if (typeof ret === "function") {
+                    return ret();
+                } else {
                     return ret;
                 }
+            }
         },
         render: function ($elem, value, options) {
             obj.$elem = $elem

modules/kdayun-app/src/main/resources/static/framework/zlSelecttree.js

@@ -32,8 +32,12 @@ layui.define(['laypage', 'layer', 'form', 'zlConfig', 'zlContext'], function (ex
             }
             ret = layui.ComponentSettings[obj.$elem.attr('name')];
             if (ret) {
+                if (typeof ret === "function") {
+                    return ret();
+                } else {
                     return ret;
                 }
+            }
         },
         render: function ($elem, value) {
             obj.$elem = $elem

modules/kdayun-app/src/main/resources/static/framework/zlpoptree.js

@@ -16,13 +16,16 @@ layui.define(['zlContext', 'layer', 'zlConfig', 'form'], function (exports) {
             var ret = {};
             ret = obj.$elem.attr('settings');
             if (ret) {
-                ret.callback
                 return JSON.parse(ret);
             }
             ret = layui.ComponentSettings[obj.$elem.attr('name')];
             if (ret) {
+                if (typeof ret === "function") {
+                    return ret();
+                } else {
                     return ret;
                 }
+            }
         },
         render: function ($elem, value, text) {
             obj.$elem = $elem
@@ -164,7 +167,8 @@ layui.define(['zlContext', 'layer', 'zlConfig', 'form'], function (exports) {
             $('input[name="' + inputhiddename + '"]').remove();
             $elem.append(html.join(''));
             $parent.append(parenthtml.join(''));
-            newoptions = $.extend({}, defaultsetting, options);
+            //这里重新赋值了callback 不然有可能会被optins.callback给覆盖
+            newoptions = $.extend({}, defaultsetting, options, { callback: defaultsetting.callback });
             if (newoptions.edittype == 'edit') {
                 $('div[name="' + divname + '"]').append(' <i class="layui-icon layui-icon-more layui-i-add" id="' + addspanid + '"></i> ' + '     <i class="layui-icon layui-icon-close layui-i-del" id="' + delspanid + '"></i> ')
             }

modules/kdayun-app/src/main/resources/static/libs/formdesign/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+// import "yh-antdesign/dist/datadisplay/AntCalendar";
 require("yh-baidu/dist/index");
 require("yh-bigscreen/dist/index");
 require("yh-business/dist/index");

modules/kdayun-app/src/main/resources/static/libs/formdesign/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAEA,+BAA6B;AAC7B,mCAAiC;AACjC,kCAAgC;AAChC,+BAA6B;AAC7B,kDAAgD;AAChD,kDAAgD;AAChD,8CAA4C;AAC5C,6CAA2C;AAC3C,2CAAyC;AACzC,6BAA2B;AAC3B,+BAA6B;AAC7B,gCAA8B;AAC9B,uCAAqC;AACrC,yCAAuC;AACvC,uCAAqC;AACrC,yCAAuC;AACvC,+BAA6B;AAC7B,oCAAkC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAEA,sDAAsD;AACtD,+BAA6B;AAC7B,mCAAiC;AACjC,kCAAgC;AAChC,+BAA6B;AAC7B,kDAAgD;AAChD,kDAAgD;AAChD,8CAA4C;AAC5C,6CAA2C;AAC3C,2CAAyC;AACzC,6BAA2B;AAC3B,+BAA6B;AAC7B,gCAA8B;AAC9B,uCAAqC;AACrC,yCAAuC;AACvC,uCAAqC;AACrC,yCAAuC;AACvC,+BAA6B;AAC7B,oCAAkC"}

modules/kdayun-app/src/main/resources/static/libs/formdesign/libs/layui/lay/modules/table.js

@@ -1025,8 +1025,8 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function (exports)
             /**
              * 渲染cardList 的td
              */
-            renderCardListTd = function (col, row, rowIndex, rowNo) {
+            renderCardListTd = function (col,colIndex, row, rowIndex, rowNo) {
-                var field = col.field
+                var field = col.field ||colIndex
                     , key = options.index + '-' + col.key
                     , content = row[field]
                     , title = col.title;
@@ -1130,8 +1130,8 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function (exports)
             /**
              * 
              */
-            renderImageListTd = function (col, row, rowIndex, rowNo) {
+            renderImageListTd = function (col,colIndex, row, rowIndex, rowNo) {
-                var field = col.field
+                var field = col.field||colIndex
                     , key = options.index + '-' + col.key
                     , content = row[field]
                     , title = col.title,
@@ -1239,8 +1239,8 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function (exports)
             /**
              * 列表view渲染
              */
-            renderListTd = function (col, row, rowIndex, rowNo) {
+            renderListTd = function (col, colIndex, row, rowIndex, rowNo) {
-                var field = col.field
+                var field = col.field || colIndex
                     , key = options.index + '-' + col.key
                     , content = row[field]
                     , title = col.title;
@@ -1347,7 +1347,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function (exports)
                     numbers = rowIndex + options.limit * (curr - 1) + 1;
                 that.eachCols(function (colIndex, col) {
                     if (col.colGroup) return;
-                    var ret = renderCardListTd(col, row, rowIndex, numbers);
+                    var ret = renderCardListTd(col,colIndex, row, rowIndex, numbers);
                     infotds.push(ret.infotds);
                     tds.push(ret.td);
                     if (col.type === 'radio') {
@@ -1365,7 +1365,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function (exports)
                     numbers = rowIndex + options.limit * (curr - 1) + 1;
                 that.eachCols(function (colIndex, col) {
                     if (col.colGroup) return;
-                    var ret = renderImageListTd(col, row, rowIndex, numbers);
+                    var ret = renderImageListTd(col,colIndex, row, rowIndex, numbers);
                     tds.push(ret.td);
                     tileDivs.push(ret.title);
                     if (col.fixed && col.fixed !== 'right') tds_fixed.push(td);
@@ -1393,7 +1393,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function (exports)
                     numbers = rowIndex + options.limit * (curr - 1) + 1;
                 that.eachCols(function (colIndex, col) {
                     if (col.colGroup) return;
-                    var td = renderListTd(col, row, rowIndex, numbers);
+                    var td = renderListTd(col, colIndex, row, rowIndex, numbers);
                     tds.push(td);
                     if (col.fixed && col.fixed !== 'right') tds_fixed.push(td);
                     if (col.fixed === 'right') tds_fixed_r.push(td);

modules/kdayun-app/src/main/resources/static/libs/formdesign/preview.js.map

@@ -1 +1 @@
-{"version":3,"file":"preview.js","sourceRoot":"","sources":["../src/preview.ts"],"names":[],"mappings":";;AAAA,+BAA6B;AAC7B,mCAAiC;AACjC,kCAAgC;AAChC,+BAA6B;AAC7B,kDAAgD;AAChD,kDAAgD;AAChD,6CAA2C;AAC3C,2CAAyC;AACzC,6BAA2B;AAC3B,+BAA6B;AAC7B,gCAA8B;AAC9B,uCAAqC;AACrC,yCAAuC;AACvC,uCAAqC;AACrC,yCAAuC;AACvC,+BAA6B;AAC7B,oCAAkC"}
+{"version":3,"file":"preview.js","sourceRoot":"","sources":["../src/preview.ts"],"names":[],"mappings":";;AACA,sDAAsD;AACtD,+BAA6B;AAC7B,mCAAiC;AACjC,kCAAgC;AAChC,+BAA6B;AAC7B,kDAAgD;AAChD,kDAAgD;AAChD,6CAA2C;AAC3C,2CAAyC;AACzC,6BAA2B;AAC3B,+BAA6B;AAC7B,gCAA8B;AAC9B,uCAAqC;AACrC,yCAAuC;AACvC,uCAAqC;AACrC,yCAAuC;AACvC,+BAA6B;AAC7B,oCAAkC"}

modules/kdayun-app/src/main/resources/static/libs/formdesign/types.txt

@@ -1323,6 +1323,10 @@ isbigscreen: boolean
 *页面模型的唯一id
 */ 
 modelId: string
+/**
+*页面的版本号
+*/ 
+version: string
 
 /**
 * 关闭页面窗口
@@ -6037,6 +6041,13 @@ getDataArrayByField(fieldName: string): any[]
 */ 
 getDatas(): any[]
 
+/**
+* 得到数据源的所有行的错误
+* @returns 返回错误的数组
+
+*/ 
+getError(): IRowFieldError[]
+
 /**
 * 获取字段
 * @param fieldName  字段名称* @returns 字段的实例
@@ -6110,6 +6121,13 @@ getSortState(): ISortInfo
 */ 
 getTotalCount(): number
 
+/**
+* 数据源内的行是否存在错误
+* @returns 返回是否存在行的错误
+
+*/ 
+hasError(): boolean
+
 /**
 * 获取行
 * @param row  行* @returns 返回对应的记录的index, 不存在返回 -1
@@ -7163,6 +7181,13 @@ cancelEdit(): void
 */ 
 clearError(): void
 
+/**
+* 清楚行的错误
+* @param fieldName  字段编号
+
+*/ 
+clearErrorByField(fieldName: string): void
+
 /**
 * 清理额外的参数对象
 
@@ -7227,6 +7252,27 @@ getDataSource(): DataSourceBase
 */ 
 getDatas(): any
 
+/**
+* 得到列的编辑错误对象
+* @param fieldName  字段编号* @returns 返回对应的错误对象
+
+*/ 
+getError(fieldName: string): IRowFieldError
+
+/**
+* 得到类的对应行的编辑错误信息
+* @param fieldName  字段编号* @returns 返回对应的错误信息
+
+*/ 
+getErrorByRow(fieldName: string): string
+
+/**
+* 得到行的所有错误对象
+* @returns 行的所有错误对象数组
+
+*/ 
+getErrors(): IRowFieldError[]
+
 /**
 * 得到额外参数
 用于提交时候附带到服务器端的参数
@@ -7242,6 +7288,13 @@ getExtralParams(): object
 */ 
 getField(fieldName: string): IField
 
+/**
+* 返回行是否隐藏,组件的显示会用到
+* @returns true 隐藏/ false 显示
+
+*/ 
+getHide(): boolean
+
 /**
 * 获取行的id
 * @returns 返回行的主键值
@@ -7334,6 +7387,15 @@ set(fieldName: string,value: any): void
 */ 
 setCheck(value: boolean): void
 
+/**
+* 设置错误
+* @param fieldName  字段编号
+* @param errValue  错误的值
+* @param error  错误信息
+
+*/ 
+setError(fieldName: string,errValue: string,error: string): void
+
 /**
 * 设置附带额外的参数.
 * @param param  参数对象
@@ -7341,6 +7403,13 @@ setCheck(value: boolean): void
 */ 
 setExtralParams(param: object): void
 
+/**
+* 设置行是否隐藏
+* @param hide  true 隐藏/ false 显示
+
+*/ 
+setHide(hide: boolean): void
+
 /**
 * 设置行的状态
 * @param v  状态值
@@ -7382,6 +7451,24 @@ __pageparam: any
 __state: RowState
 } 
 /**
+*编辑错误
+*/ 
+interface IRowFieldError  { 
+/**
+*错误信息字符串
+*/ 
+error: string
+/**
+*所属的行
+注意:这个属性的值,一般情况是 null (为了避免循环引用导致的序列化死循环), 只有在调用 getErrors() 时候才会有值.
+*/ 
+row: Row
+/**
+* 错误的值(临时存储)
+*/ 
+value: any
+} 
+/**
 *排序的类型
 */ 
 class SortTypes  { 
@@ -9335,7 +9422,7 @@ onSelectChanged(callback: onSelectChangedHandle): void
 selectNode(treeNode: ITreeNode,addFlag: Boolean,isSilent: boolean): void
 
 /**
-* 通过id选中指定节点
+* 通过id选中指定节点(焦点停留在该节点)
 * @param id  需要被选中的节点id
 * @param addFlag  true 表示追加选中，会出现多点同时被选中的情况  false （默认）表示单独选中，原先被选中的节点会被取消选中状态
 * @param isSilent  true 选中节点时，不会让节点自动滚到到可视区域内  false （默认）表示选中节点时，会让节点自动滚到到可视区域内
@@ -9343,6 +9430,14 @@ selectNode(treeNode: ITreeNode,addFlag: Boolean,isSilent: boolean): void
 */ 
 selectNodeById(id: string,addFlag: Boolean,isSilent: boolean): void
 
+/**
+* 隐藏/显示节点
+* @param id  节点的id
+* @param visiable  显示隐藏 true 显示节点,则反之
+
+*/ 
+setNodeVisable(id: string,visiable: boolean): void
+
 /**
 * 更新某节点数据，主要用于该节点显示属性的更新。
 * @param id  节点的id
@@ -10754,6 +10849,10 @@ interface Iitem  {
 */ 
 checked: boolean
 /**
+*隐藏
+*/ 
+hide: boolean
+/**
 *标题
 */ 
 title: string
@@ -12107,6 +12206,7 @@ el: JQuery<any>
 *组件属性序列化辅助类
 */ 
 class ComponetSerializerPropoty  { 
+static dependencies: any
 /**
 *需要序列化的属性对象
 后面继承的组件需要设置保存的属性
@@ -12120,6 +12220,22 @@ static serializePropertys: any
 */ 
 static getComponentSerializePropertys(compnent: any): any
 
+/**
+* 获取依赖项
+* @param compnent  组件实例* @returns 返回依赖配置集合
+
+*/ 
+static getDependencies(compnent: any): any
+
+/**
+* 设置依赖项
+* @param compnent  组件实例
+* @param propertyName  属性名
+* @param dependencyType  依赖的类型
+
+*/ 
+static setDependencies(compnent: any,propertyName: string,dependencyType: DependencyType): void
+
 /**
 * 设置序列化属性
 * @param compnent  组件
@@ -12135,10 +12251,29 @@ static setSerializePropertys(compnent: any,propertyName: string,dataTytpe: any,d
 *组件序列化接口
 */ 
 interface ICompnentSerializerPropoty  { 
+/**
+*数据类型
+*/ 
 dataType: any
+/**
+*默认值
+*/ 
 defalut: any
 } 
 /**
+*组件依赖
+*/ 
+interface IDependency  { 
+/**
+*依赖的类型
+*/ 
+type: DependencyType
+/**
+*依赖的值
+*/ 
+value: string
+} 
+/**
 *平台全局配置类型
 包含了api接口 请求的地址
 */ 
@@ -12789,6 +12924,32 @@ enum ContentType {
 */ 
 enum DataType {
    html = "html",json = "json",text = "text"
+} 
+ /**
+*依赖的类型
+*/ 
+enum DependencyType {
+   
+/**
+*文件资源
+*/ 
+file = "file",
+/**
+*菜单资源
+*/ 
+menu = "menu",
+/**
+*表单资源
+*/ 
+pageModel = "pageModel",
+/**
+*模板资源
+*/ 
+templete = "templete",
+/**
+*工作流资源
+*/ 
+workflow = "workflow"
 } 
  /**
 *http的请求类型
@@ -14423,6 +14584,13 @@ addCheckItem(item: ICheckItem): void
 */ 
 getArrayValue(): string[]
 
+/**
+* 通过值返回item
+* @param val  值* @returns 返回item实例
+
+*/ 
+getItemByVal(val: string): number | ICheckItem | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any
+
 /**
 * 值发生改变事件
 * @param callback  事件回调函数
@@ -14437,6 +14605,14 @@ onValueChanged(callback: onCheckedHandle): void
 */ 
 removeCheckItem(v: string): void
 
+/**
+* 设置item的是否可见
+* @param item  item 实例
+* @param visiable  true 可见,则反之
+
+*/ 
+setItemVisable(item: ICheckItem,visiable: boolean): void
+
 /**
 * 设置checkBox的值
 * @param value  组件值,可以是 字符串或者字符串数组
@@ -14454,6 +14630,14 @@ interface ICheckItem  {
 */ 
 checked: boolean
 /**
+*组
+*/ 
+group: string
+/**
+*隐藏
+*/ 
+hide: boolean
+/**
 *标题
 */ 
 title: string
@@ -14612,6 +14796,13 @@ class InputRadio  extends InputBase {
 */ 
 addRadioItem(item: IRadioItem): void
 
+/**
+* 通过值返回item
+* @param val  值* @returns 返回item实例
+
+*/ 
+getItemByVal(val: string): number | IRadioItem | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any | any
+
 /**
 * 得到组件值
 * @returns 得到组件值
@@ -14626,12 +14817,6 @@ getValue(): string
 */ 
 onValueChanged(callback: onRadioChangeHandle): void
 
-/**
-* 执行界面编辑器设置的监听radio单选事件
-
-*/ 
-raiseOnRadioScript(): void
-
 /**
 * 移除选项
 * @param v  值或名称
@@ -14639,6 +14824,14 @@ raiseOnRadioScript(): void
 */ 
 removeRadioItem(v: string): void
 
+/**
+* 设置item的是否可见
+* @param item  item 实例
+* @param visiable  true 可见,则反之
+
+*/ 
+setItemVisable(item: IRadioItem,visiable: boolean): void
+
 /**
 * 设置组件值
 * @param value  组件值
@@ -14656,6 +14849,10 @@ interface IRadioItem  {
 */ 
 checked: boolean
 /**
+*隐藏
+*/ 
+hide: boolean
+/**
 *标题
 */ 
 title: string
@@ -14670,7 +14867,7 @@ val: string
 *@param cmp 组件实例e
     
         */ 
-declare type onRadioHandle = (cxt: ScriptContext,cmp: InputRadio) => void
+declare type onRadioHandle = (cxt: ScriptContext,cmp: InputRadio,value: boolean) => void
 /**
 *label 开关组件
 */ 
@@ -14999,7 +15196,23 @@ stop(): void
 *文件上传类型
 */ 
 enum UploadAccept {
-   audio = "audio",file = "file",images = "images",video = "video"
+   
+/**
+*音频
+*/ 
+audio = "audio",
+/**
+*所有文件
+*/ 
+file = "file",
+/**
+*图片
+*/ 
+images = "images",
+/**
+*视频
+*/ 
+video = "video"
 } 
  /**
 *上传组件
@@ -15014,7 +15227,8 @@ accept: UploadAccept
 /**
 *规定打开文件选择框时，筛选出的文件类型，值为用逗号隔开的 MIME 类型列表
 acceptMime: 'image/*'（只显示图片文件）
-acceptMime: 'image/jpg, image/png'（只显示 jpg 和 png 文件）
+acceptMime: 'image/gif,image/jpeg,image/png'（只显示 jpg 和 png 文件）
+acceptMime: '.gif,.jpg,.png'（只显示 jpg,gif,png 后缀名的）
 */ 
 acceptMime: string
 /**
@@ -15031,7 +15245,7 @@ bindAction: string | JQuery<any>
 */ 
 data: string
 /**
-*允许上传的文件后缀。一般结合 accept 参数类设定
+*允许上传的文件后缀的正则表达式。一般结合 accept 参数类设定
 只允许上传压缩格式的文件:'zip$|rar$|7z$' ;只允许上传图片: jpg$|png$|gif$|bmp$|jpeg$
 */ 
 exts: string
@@ -15508,6 +15722,11 @@ indexName: string
 */ 
 isColumnDrag: any
 /**
+*设计模式下是否拖拽释放时候创建的组件
+有些组件需要区分这个,来增加默认值
+*/ 
+isDropCreate: boolean
+/**
 *是否权限资源
 true可以在用户权限内看到改资源的控制,false 则看不到资源
 */ 
@@ -15721,6 +15940,11 @@ hitTitle: string
 */ 
 id: string
 /**
+*设计模式下是否拖拽释放时候创建的组件
+有些组件需要区分这个,来增加默认值
+*/ 
+isDropCreate: boolean
+/**
 *是否权限资源
 true可以在用户权限内看到改资源的控制,false 则看不到资源
 */ 
@@ -15921,6 +16145,11 @@ hitTitle: string
 */ 
 id: string
 /**
+*设计模式下是否拖拽释放时候创建的组件
+有些组件需要区分这个,来增加默认值
+*/ 
+isDropCreate: boolean
+/**
 *是否权限资源
 true可以在用户权限内看到改资源的控制,false 则看不到资源
 */ 
@@ -16373,6 +16602,11 @@ hitTitle: string
 */ 
 id: string
 /**
+*设计模式下是否拖拽释放时候创建的组件
+有些组件需要区分这个,来增加默认值
+*/ 
+isDropCreate: boolean
+/**
 *是否权限资源
 true可以在用户权限内看到改资源的控制,false 则看不到资源
 */ 
@@ -16453,6 +16687,11 @@ hitTitle: string
 */ 
 id: string
 /**
+*设计模式下是否拖拽释放时候创建的组件
+有些组件需要区分这个,来增加默认值
+*/ 
+isDropCreate: boolean
+/**
 *是否权限资源
 true可以在用户权限内看到改资源的控制,false 则看不到资源
 */ 
@@ -16857,6 +17096,15 @@ setView(view: TableViewBase): void
 setWidth(value: string | number): void
 
 } 
+/**
+        *编辑中校验脚本回调
+        *@param column 列实例
+*@param row 行实例
+*@param newvalue 新的值
+*@returns undefined null 允许通过, 非空则返回错误信息
+    
+        */ 
+declare type OnEditorCheckValue = (column: TableColumn,row: Row,newvalue: any) => string
 /**
         *编辑完发生变化回调
         *@param column 列实例
@@ -16871,6 +17119,7 @@ declare type OnEditorValueChanged = (column: TableColumn,row: Row,value: any) =>
 *@param row 行实例
 *@param newvalue 新的值
 *@param oldvalue 旧的值
+*@returns undefined true 允许修改,则反之
     
         */ 
 declare type OnEditorValueChanging = (column: TableColumn,row: Row,newvalue: any,oldvalue: any) => boolean
@@ -16928,6 +17177,14 @@ class TableListViewCheckBoxColumn  extends TableListViewColumnBase {
 */ 
 class TableListViewColumnBase  extends TableColumn { 
 
+/**
+* 解析值
+* @param row  行实例
+* @param value  值* @returns 返回解析过的值
+
+*/ 
+paserValue(row: Row,value: any): any
+
 } 
 /**
 * 自定义列
@@ -19072,6 +19329,26 @@ code: string
 *选中地区的名字
 */ 
 name: string
+} 
+/**
+*VantButton 按钮
+*/ 
+class VantButton  extends MComponentBase { 
+
+/**
+* 注册点击按钮，且按钮状态不为加载或禁用时触发
+* @param event  点击元素返回的dom节点
+
+*/ 
+onBtnClick(event: Event): void
+
+/**
+* 注册开始触摸按钮时触发
+* @param event  点击元素返回的dom节点
+
+*/ 
+onTouchstart(event: TouchEvent): void
+
 } 
 /**
 *设置组件的类型
@@ -19406,6 +19683,18 @@ onRateChange(val: String | Number): void
 class VantTextarea  extends MVantInputBase { 
 inputId: string
 
+} 
+/**
+*列表容器
+*/ 
+class ListContainer  extends MComponentBase { 
+
+} 
+/**
+*菜单列表
+*/ 
+class ListMenu  extends MComponentBase { 
+
 } 
 /**
 *移动端菜单组件
@@ -19419,6 +19708,12 @@ class MemuItem  extends MComponentBase {
 */ 
 onClick(handle: onClickHandle): void
 
+} 
+/**
+*单元格列表
+*/ 
+class VanCellGroup  extends MComponentBase { 
+
 } 
 /**
 *移动端单元格组件
@@ -19511,6 +19806,97 @@ setColumns(columns: any[]): void
 */ 
 class ImglistImgPanel  extends FieldDbComponentBase { 
 
+} 
+/**
+*卡片列表
+*/ 
+class VantImgList  extends MDbComponentBase { 
+/**
+*是否加载完成
+*/ 
+finished: Boolean
+/**
+*获取数据返回的数据
+*/ 
+listDatas: Row[]
+/**
+*是否加载
+*/ 
+loading: Boolean
+/**
+*是否刷新
+*/ 
+refreshing: Boolean
+
+/**
+* 得到列的组数
+* @returns 列的组数
+
+*/ 
+getColumns(): ImgListView[]
+
+/**
+* 获取数据
+* @returns 返回数据数组
+
+*/ 
+getDatas(): Row[]
+
+/**
+* 得到所有的页签不管 可见/隐藏
+* @returns 返回可见/隐藏页签数组
+
+*/ 
+getImgListViews(): ImgListView[]
+
+/**
+* 获取数据
+* @returns 返回当前数据源的数组
+
+*/ 
+getRows(): Row[]
+
+/**
+* 获取数据源的总数量
+* @returns 返回当前数据源的总数量
+
+*/ 
+getRowsCount(): number
+
+/**
+* 获取所有的视图
+* @returns 当前的视图数组
+
+*/ 
+getViews(): ImgListView
+
+/**
+* 从后台加载数据
+* @param paramObj  参数对象
+* @param isNew  可选参数 默认值:false 重新一次查询清掉所有的以前查的参数
+
+*/ 
+loadData(paramObj: IDsLoadOptions,isNew: boolean): void
+
+/**
+* 刷新数据 只是刷新本地数据源,如果需要刷新后台的数据使用loadData
+
+*/ 
+refresh(): void
+
+/**
+* 渲染data的数据
+
+*/ 
+rendItem(): void
+
+/**
+* 设置类数组
+* @param columns  列数组
+
+*/ 
+setColumns(columns: ImgListView[]): void
+
 } 
 /**
 * 移动端图片列表容器配置接口
@@ -19562,6 +19948,69 @@ class ItemPanel  extends ContainerBase {
 */ 
 getTabIndex(): number
 
+} 
+/**
+*列表
+*/ 
+class VantList  extends MDbComponentBase { 
+/**
+*是否加载完成
+*/ 
+finished: Boolean
+/**
+*获取数据返回的数据
+*/ 
+listDatas: any[]
+/**
+*是否加载
+*/ 
+loading: Boolean
+/**
+*是否刷新
+*/ 
+refreshing: Boolean
+
+/**
+* 获取数据
+* @returns 返回当前数据源的数组
+
+*/ 
+getDatas(): Row[]
+
+/**
+* 获取数据源的总数量
+* @returns 返回当前数据源的总数量
+
+*/ 
+getRowsCount(): number
+
+/**
+* 得到所有的页签不管 可见/隐藏
+* @returns 返回可见/隐藏页签数组
+
+*/ 
+getTabs(): ItemPanel[]
+
+/**
+* 从后台加载数据
+* @param paramObj  参数对象
+* @param isNew  可选参数 默认值:false 重新一次查询清掉所有的以前查的参数
+
+*/ 
+loadData(paramObj: IDsLoadOptions,isNew: boolean): void
+
+/**
+* 刷新数据 只是刷新本地数据源,如果需要刷新后台的数据使用loadData
+
+*/ 
+refresh(): void
+
+/**
+* 渲染data的数据
+
+*/ 
+rendItem(): void
+
 } 
 /**
 *卡片内容的标题组件
@@ -19621,6 +20070,97 @@ onCardViewClick(handle: OnCardViewClickHandle): void
 */ 
 setColumns(columns: any[]): void
 
+} 
+/**
+*卡片列表
+*/ 
+class VantListCard  extends MDbComponentBase { 
+/**
+*是否加载完成
+*/ 
+finished: Boolean
+/**
+*获取数据返回的数据
+*/ 
+listDatas: Row[]
+/**
+*是否加载
+*/ 
+loading: Boolean
+/**
+*是否刷新
+*/ 
+refreshing: Boolean
+
+/**
+* 得到所有的页签不管 可见/隐藏
+* @returns 返回可见/隐藏页签数组
+
+*/ 
+getCardViews(): CardView[]
+
+/**
+* 得到列的组数
+* @returns 列的组数
+
+*/ 
+getColumns(): CardView[]
+
+/**
+* 获取数据
+* @returns 返回数据数组
+
+*/ 
+getDatas(): Row[]
+
+/**
+* 获取数据
+* @returns 返回当前数据源的数组
+
+*/ 
+getRows(): Row[]
+
+/**
+* 获取数据源的总数量
+* @returns 返回当前数据源的总数量
+
+*/ 
+getRowsCount(): number
+
+/**
+* 获取所有的视图
+* @returns 当前的视图数组
+
+*/ 
+getViews(): CardView
+
+/**
+* 从后台加载数据
+* @param paramObj  参数对象
+* @param isNew  可选参数 默认值:false 重新一次查询清掉所有的以前查的参数
+
+*/ 
+loadData(paramObj: IDsLoadOptions,isNew: boolean): void
+
+/**
+* 刷新数据 只是刷新本地数据源,如果需要刷新后台的数据使用loadData
+
+*/ 
+refresh(): void
+
+/**
+* 渲染data的数据
+
+*/ 
+rendItem(): void
+
+/**
+* 设置类数组
+* @param columns  列数组
+
+*/ 
+setColumns(columns: CardView[]): void
+
 } 
 /**
 *卡片列表组件接口

modules/kdayun-app/src/main/resources/static/modules/manager/corefunction/corefunction.js

@@ -2,7 +2,7 @@
  *  功能管理
  */
 var editObj = null, ptable = null, treeGrid = null, tableId = 'treeTable', layer = null;
-layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm', 'zlSelectEx', 'zlPinYin', 'zlFormulaCmp','theme'], function (exports) {
+layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm', 'zlSelectEx', 'zlPinYin', 'zlFormulaCmp', 'theme'], function (exports) {
     var $ = layui.$
         , zlContext = layui.zlContext
         , layer = layui.layer
@@ -23,7 +23,7 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
         method: 'post',
         formtitle: '选择表单',
     };
-    layui.ComponentSettings = {
+    layui.ComponentSettings = $.extend(layui.ComponentSettings, {
         SYS_PARENTID: {
             dataurl: layui.cache['contentPath'] + '/manager/corefunction/query',
             method: "post",
@@ -73,7 +73,7 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
                 form.render('select')
             }
         },
-    };
+    });
     var frm = [
         '<div class="layui-tab layui-tab-card layui-col-md12">'
         , '  <ul class="layui-tab-title">'
@@ -207,7 +207,7 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
     }
     //展开或折叠全部
     $('#btnopenall').on('click', function () {
-        var treedata = treeGrid.getDataTreeList('treeTable');
+        var treedata = treeGrid.getDataTreeList(tableId);
         if ($(this).find('i').hasClass("layui-icon-down")) {
             $(this).find('i').removeClass("layui-icon-down").addClass("layui-icon-up");
             $(this).find('span').text("收起全部")
@@ -215,10 +215,10 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
             $(this).find('i').removeClass("layui-icon-up").addClass("layui-icon-down");
             $(this).find('span').text("展开全部")
         }
-        treeGrid.treeOpenAll('treeTable', !treedata[0][treeGrid.config.cols.isOpen]);
+        treeGrid.treeOpenAll(tableId, !treedata[0][treeGrid.config.cols.isOpen]);
     });
     $('#btnnew').on('click', function () {
-        var checkStatus = treeGrid.checkStatus('treeTable')
+        var checkStatus = treeGrid.checkStatus(tableId)
             , rows = checkStatus.data;
         if (rows.length > 1) {
             zlContext.warnMsg("不能同时两个功能点下增加功能！");
@@ -255,7 +255,7 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
 
     function selectChange(url, RELE_RES_ID) {
         if (url && url.indexOf('isnewtab') > -1) {
-            layui.ComponentSettings = {
+            layui.ComponentSettings = $.extend(layui.ComponentSettings, {
                 daping: {
                     value: RELE_RES_ID,
                     placeholder: '如果需要大屏展示请选择',
@@ -264,7 +264,7 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
                     method: 'POST',
                     dataurl: '' + layui.cache['contentPath'] + '/manager/largescreen/query'
                 }
-            };
+            });
 
             $('#addnew div[name="RELE_RES_ID"]').attr('value', '');
         }
@@ -284,7 +284,7 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
     }
 
     $('#btndel').on('click', function () {
-        var checkStatus = treeGrid.checkStatus('treeTable')
+        var checkStatus = treeGrid.checkStatus(tableId)
             , rows = checkStatus.data;
         if (rows.length == 0) {
             zlContext.warnMsg("请选择需要删除的功能节点");
@@ -305,10 +305,20 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
             //删除对应行（tr）的DOM结构
             //向服务端发送删除指令
             zlContext.deletePost(layui.cache['contentPath'] + '/manager/corefunction/del', rows, function (result) {
+                var row =rows[0]
+                var parents = treeGrid.treeFindUpDatas(tableId, row);
+                if (parents.length > 0) {
+                    row = parents[0];
+                }
+                treeGrid.savePos(tableId, row.RWID);
+
                 if (result[statusName] == OK) {
-                    treeGrid.reload('treeTable', {
+                    treeGrid.reload(tableId, {
                         url: layui.cache['contentPath'] + '/manager/corefunction/query',
-                        method: 'POST'
+                        method: 'POST',
+                        done: function (res, curr, count) {
+                            treeGrid.gotoPos(tableId);
+                        }
                     });
                     form.render();
                     zlContext.successMsg('删除成功');
@@ -322,7 +332,7 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
     });
 
     $('#btnedit').on('click', function () {
-        var checkStatus = treeGrid.checkStatus('treeTable')
+        var checkStatus = treeGrid.checkStatus(tableId)
             , rows = checkStatus.data;
         if (rows.length == 0) {
             zlContext.warnMsg("请选择需要修改的功能节点！");
@@ -442,7 +452,11 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
         });
 
     }
-
+    function getCheckRow() {
+        var checkStatus = treeGrid.checkStatus(tableId),
+            rows = checkStatus.data;
+        return rows;
+    }
     form.on('submit(addfunction)', function (data) {
         if ($(data.elem).hasClass('getField')) {
             newFormObj.newFields = data.field
@@ -469,9 +483,15 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
             function (data) {
                 if (data[statusName] == OK) {
                     layer.close(formindex);
-                    treeGrid.reload('treeTable', {
+                    var row = getCheckRow()[0];
+                    treeGrid.savePos(tableId, row.RWID);
+                    treeGrid.reload(tableId, {
                         url: layui.cache['contentPath'] + '/manager/corefunction/query',
-                        method: 'POST'
+                        method: 'POST',
+                        done: function (res, curr, count) {
+                            treeGrid.gotoPos(tableId);
+                            treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
+                        }
                     });
                     zlContext.successMsg('保存成功');
                 } else {
@@ -497,7 +517,7 @@ layui.use(['element', 'table', 'tree', 'treeGrid', 'zlpoptree', 'zlPopSourceForm
     $('#btnSeacher').on('click', function () {
         isloadsearch = true;
         var seachervalue = $('#edtSeacherValue').val();
-        treeGrid.reload('treeTable', {
+        treeGrid.reload(tableId, {
             url: layui.cache['contentPath'] + '/manager/corefunction/query',
             method: 'POST',
             where: { searchvalue: seachervalue }

modules/kdayun-app/src/main/resources/static/modules/manager/coremenu/coremenu.js

@@ -8,6 +8,7 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
         zlpoptree = layui.zlpoptree,
         statusName = zlConfig.global.result.statusName,
         msgName = zlConfig.global.result.msgName,
+        dataName = zlConfig.global.result.dataName,
         OK = zlConfig.global.result.okState,
         form = layui.form,
         treeGrid = layui.treeGrid,
@@ -50,12 +51,14 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
             formtitle: '选择功能',
             placeholder: '请选择功能'
         },
-        SYS_PARENTID: {
+        SYS_PARENTID: function () {
+            return {
                 dataurl: layui.cache['contentPath'] + '/manager/coremenu/query?orgid=' + $('input[name = "ORGIDTEMP"]').val(),
                 method: 'post',
                 formtitle: '选择上级菜单',
                 edittype: 'edit'
             }
+        }
     };
     var frm = [
         '<form class="layui-form " style="margin:8px" id="addnew" >'
@@ -160,7 +163,7 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
                 shade: 0.1
             });
             $('input[name="ORGIDTEMP"]').val(treeNode.RWID);
-            treeGrid.reload('treeTable', {
+            treeGrid.reload(tableId, {
                 url: layui.cache['contentPath'] + '/manager/coremenu/query?orgid=' + $('input[name="ORGIDTEMP"]').val(),
                 height: fullheight,
                 method: 'POST',
@@ -265,7 +268,7 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
 
     // 展开或折叠全部
     $('#btnopenall').on('click', function () {
-        var treedata = treeGrid.getDataTreeList('treeTable');
+        var treedata = treeGrid.getDataTreeList(tableId);
         if ($(this).find('i').hasClass("layui-icon-down")) {
             $(this).find('i').removeClass("layui-icon-down").addClass("layui-icon-up");
             $(this).find('span').text("收起全部")
@@ -273,12 +276,12 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
             $(this).find('i').removeClass("layui-icon-up").addClass("layui-icon-down");
             $(this).find('span').text("展开全部");
         }
-        treeGrid.treeOpenAll('treeTable', !treedata[0][treeGrid.config.cols.isOpen]);
+        treeGrid.treeOpenAll(tableId, !treedata[0][treeGrid.config.cols.isOpen]);
     });
 
     $('#btnnew').on('click', function () {
         var showform = frm.join('');
-        var checkStatus = treeGrid.checkStatus('treeTable'),
+        var checkStatus = treeGrid.checkStatus(tableId),
             rows = checkStatus.data;
         if (rows.length > 1) {
             zlContext.errorMsg("不能同时在两个菜单下增加菜单！");
@@ -324,7 +327,7 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
     });
 
     $('#btndel').on('click', function () {
-        var checkStatus = treeGrid.checkStatus('treeTable'),
+        var checkStatus = treeGrid.checkStatus(tableId),
             rows = checkStatus.data;
         if (rows.length == 0) {
             zlContext.warnMsg("请选择需要删除的菜单");
@@ -362,11 +365,19 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
                 param,
                 function (data) {
                     if (data[statusName] == OK) {
-                        treeGrid.reload('treeTable', {
+                        var row = rows[0];
+                       var parents= treeGrid.treeFindUpDatas(tableId, row);
+                       if(parents.length>0){
+                            row=parents[0];
+                       }
+                        treeGrid.savePos(tableId, row.RWID);
+                        treeGrid.reload(tableId, {
                             url: layui.cache['contentPath'] + '/manager/coremenu/query?orgid=' + $('input[name="ORGIDTEMP"]').val(),
                             method: 'POST',
-                            height: fullheight
+                            height: fullheight,
-
+                            done: function (res, curr, count) {
+                                treeGrid.gotoPos(tableId);
+                            }
                         });
 
                         zlContext.successMsg('删除成功');
@@ -379,8 +390,7 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
     });
 
     $('#btnedit').on('click', function () {
-        var checkStatus = treeGrid.checkStatus('treeTable'),
+        var rows = getCheckRow()
-            rows = checkStatus.data;
         if (rows.length == 0) {
             zlContext.warnMsg("请选择需要修改的菜单节点！");
             return;
@@ -512,10 +522,16 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
             function (data) {
                 if (data[statusName] == OK) {
                     layer.close(formindex);
-                    treeGrid.reload('treeTable', {
+                    var row = getCheckRow()[0];
+                    treeGrid.savePos(tableId, row.RWID);
+                    treeGrid.reload(tableId, {
                         url: layui.cache['contentPath'] + '/manager/coremenu/query?orgid=' + $('input[name="ORGIDTEMP"]').val(),
                         method: 'POST',
-                        height: fullheight
+                        height: fullheight,
+                        done: function (res, curr, count) {
+                            treeGrid.gotoPos(tableId);
+                            treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
+                        }
                     });
                     zlContext.successMsg('保存成功');
                 } else {
@@ -524,6 +540,20 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
             });
         return false;
     });
+    function getCheckRow() {
+        var checkStatus = treeGrid.checkStatus(tableId),
+            rows = checkStatus.data;
+        return rows;
+    }
+    function findRowIndex(tableId, rows, rwid) {
+        var rows = table.getDataList(tableId);
+        for (let i = 0; i < rows.length; i++) {
+            const row = rows[i];
+            if (row.RWID === rwid) {
+                return i;
+            }
+        }
+    }
 
     function addverify() {
         form.on('select(RES_TYPE)', function (data) {
@@ -550,7 +580,7 @@ layui.use(['element', 'table', 'tree', 'zlpoptree', 'zltreemenu', 'zlContext', '
     $('#btnSeacher').on('click', function () {
         isloadsearch = true;
         var seachervalue = $('#edtSeacherValue').val();
-        treeGrid.reload('treeTable', {
+        treeGrid.reload(tableId, {
             url: layui.cache['contentPath'] + '/manager/coremenu/query?orgid=' + $('input[name="ORGIDTEMP"]').val(),
             method: 'POST',
             height: fullheight,

modules/kdayun-app/src/main/resources/static/modules/manager/coremodeldesign/coremodeldesign.js

@@ -19,7 +19,6 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
         , OK = zlConfig.global.result.okState
         , form = layui.form
         , tableId = 'treeFormTable'
-        , ptable
         , fromlayerIndex
         , isloadsearch = false
         , fullheight
@@ -172,11 +171,11 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
             formTreeAction.treeFormEdit(row, 'copy');
         }
         // 删除表单
-        , deleteRows: function (row) {
+        , deleteRows: function (rows) {
             var canpost = true;
-            for (var i = 0; i < row.length; i++) {
+            for (var i = 0; i < rows.length; i++) {
-                if (row[i].children.length > 0) {
+                if (rows[i].children.length > 0) {
-                    zlContext.warnMsg(row[i].OBJNAME + "该节点下还有子表单，请先删除子表单！");
+                    zlContext.warnMsg(rows[i].OBJNAME + "该节点下还有子表单，请先删除子表单！");
                     canpost = false;
                     return;
                 }
@@ -188,11 +187,21 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
                 //删除对应行（tr）的DOM结构
                 //向服务端发送删除指令
                 var ids = [];
-                row.forEach(function (v) { ids.push(v.data ? v.data['RWID'] : v['RWID']); });
+                rows.forEach(function (v) { ids.push(v.data ? v.data['RWID'] : v['RWID']); });
                 zlContext.deletePost(layui.cache['contentPath'] + '/manager/coremodeldesign/remove', ids, function (result) {
+                    var row = rows[0]
+                    var parents = treeGrid.treeFindUpDatas(tableId, row);
+                    if (parents.length > 0) {
+                        row = parents[0];
+                    }
+                    treeGrid.savePos(tableId, row.RWID);
                     if (result[statusName] == OK) {
-                        treeGrid.reload('treeFormTable', {
+                        treeGrid.reload(tableId, {
-                            url: layui.cache['contentPath'] + '/manager/coremodeldesign/query'
+                            url: layui.cache['contentPath'] + '/manager/coremodeldesign/query',
+                            done: function (res, curr, count) {
+                                treeGrid.gotoPos(tableId);
+                                formTreeAction.import();
+                            }
                         });
                         form.render();
                         zlContext.successMsg('删除成功');
@@ -203,6 +212,11 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
                     layer.close(index);
                 });
             });
+        },
+        getCheckRow: function () {
+            var checkStatus = treeGrid.checkStatus(tableId),
+                rows = checkStatus.data;
+            return rows;
         }
         , sumbit: function (fields) {
             var editType = $('#frmGridForm input[name=EDITTYPE]').val();
@@ -210,8 +224,15 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
             if (editType == 'new') {
                 zlContext.put(layui.cache['contentPath'] + '/manager/coremodeldesign/add', fields, function (result) {
                     if (result[statusName] == OK) {
-                        treeGrid.reload('treeFormTable', {
+                        var row = formTreeAction.getCheckRow()[0];
-                            url: layui.cache['contentPath'] + '/manager/coremodeldesign/query'
+                        treeGrid.savePos(tableId, row.RWID);
+                        treeGrid.reload(tableId, {
+                            url: layui.cache['contentPath'] + '/manager/coremodeldesign/query',
+                            done: function (res, curr, count) {
+                                treeGrid.gotoPos(tableId);
+                                treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
+                                formTreeAction.import();
+                            }
                         });
                         layer.close(fromlayerIndex);
                         zlContext.successMsg('保存成功');
@@ -224,8 +245,15 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
             if (editType == 'edit') {
                 zlContext.post(layui.cache['contentPath'] + '/manager/coremodeldesign/modify', fields, function (result) {
                     if (result[statusName] == OK) {
-                        treeGrid.reload('treeFormTable', {
+                        var row = fields;
-                            url: layui.cache['contentPath'] + '/manager/coremodeldesign/query'
+                        treeGrid.savePos(tableId, row.RWID);
+                        treeGrid.reload(tableId, {
+                            url: layui.cache['contentPath'] + '/manager/coremodeldesign/query',
+                            done: function (res, curr, count) {
+                                treeGrid.gotoPos(tableId);
+                                treeGrid.setCheckStatus(tableId, 'RWID', row.RWID)
+                                formTreeAction.import();
+                            }
                         });
                         layer.close(fromlayerIndex);
                         zlContext.successMsg('保存成功');
@@ -238,7 +266,7 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
             if (editType == 'copy') {
                 zlContext.post(layui.cache['contentPath'] + '/manager/coremodeldesign/copy', fields, function (result) {
                     if (result[statusName] == OK) {
-                        treeGrid.reload('treeFormTable', {
+                        treeGrid.reload(tableId, {
                             url: layui.cache['contentPath'] + '/manager/coremodeldesign/query'
                         });
                         layer.close(fromlayerIndex);
@@ -377,7 +405,7 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
 
     //展开或折叠全部
     $('#btnopenall').on('click', function () {
-        var treedata = treeGrid.getDataTreeList('treeFormTable');
+        var treedata = treeGrid.getDataTreeList(tableId);
         if ($(this).find('i').hasClass("layui-icon-down")) {
             $(this).find('i').removeClass("layui-icon-down").addClass("layui-icon-up");
             $(this).find('span').text("收起全部")
@@ -385,11 +413,11 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
             $(this).find('i').removeClass("layui-icon-up").addClass("layui-icon-down");
             $(this).find('span').text("展开全部")
         }
-        treeGrid.treeOpenAll('treeFormTable', !treedata[0][treeGrid.config.cols.isOpen]);
+        treeGrid.treeOpenAll(tableId, !treedata[0][treeGrid.config.cols.isOpen]);
     });
     // 新增
     $('#btnnew').on('click', function () {
-        var checkStatus = treeGrid.checkStatus('treeFormTable')
+        var checkStatus = treeGrid.checkStatus(tableId)
             , rows = checkStatus.data;
         if (rows.length > 1) {
             zlContext.warnMsg("不能同时两个节点下增加表单！");
@@ -399,7 +427,7 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
     });
     // 修改
     $('#btnedit').on('click', function () {
-        var checkStatus = treeGrid.checkStatus('treeFormTable')
+        var checkStatus = treeGrid.checkStatus(tableId)
             , rows = checkStatus.data;
         if (rows.length == 0) {
             zlContext.warnMsg("请选择表单数据！");
@@ -413,7 +441,7 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
     });
     // 删除
     $('#btndel').on('click', function () {
-        var checkStatus = treeGrid.checkStatus('treeFormTable')
+        var checkStatus = treeGrid.checkStatus(tableId)
             , rows = checkStatus.data;
         if (rows.length == 0) {
             zlContext.warnMsg("请选择需要删除的表单！");
@@ -459,7 +487,7 @@ layui.use(['tree', 'treeGrid', 'zlpoptree', 'zlPinYin', 'zlContext', 'upload', '
     $('#btnSeacher').on('click', function () {
         isloadsearch = true;
         var seachervalue = $('#edtSeacherValue').val();
-        treeGrid.reload('treeFormTable', {
+        treeGrid.reload(tableId, {
             url: layui.cache['contentPath'] + '/manager/coremodeldesign/query',
             method: 'POST',
             where: { seachervalue: seachervalue }

modules/kdayun-app/src/main/resources/static/modules/manager/corereport/corereportex.js

@@ -25,7 +25,7 @@ layui.config({
         , loadingLayer
         , intervalId = undefined
         // , fullheight = 'full-80'
-        , CATLOG = 'reports'
+        , tableId='tbReport'
         , REPORT_EXT = 'rpx|sht|cpt|xls|xlsx'
         , REPORT_MIME = 'report/rpt,report/sht,report/cpt';
 
@@ -34,7 +34,7 @@ layui.config({
         orgtreeObj = zltreemenu.render('orgtree', {
             dataurl: layui.cache['contentPath'] + "/manager/corefunction/queryorgddata?resId=7FEF1A6CF1EA4EC498D7E40375D4806C",
             type: "get",
-            tableId: 'tbReport',
+            tableId: tableId,
             isMove: false
         }, {
             onAsyncSuccess: function (event, treeId, treeNode, msg) {
@@ -57,7 +57,7 @@ layui.config({
 
     //渲染报表列表
     var reportTable = treeGrid.render({
-        elem: '#tbReport'
+        elem: '#'+tableId
         , height: fullheight
         , response: zlConfig.global.gridResponse
         , limit: 10000
@@ -98,7 +98,7 @@ layui.config({
     });
     var treeTable = {
         getSelectedNodes: function () {
-            var checkStatus = treeGrid.checkStatus('tbReport');
+            var checkStatus = treeGrid.checkStatus(tableId);
             return checkStatus.data;
         }
     }
@@ -305,6 +305,12 @@ layui.config({
                 //提交删除
                 zlContext.deletePost(layui.cache['contentPath'] + '/manager/corereport/remove', param, function (result) {
                     if (result[statusName] == OK) {
+                        var row = rows[0]
+                        var parents = treeGrid.treeFindUpDatas(tableId, row);
+                        if (parents.length > 0) {
+                            row = parents[0];
+                        }
+                        treeGrid.savePos(tableId, row.RWID);
                         gridAction.refreshGrid('del')
                         zlContext.successMsg('删除成功');
                     }
@@ -350,11 +356,18 @@ layui.config({
                 }
             }, 500);
         },
+        getCheckRow: function () {
+            var checkStatus = treeGrid.checkStatus(tableId),
+                rows = checkStatus.data;
+            return rows;
+        },
         sumbit: function (fields) {
             var editType = $('#frmEditGrid input[name=EDITTYPE]').val();
             if (editType == 'new') {
                 zlContext.put(layui.cache['contentPath'] + '/manager/corereport/add', fields, function (result) {
                     if (result[statusName] == OK) {
+                        var row =  gridAction.getCheckRow()[0];
+                        treeGrid.savePos(tableId, row.RWID);
                         gridAction.refreshGrid(editType, result[dataName]);
                         layer.close(fromlayerIndex);
                         zlContext.successMsg('保存成功');
@@ -371,6 +384,8 @@ layui.config({
                 }
                 zlContext.post(layui.cache['contentPath'] + '/manager/corereport/modify', fields, function (result) {
                     if (result[statusName] == OK) {
+                        var row = fields;
+                        treeGrid.savePos(tableId, row.RWID);
                         gridAction.refreshGrid(editType, fields);
                         layer.close(fromlayerIndex);
                         zlContext.successMsg('保存成功');
@@ -521,7 +536,7 @@ layui.config({
         }
     });
     $('#btnopenall').on('click', function () {
-        var treedata = treeGrid.getDataTreeList('tbReport');
+        var treedata = treeGrid.getDataTreeList(tableId);
         if ($(this).find('i').hasClass("layui-icon-down")) {
             $(this).find('i').removeClass("layui-icon-down").addClass("layui-icon-up");
             $(this).find('span').text("收起全部")
@@ -529,7 +544,7 @@ layui.config({
             $(this).find('i').removeClass("layui-icon-up").addClass("layui-icon-down");
             $(this).find('span').text("展开全部")
         }
-        treeGrid.treeOpenAll('tbReport', !treedata[0][treeGrid.config.cols.isOpen]);
+        treeGrid.treeOpenAll(tableId, !treedata[0][treeGrid.config.cols.isOpen]);
     });
     treeGrid.on('tool(tbReport)', function (obj) {
         var row = obj.data; //获得当前行数据
@@ -599,19 +614,21 @@ layui.config({
                             }
                             else {
                                 // gridAction.currentEditObj.update(res[dataName]);
-                                treeGrid.reload('tbReport');
+                                treeGrid.reload(tableId);
                                 // gridAction.refresh(null);
                             }
                             zlContext.successMsg('导入完毕');
                         }
                     })
+
+                    treeGrid.gotoPos(tableId);
                 }
             });
         }
         var orgid = orgtreeObj.getSelectedNodes().length > 0 ? orgtreeObj.getSelectedNodes()[0].RWID : '9C876276D8884BFF94DF343E2A4EED7D';
         param.ORGID = orgid;
         //刷新
-        loadGridData('tbReport', layui.cache['contentPath'] + '/manager/corereport/query', param);
+        loadGridData(tableId, layui.cache['contentPath'] + '/manager/corereport/query', param);
     });
 
     // //注册打印获取参数回调函数

modules/kdayun-app/src/main/resources/static/modules/manager/coreroleauth/coreroleauth.js

@@ -49,6 +49,7 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
                         // 更换图标
                         for (var i = 0; i < data.length; i++) {
                             data[i].icon = layui.cache['contentPath'] + "/static/image/role.png";
+                            data[i]._OBJNAME = data[i].OBJNAME;
                             data[i].OBJNAME = data[i].OBJNAME + '(<font color="red">' + data[i].OBJCODE + '</font>)';
                         }
                         return data;
@@ -64,13 +65,14 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
                 },
                 onClick: function (event, treeId, treeNode) {
                     rendertable();
+                    var orgNode = orgtreeObj.getSelectedNodes();
                     // 对应角色的数据表格下方权限展示区域 树结构渲染
                     authtree = zltreemenu.render('authtree', {
                         checkEnable: true,
                         autoCheckTrigger: true,
                         chkboxType: { "Y": "ps", "N": "s" },
                         radioType: "all",
-                        dataurl: layui.cache['contentPath'] + "/manager/coreroleauth/queryAuth?RESRWID=64D83B81B5E845EAA6384A94810A61FF&ORGID=" + $('input[name="ORGIDTEMP"]').val() + "&ROLEID=" + treeNode.RWID,
+                        dataurl: layui.cache['contentPath'] + "/manager/coreroleauth/queryAuth?RESRWID=64D83B81B5E845EAA6384A94810A61FF&ORGID=" + orgNode[0].RWID + "&ROLEID=" + treeNode.RWID,
                         type: "get",
                         idKey: "RESRWID",
                         search: false,
@@ -301,24 +303,28 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
         var orgid;
         var roleid;
         var params = {};
-        var selectnode = orgtreeObj.getSelectedNodes();
+        var orgNode = orgtreeObj.getSelectedNodes();
-        var selectrole = roletree.getSelectedNodes();
+        var roleNode = roletree.getSelectedNodes();
-        if (selectrole.length == 0) {
+        if (roleNode.length == 0) {
             zlContext.warnMsg("请先选择角色节点！");
             return;
         }
-        if (selectnode.length == 0) {
+        if (roleNode[0].RWID == '5E383DEF8BDF452CA17CB4FD31F659A9') {
+            zlContext.warnMsg("不允许删除[所有人]角色");
+            return;
+        }
+        if (orgNode.length == 0) {
             orgid = "";
         } else {
-            orgid = selectnode[0].RWID;
+            orgid = orgNode[0].RWID;
         }
-        roleid = selectrole[0].RWID;
+        roleid = roleNode[0].RWID;
         params = '{"ORGID":"' + orgid + '","ROLEID":"' + roleid + '"}';
         zlContext.confirm('询问', '是否要删除选择的角色吗？', function (index) {
             zlContext.confirm('再次询问', '您真的要删除选择的角色吗？', function (index1) {
                 zlContext.deletePost(layui.cache['contentPath'] + '/manager/coreroleauth/delRole', (params), function (result) {
                     if (result[statusName] == OK) {
-                        roletree.removeNode(selectrole[0]);
+                        roletree.removeNode(roleNode[0]);
                         roletree.selectNode(roletree.getNodes()[0]);
                         $('#' + roletree.getNodes()[0].tId + '_a').click()
                         zlContext.successMsg('删除角色成功');
@@ -332,15 +338,19 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
             layer.close(index);
         });
     });
-    // 角色树结构 编辑
+    // 角色树结构 编辑1
     $('#editrole').on('click', function () {
         var map = {};
-        var selectnode = orgtreeObj.getSelectedNodes();
+        var orgNode = orgtreeObj.getSelectedNodes();
-        var selectrole = roletree.getSelectedNodes();
+        var roleNode = roletree.getSelectedNodes();
-        if (selectrole.length == 0) {
+        if (roleNode.length == 0) {
             zlContext.warnMsg("请先选择角色节点！");
             return;
         }
+        if (roleNode[0].RWID == '5E383DEF8BDF452CA17CB4FD31F659A9') {
+            zlContext.warnMsg("不允许修改[所有人]角色");
+            return;
+        }
         var showform = frm.join('');
         formindex = layer.open({
             type: 1,
@@ -349,14 +359,14 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
             success: function (index) {
                 $('input[name="edittype"]').val('edit');
                 $('input[name="ORGID"]').val($('input[name="ORGIDTEMP"]').val());
-                $('input[name="OBJNAME"]').val(selectrole[0].OBJNAME);
+                $('input[name="OBJNAME"]').val(roleNode[0]._OBJNAME);
-                $('input[name="OBJCODE"]').val(selectrole[0].OBJCODE);
+                $('input[name="OBJCODE"]').val(roleNode[0].OBJCODE);
-                $('input[name="RWID"]').val(selectrole[0].RWID);
+                $('input[name="RWID"]').val(roleNode[0].RWID);
-                $('input[name="DES"]').val(selectrole[0].DES);
+                $('input[name="DES"]').val(roleNode[0].DES);
-                $('input[name="VISIBILITY"]').val(selectrole[0].VISIBILITY);
+                $('input[name="VISIBILITY"]').val(roleNode[0].VISIBILITY);
 
                 $('select[name="ROLELEV"]').addClass('layui-disabled');
-                if (selectnode.length > 0 && selectrole[0].VISIBILITY == 1 && selectnode[0].RWID != "9C876276D8884BFF94DF343E2A4EED7D") {
+                if (orgNode.length > 0 && roleNode[0].VISIBILITY == 1 && orgNode[0].RWID != "9C876276D8884BFF94DF343E2A4EED7D") {
                     $('select[name="ROLELEV"]').attr('disabled', "disabled");
                     $('input[name="DES"]').addClass('layui-disabled');
                     $('input[name="DES"]').attr('disabled', "disabled");
@@ -365,7 +375,7 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
                 }
 
                 form.render();
-                $('select[name="ROLELEV"]').val(selectrole[0].ROLELEV);
+                $('select[name="ROLELEV"]').val(roleNode[0].ROLELEV);
                 form.render('select');
             },
             cancel: function (index, layero) {
@@ -387,8 +397,9 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
                 if (newFormObj.newFields == null) {
                     return false;
                 }
-                newFormObj.newFields.ORGID = selectrole[0].ORGID;
+                newFormObj.newFields.ORGID = roleNode[0].ORGID;
-                if (!zlContext.isObjectValueEqual(newFormObj.newFields, selectrole[0])) {
+                roleNode[0].OBJNAME = newFormObj.newFields.OBJNAME;
+                if (!zlContext.isObjectValueEqual(newFormObj.newFields, roleNode[0])) {
                     var changeConfirmLayer = layer.confirm('数据已有改动，是否要保存？', {
                         title: '是否关闭',
                         resize: false,
@@ -458,20 +469,33 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
     });
     // 数据表格上方 添加人员角色
     $('#btnnew').on('click', function () {
-        var selectnode = orgtreeObj.getSelectedNodes();
+        var orgNode = orgtreeObj.getSelectedNodes();
-        if (selectnode.length == 0) {
+        if (orgNode.length == 0) {
             zlContext.warnMsg("请先选择机构节点！");
             return;
         }
-        var selectrole = roletree.getSelectedNodes();
+        var roleNode = roletree.getSelectedNodes();
-        if (selectrole.length == 0) {
+        if (roleNode.length == 0) {
             zlContext.warnMsg("请先选择角色节点！");
             return;
         }
         var settings = {
             tabs: [
-                { tbparams: '{&quot;ORGID&quot;:&quot;' + selectnode[0].RWID + '&quot;,&quot;condition&quot;:&quot;roleid=\'' + selectrole[0].RWID + '\'&quot;}', entryname: 'DEPTID', name: '部门', tableUrl: layui.cache['contentPath'] + '/admin/coreuser/querydeptuser', tbmethod: 'post', url: layui.cache['contentPath'] + '/admin/bddept/querydeptuser?ORGID=' + selectnode[0].RWID, method: 'post' }
+                {
-            ], id: 'RWID', name: 'OBJNAME', page: 'true', limit: 50, titlefield: 'VALUE', valuefield: 'KEY', buttontype: true, parentnode: '.layui-input-block', container: '.assignment-box', cols: [[
+                    tbparams: '{&quot;ORGID&quot;:&quot;' + orgNode[0].RWID + '&quot;,&quot;condition&quot;:&quot;roleid=\'' + roleNode[0].RWID + '\'&quot;}',
+                    entryname: 'DEPTID', name: '部门',
+                    tableUrl: layui.cache['contentPath'] + '/admin/coreuser/querydeptuser', tbmethod: 'post',
+                    url: layui.cache['contentPath'] + '/admin/bddept/querydeptuser?ORGID=' + orgNode[0].RWID,
+                    method: 'post'
+                }
+            ],
+            id: 'RWID',
+            name: 'OBJNAME',
+            page: 'true',
+            limit: 50,
+            titlefield: 'VALUE',
+            valuefield: 'KEY', buttontype: true, parentnode: '.layui-input-block',
+            container: '.assignment-box', cols: [[
                 { type: 'numbers', fixed: 'left', title: '#' }
                 , { type: 'checkbox', fixed: 'left' }
                 , { field: 'OBJNAME', title: '姓名', width: 100 }
@@ -480,9 +504,9 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
         }
         zlPopSourceExt.onlyshow(settings, function (data) {
             var newdata = {};
-            newdata.ORGID = selectnode[0].RWID;
+            newdata.ORGID = orgNode[0].RWID;
-            newdata.ROLEID = selectrole[0].RWID;
+            newdata.ROLEID = roleNode[0].RWID;
-            newdata.ROLENAME = selectrole[0].OBJNAME;
+            newdata.ROLENAME = roleNode[0].OBJNAME;
             var useridslist = data
                 , userids = ''
                 , roleids = ''
@@ -870,10 +894,13 @@ layui.use(['element', 'table', 'tree', 'zltreemenu', 'zlSelectEx', 'zlpoptree',
         return zlcontainerH = $(".docking-bottom").height() - condeff - bottomzltoolbarH;
     }
     layui.ComponentSettings = {
-        MXRWID: {
+        MXRWID: function () {
+            var orgNode = orgtreeObj.getSelectedNodes();
+            return {
                 titlefield: "OBJNAME",
                 valuefield: "MXRWID",
-            dataurl: layui.cache['contentPath'] + '/manager/coreroleauth/queryUnuseRole?ORGID=#ORGID'
+                dataurl: layui.cache['contentPath'] + '/manager/coreroleauth/queryUnuseRole?ORGID=' + orgNode[0].RWID
+            }
         }
     }
     // frm 为新建和编辑角色时 弹窗的html内容

modules/kdayun-app/src/main/resources/static/modules/manager/coretable/coreTable.js

@@ -47,13 +47,13 @@ layui.config({
 		}
 
 	});
-	layui.ComponentSettings = {
+	layui.ComponentSettings = $.extend(layui.ComponentSettings, {
 		MX_BIAOLX: {
 			titlefield: "VALUE",
 			valuefield: "CODE",
 			dataurl: layui.cache['contentPath'] + '/manager/coredictionary/querydictionarybyid?RWID=1589F6CBD7F94D5A85D206D18B1F41BE'
 		},
-	}
+	});
 	var treeObj;
 	var fromlayerIndex;
 	var newAddTableId;
@@ -505,14 +505,14 @@ layui.config({
 		searchVal: undefined,
 		fieldGridedit: function (tableid, row, type, readonly) {
 			var readonly = readonly && readonly != 0 ? 'disabled' : '';
-			layui.ComponentSettings = {
+			layui.ComponentSettings = $.extend(layui.ComponentSettings, {
 				MXZD_ZIDLX: {
 					placeholder: '请选择字段类型',
 					titlefield: 'VALUE',
 					valuefield: 'CODE',
 					dataurl: layui.cache['contentPath'] + '/manager/coretablescolumn/queryfielddatatypeList?RWID=F29725BB1E024C4C8AA2988E4967E971&bFilterPK=' + (readonly == 'disabled' ? '0' : '1')
 				}
-			}
+			});
 			var frm = [
 				'<div class="site-block" lay-filter="divgridField"> <form id ="frmGridField" lay-filter="frmGridField" class="layui-form"  action="">'
 				, '	<div class="layui-form-item layui-hide">'
@@ -1169,7 +1169,7 @@ layui.config({
 		currentEditObj: undefined,
 		Gridedit: function (tableid, row, type, readonly) {
 			var readonly = readonly && readonly != 0 ? 'disabled' : '';
-			layui.ComponentSettings = {
+			layui.ComponentSettings = $.extend(layui.ComponentSettings, {
 				MXSY_ZIDLB: {
 					edittype: readonly,
 					placeholder: '请选择字段列表',
@@ -1177,7 +1177,7 @@ layui.config({
 					valuefield: 'KEY',
 					dataurl: layui.cache['contentPath'] + '/manager/coretablescolumn/findcolumnkeyvaluesfilterpklist?MXZD_TABLEID=' + tableid
 				}
-			}
+			});
 
 			var frm = [
 				'<div class="site-block"> <form id ="frmGridIndex" class="layui-form"  action="">'

pom.xml

@@ -23,7 +23,7 @@
 		<!-- jdk版本 -->
 		<jdk.version>1.8</jdk.version>
 		<!-- 平台版本 -->
-		<base.version>5.0.211</base.version>
+		<base.version>5.0.212</base.version>
 		<!-- Spring 版本号 -->
 		<spring.version>5.1.2.RELEASE</spring.version>