ibiz4j 发布系统代码

app_web/src/authservice/sys-app/sys-app-auth-service-base.ts

@@ -28,9 +28,16 @@ export default class SysAppAuthServiceBase extends AuthService {
      */
     public getOPPrivs(mainSateOPPrivs:any):any{
         let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
         if(mainSateOPPrivs){
             Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
         }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
         return curDefaultOPPrivs;
     }
 

app_web/src/authservice/sys-auth-log/sys-auth-log-auth-service-base.ts

@@ -28,9 +28,16 @@ export default class SysAuthLogAuthServiceBase extends AuthService {
      */
     public getOPPrivs(mainSateOPPrivs:any):any{
         let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
         if(mainSateOPPrivs){
             Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
         }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
         return curDefaultOPPrivs;
     }
 

app_web/src/authservice/sys-open-access/sys-open-access-auth-service-base.ts

@@ -28,9 +28,16 @@ export default class SysOpenAccessAuthServiceBase extends AuthService {
      */
     public getOPPrivs(mainSateOPPrivs:any):any{
         let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
         if(mainSateOPPrivs){
             Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
         }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
         return curDefaultOPPrivs;
     }
 

app_web/src/authservice/sys-permission/sys-permission-auth-service-base.ts

@@ -28,9 +28,16 @@ export default class SysPermissionAuthServiceBase extends AuthService {
      */
     public getOPPrivs(mainSateOPPrivs:any):any{
         let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
         if(mainSateOPPrivs){
             Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
         }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
         return curDefaultOPPrivs;
     }
 

app_web/src/authservice/sys-role-permission/sys-role-permission-auth-service-base.ts

@@ -28,9 +28,16 @@ export default class SysRolePermissionAuthServiceBase extends AuthService {
      */
     public getOPPrivs(mainSateOPPrivs:any):any{
         let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
         if(mainSateOPPrivs){
             Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
         }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
         return curDefaultOPPrivs;
     }
 

app_web/src/authservice/sys-role/sys-role-auth-service-base.ts

@@ -28,9 +28,16 @@ export default class SysRoleAuthServiceBase extends AuthService {
      */
     public getOPPrivs(mainSateOPPrivs:any):any{
         let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
         if(mainSateOPPrivs){
             Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
         }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
         return curDefaultOPPrivs;
     }
 

app_web/src/authservice/sys-user-role/sys-user-role-auth-service-base.ts

@@ -28,9 +28,16 @@ export default class SysUserRoleAuthServiceBase extends AuthService {
      */
     public getOPPrivs(mainSateOPPrivs:any):any{
         let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
         if(mainSateOPPrivs){
             Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
         }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
         return curDefaultOPPrivs;
     }
 

app_web/src/authservice/sys-user/sys-user-auth-service-base.ts

@@ -28,9 +28,16 @@ export default class SysUserAuthServiceBase extends AuthService {
      */
     public getOPPrivs(mainSateOPPrivs:any):any{
         let curDefaultOPPrivs:any = this.getSysOPPrivs();
+        let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
         if(mainSateOPPrivs){
             Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
         }
+        // 统一资源优先
+        Object.keys(curDefaultOPPrivs).forEach((name:string) => {
+            if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
+                curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
+            }
+        });
         return curDefaultOPPrivs;
     }
 

app_web/src/components/app-embed-picker/app-embed-picker.vue

@@ -101,7 +101,7 @@ export default class AppEmbedPicker extends Vue {
      * @type {string}
      * @memberof AppEmbedPicker
      */
-    @Prop() public valueItem?: string;
+    @Prop() public valueItem!: string;
 
     /**
      * 关联视图名称
@@ -176,17 +176,28 @@ export default class AppEmbedPicker extends Vue {
         if (!this.data) {
             return;
         }
+        let formData:any = JSON.parse(this.data);
         let arg: any = {};
         // 合并视图上下文参数和视图参数
         arg.param = JSON.parse(JSON.stringify(this.viewparams));
         arg.context = JSON.parse(JSON.stringify(this.context));
+        if(formData[this.name] && formData[this.valueItem]){
+            let selectItems:Array<any> = [];
+            let tempvalue: Array<any> = formData[this.valueItem].split(',');
+            let temptext: Array<any> = formData[this.name].split(',');
+            tempvalue.forEach((srfkey: any, index: number)=>{
+                selectItems.push({ srfmajortext : temptext[index], srfkey: srfkey });
+            });
+            arg.param.selectedData = selectItems;
+            this.$forceUpdate();
+        }
         // 附加参数处理
          if (this.localContext && Object.keys(this.localContext).length >0) {
-            let _context = this.$util.computedNavData(this.data,arg.context,arg.param,this.localContext);
+            let _context = this.$util.computedNavData(formData,arg.context,arg.param,this.localContext);
             Object.assign(arg.context,_context);
         }
         if (this.localParam && Object.keys(this.localParam).length >0) {
-            let _param = this.$util.computedNavData(this.data,arg.param,arg.param,this.localParam);
+            let _param = this.$util.computedNavData(formData,arg.context,arg.param,this.localParam);
             Object.assign(arg.param,_param);
         }
         this.viewdata = JSON.stringify(arg.context);
@@ -257,12 +268,10 @@ export default class AppEmbedPicker extends Vue {
             srfkey = srfkey.substring(0,srfkey.length-1);
             srfmajortext = srfmajortext.substring(0,srfmajortext.length-1);
             if (this.valueItem) {
-                let value = srfkey;
-                this.$emit('formitemvaluechange', { name: this.valueItem, value: value });
+                this.$emit('formitemvaluechange', { name: this.valueItem, value: srfkey });
             }
             if (this.name) {
-                let value = srfmajortext;
-                this.$emit('formitemvaluechange', { name: this.name, value: value });
+                this.$emit('formitemvaluechange', { name: this.name, value: srfmajortext });
             }
         }
     }

app_web/src/components/dropdown-list-dynamic/dropdown-list-dynamic.vue

@@ -3,9 +3,9 @@
         class='dropdown-list-dynamic'
         :transfer="true"
         v-model="currentVal"
-        :disabled="disabled === true ? true : false"
+        :disabled="disabled"
         :clearable="true"
-        :filterable="filterable === true ? true : false"
+        :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownListDynamic.placeholder')">
         <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('userCustom.'+tag+'.'+item.value)!== ('userCustom.'+tag+'.'+item.value))?$t('userCustom.'+tag+'.'+item.value) : item.text}}</i-option>
@@ -114,7 +114,7 @@ export default class DropDownListDynamic extends Vue {
      * @type {boolean}
      * @memberof DropDownListDynamic
      */
-    @Prop() public filterable?: boolean;
+    public filterable: boolean = true;
 
     /**
      * 下拉选提示内容

app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -7,9 +7,9 @@
             :transfer="true"
             transfer-class-name="dropdown-list-mpicker-transfer"
             v-model="currentVal"
-            :disabled="disabled === true ? true : false"
+            :disabled="disabled"
             :clearable="true"
-            :filterable="filterable === true ? true : false"
+            :filterable="filterable"
             @on-open-change="onClick"
             :placeholder="$t('components.dropDownListMpicker.placeholder')">
             <i-option v-for="(item, index) in items" :key="index" :value="item.value.toString()" :label="item.text">
@@ -88,7 +88,7 @@ export default class DropDownListMpicker extends Vue {
      * @type {boolean}
      * @memberof DropDownListMpicker
      */
-    @Prop() public filterable?: boolean;
+    public filterable: boolean = true;
 
     /**
      * 下拉选提示内容

app_web/src/components/dropdown-list/dropdown-list.vue

@@ -4,9 +4,9 @@
         class='dropdown-list'
         :transfer="true"
         v-model="currentVal"
-        :disabled="disabled === true ? true : false"
+        :disabled="disabled"
         :clearable="true"
-        :filterable="filterable === true ? true : false"
+        :filterable="filterable"
         @on-open-change="onClick"
         :placeholder="$t('components.dropDownList.placeholder')">
         <i-option v-for="(item, index) in items" :key="index" :value="item.value">{{($t('codelist.'+tag+'.'+item.value)!== ('codelist.'+tag+'.'+item.value))?$t('codelist.'+tag+'.'+item.value) : item.text}}</i-option>
@@ -141,7 +141,7 @@ export default class DropDownList extends Vue {
      * @type {boolean}
      * @memberof DropDownList
      */
-    @Prop() public filterable?: boolean;
+    public filterable: boolean = true;
 
     /**
      * 下拉选提示内容

app_web/src/engine/view/wfdyna-exp-grid-view-engine.ts

@@ -34,4 +34,43 @@ export default class WFDynaExpGridViewEngine extends GridViewEngine {
             }
         })
     }
+
+    /**
+     * 部件事件
+     *
+     * @param {string} ctrlName
+     * @param {string} eventName
+     * @param {*} args
+     * @memberof WFDynaExpGridViewEngine
+     */
+    public onCtrlEvent(ctrlName: string, eventName: string, args: any): void {
+        if (Object.is(ctrlName, 'grid')) {
+            this.GridEvent(eventName, args);
+        }
+        super.onCtrlEvent(ctrlName, eventName, args);
+    }
+
+    /**
+     * 事件处理
+     *
+     * @param {string} eventName
+     * @param {*} args
+     * @memberof WFDynaExpGridViewEngine
+     */
+    public GridEvent(eventName: string, args: any): void {
+        if (Object.is(eventName, 'load')) {
+            this.GridLoad(args);
+        }
+        super.MDCtrlEvent(eventName, args);
+    }
+
+    /**
+     * 表格加载完成
+     *
+     * @param {any[]} args
+     * @memberof WFDynaExpGridViewEngine
+     */
+    public GridLoad(args: any[]) {
+        this.view.getWFStepModel();
+    }
 }
\ No newline at end of file

app_web/src/pages/uaa/sys-permissionmpickup-view/sys-permissionmpickup-view-base.vue

@@ -207,6 +207,7 @@ export default class SYS_PERMISSIONMPickupViewBase extends Vue {
             Object.assign(this.viewparams, JSON.parse(this.viewparam));
             if(this.viewparams.selectedData){
                 this.selectedData = JSON.stringify(this.viewparams.selectedData);
+                this.viewSelections = this.viewparams.selectedData;
             }
 
         } 

app_web/src/pages/uaa/sys-role-permission-mpickup-view/sys-role-permission-mpickup-view-base.vue

@@ -207,6 +207,7 @@ export default class SysRolePermissionMPickupViewBase extends Vue {
             Object.assign(this.viewparams, JSON.parse(this.viewparam));
             if(this.viewparams.selectedData){
                 this.selectedData = JSON.stringify(this.viewparams.selectedData);
+                this.viewSelections = this.viewparams.selectedData;
             }
 
         } 

app_web/src/pages/uaa/sys-rolempickup-view/sys-rolempickup-view-base.vue

@@ -207,6 +207,7 @@ export default class SYS_ROLEMPickupViewBase extends Vue {
             Object.assign(this.viewparams, JSON.parse(this.viewparam));
             if(this.viewparams.selectedData){
                 this.selectedData = JSON.stringify(this.viewparams.selectedData);
+                this.viewSelections = this.viewparams.selectedData;
             }
 
         } 

app_web/src/pages/uaa/sys-user-rolempickup-view/sys-user-rolempickup-view-base.vue

@@ -207,6 +207,7 @@ export default class SYS_USER_ROLEMPickupViewBase extends Vue {
             Object.assign(this.viewparams, JSON.parse(this.viewparam));
             if(this.viewparams.selectedData){
                 this.selectedData = JSON.stringify(this.viewparams.selectedData);
+                this.viewSelections = this.viewparams.selectedData;
             }
 
         } 

app_web/src/pages/uaa/sys-usermpickup-view/sys-usermpickup-view-base.vue

@@ -207,6 +207,7 @@ export default class SYS_USERMPickupViewBase extends Vue {
             Object.assign(this.viewparams, JSON.parse(this.viewparam));
             if(this.viewparams.selectedData){
                 this.selectedData = JSON.stringify(this.viewparams.selectedData);
+                this.viewSelections = this.viewparams.selectedData;
             }
 
         } 

app_web/src/service/app/codelist-service.ts

@@ -148,49 +148,36 @@ export default class CodeListService {
                 let cacheTimeout:any = codelist.cacheTimeout;
                     // 启用缓存
                     if(isEnableCache){
+                        const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
+                            promise.then((result:any) =>{
+                                if(result.length > 0){
+                                    CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
+                                    CodeListService.codelistCache.delete(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`);
+                                    return resolve(result);
+                                }else{
+                                    return resolve([]);
+                                }
+                            }).catch((result:any) =>{
+                                return reject(result);
+                            })
+                        }
                         // 加载完成,从本地缓存获取
                         if(CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
                             let items:any = CodeListService.codelistCached.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`).items;
                             if(items.length >0){
-                                if(cacheTimeout !== -1){
-                                    if(new Date().getTime() > codelist.expirationTime){
-                                        codelist.getItems(context,data,isloading).then((result:any) =>{
-                                            CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
-                                            codelist.expirationTime = new Date().getTime() + cacheTimeout;
-                                            resolve(result);
-                                        }).catch((error:any) =>{
-                                            Promise.reject([]);
-                                        })
-                                    }else{
-                                        return resolve(items); 
-                                    }
-                                }else{
-                                    return resolve(items);
+                                if(new Date().getTime() <= codelist.getExpirationTime()){
+                                    return resolve(items); 
                                 }
                             }
                         }
                         if (codelist) {
-                            const callback:Function = (context:any ={},data:any ={},tag:string,promise:Promise<any>) =>{
-                                promise.then((result:any) =>{
-                                    if(result.length > 0){
-                                        CodeListService.codelistCached.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,{items:result});
-                                        return resolve(result);
-                                    }else{
-                                        return resolve([]);
-                                    }
-                                }).catch((result:any) =>{
-                                    return reject(result);
-                                })
-                            }
                             // 加载中，UI又需要数据，解决连续加载同一代码表问题
                             if(CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`)){
                                 callback(context,data,tag,CodeListService.codelistCache.get(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`));
                             }else{
                                 let result:Promise<any> = codelist.getItems(context,data,isloading);
                                 CodeListService.codelistCache.set(`${JSON.stringify(context)}-${JSON.stringify(data)}-${tag}`,result);
-                                if(cacheTimeout !== -1){
-                                    codelist.expirationTime = new Date().getTime() + cacheTimeout;
-                                }
+                                codelist.setExpirationTime(new Date().getTime() + cacheTimeout);
                                 callback(context,data,tag,result);
                             }
                         }

app_web/src/widgets/sys-app/main-grid/main-grid-base.vue

@@ -714,7 +714,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * 选中行数据
      *
      * @type {any[]}
-     * @memberof Main
+     * @memberof MainBase
      */
     public selections: any[] = [];
 
@@ -722,10 +722,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * 拦截行选中
      *
      * @type {boolean}
-     * @memberof Main
+     * @memberof MainBase
      */
     public stopRowClick: boolean = false;
 
+    /**
+     * 当前编辑行数据
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public curEditRowData:any;
+
 
 
 
@@ -891,6 +899,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
+    public deRules:any = {
+    };
+
+    /**
+     * 值规则集合
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
     public rules: any = {
         icon: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '图标 值不能为空', trigger: 'change' },
@@ -1860,6 +1877,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 row.hasUpdated = true;
             }
         }
+        this.curEditRowData = row;
         this.validate(property,row,rowIndex);
     }
 
@@ -1956,6 +1974,70 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public updateDefault(row: any){                    
     }
+
+    /**
+     * 校验属性值规则
+     *
+     * @public
+     * @param {{ name: string }} { name }
+     * @memberof MainBase
+     */
+    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND",value:any) :{isPast:boolean}{
+        let falg:any = {};
+        if(!rule || !rule[name]){
+            return falg;
+        }
+        let opValue = op == 'AND'? true :false;
+        let startOp = (val:boolean)=>{
+            if(falg.isPast){
+                if(opValue){
+                    falg.isPast = falg && val;
+                }else{
+                    falg.isPast = falg || val;
+                }
+            }else{
+                falg.isPast = val;
+            }
+        }
+        rule[name].forEach((item:any) => {
+            // 常规规则
+            if(item.type == 'SIMPLE'){
+                startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
+            }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                startOp( !this.$verify.checkFieldValueRangeRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
+            }
+            // 正则式
+            if (item.type == "REGEX") {
+                startOp(!this.$verify.checkFieldRegExRule(value,item.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 长度
+            if (item.type == "STRINGLENGTH") {
+                startOp(!this.$verify.checkFieldStringLengthRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
+            }
+            // 系统值规则
+            if(item.type == "SYSVALUERULE") {
+                startOp(!this.$verify.checkFieldSysValueRule(value,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 分组
+            if(item.type == 'GROUP'){
+                falg = this.verifyDeRules('group',item,"AND",value)
+                if(item.isNotMode){
+                   falg.isPast = !falg.isPast;
+                }
+            }
+            
+        });
+        if(!falg.hasOwnProperty("isPast")){
+            falg.isPast = true;
+        }
+        if(!value){
+           falg.isPast = true;
+        }
+        return falg;
+    }
+
 }
 </script>
 

app_web/src/widgets/sys-app/main-grid/main-grid-service.ts

@@ -329,7 +329,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
+                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
                     requestData[item.prop] = data[item.name];
                 }
             }

app_web/src/widgets/sys-auth-log/main-grid/main-grid-base.vue

@@ -595,7 +595,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * 选中行数据
      *
      * @type {any[]}
-     * @memberof Main
+     * @memberof MainBase
      */
     public selections: any[] = [];
 
@@ -603,10 +603,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * 拦截行选中
      *
      * @type {boolean}
-     * @memberof Main
+     * @memberof MainBase
      */
     public stopRowClick: boolean = false;
 
+    /**
+     * 当前编辑行数据
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public curEditRowData:any;
+
 
 
 
@@ -755,6 +763,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
+    public deRules:any = {
+    };
+
+    /**
+     * 值规则集合
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
     public rules: any = {
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标识 值不能为空', trigger: 'change' },
@@ -1680,6 +1697,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 row.hasUpdated = true;
             }
         }
+        this.curEditRowData = row;
         this.validate(property,row,rowIndex);
     }
 
@@ -1776,6 +1794,70 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public updateDefault(row: any){                    
     }
+
+    /**
+     * 校验属性值规则
+     *
+     * @public
+     * @param {{ name: string }} { name }
+     * @memberof MainBase
+     */
+    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND",value:any) :{isPast:boolean}{
+        let falg:any = {};
+        if(!rule || !rule[name]){
+            return falg;
+        }
+        let opValue = op == 'AND'? true :false;
+        let startOp = (val:boolean)=>{
+            if(falg.isPast){
+                if(opValue){
+                    falg.isPast = falg && val;
+                }else{
+                    falg.isPast = falg || val;
+                }
+            }else{
+                falg.isPast = val;
+            }
+        }
+        rule[name].forEach((item:any) => {
+            // 常规规则
+            if(item.type == 'SIMPLE'){
+                startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
+            }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                startOp( !this.$verify.checkFieldValueRangeRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
+            }
+            // 正则式
+            if (item.type == "REGEX") {
+                startOp(!this.$verify.checkFieldRegExRule(value,item.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 长度
+            if (item.type == "STRINGLENGTH") {
+                startOp(!this.$verify.checkFieldStringLengthRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
+            }
+            // 系统值规则
+            if(item.type == "SYSVALUERULE") {
+                startOp(!this.$verify.checkFieldSysValueRule(value,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 分组
+            if(item.type == 'GROUP'){
+                falg = this.verifyDeRules('group',item,"AND",value)
+                if(item.isNotMode){
+                   falg.isPast = !falg.isPast;
+                }
+            }
+            
+        });
+        if(!falg.hasOwnProperty("isPast")){
+            falg.isPast = true;
+        }
+        if(!value){
+           falg.isPast = true;
+        }
+        return falg;
+    }
+
 }
 </script>
 

app_web/src/widgets/sys-auth-log/main-grid/main-grid-service.ts

@@ -329,7 +329,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
+                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
                     requestData[item.prop] = data[item.name];
                 }
             }

app_web/src/widgets/sys-open-access/main-grid/main-grid-base.vue

@@ -585,7 +585,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * 选中行数据
      *
      * @type {any[]}
-     * @memberof Main
+     * @memberof MainBase
      */
     public selections: any[] = [];
 
@@ -593,10 +593,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * 拦截行选中
      *
      * @type {boolean}
-     * @memberof Main
+     * @memberof MainBase
      */
     public stopRowClick: boolean = false;
 
+    /**
+     * 当前编辑行数据
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public curEditRowData:any;
+
 
 
 
@@ -737,6 +745,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
+    public deRules:any = {
+    };
+
+    /**
+     * 值规则集合
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
     public rules: any = {
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '开放平台接入标识 值不能为空', trigger: 'change' },
@@ -1670,6 +1687,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 row.hasUpdated = true;
             }
         }
+        this.curEditRowData = row;
         this.validate(property,row,rowIndex);
     }
 
@@ -1766,6 +1784,70 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public updateDefault(row: any){                    
     }
+
+    /**
+     * 校验属性值规则
+     *
+     * @public
+     * @param {{ name: string }} { name }
+     * @memberof MainBase
+     */
+    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND",value:any) :{isPast:boolean}{
+        let falg:any = {};
+        if(!rule || !rule[name]){
+            return falg;
+        }
+        let opValue = op == 'AND'? true :false;
+        let startOp = (val:boolean)=>{
+            if(falg.isPast){
+                if(opValue){
+                    falg.isPast = falg && val;
+                }else{
+                    falg.isPast = falg || val;
+                }
+            }else{
+                falg.isPast = val;
+            }
+        }
+        rule[name].forEach((item:any) => {
+            // 常规规则
+            if(item.type == 'SIMPLE'){
+                startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
+            }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                startOp( !this.$verify.checkFieldValueRangeRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
+            }
+            // 正则式
+            if (item.type == "REGEX") {
+                startOp(!this.$verify.checkFieldRegExRule(value,item.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 长度
+            if (item.type == "STRINGLENGTH") {
+                startOp(!this.$verify.checkFieldStringLengthRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
+            }
+            // 系统值规则
+            if(item.type == "SYSVALUERULE") {
+                startOp(!this.$verify.checkFieldSysValueRule(value,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 分组
+            if(item.type == 'GROUP'){
+                falg = this.verifyDeRules('group',item,"AND",value)
+                if(item.isNotMode){
+                   falg.isPast = !falg.isPast;
+                }
+            }
+            
+        });
+        if(!falg.hasOwnProperty("isPast")){
+            falg.isPast = true;
+        }
+        if(!value){
+           falg.isPast = true;
+        }
+        return falg;
+    }
+
 }
 </script>
 

app_web/src/widgets/sys-open-access/main-grid/main-grid-service.ts

@@ -329,7 +329,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
+                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
                     requestData[item.prop] = data[item.name];
                 }
             }

app_web/src/widgets/sys-permission/main-grid/main-grid-base.vue

@@ -507,7 +507,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * 选中行数据
      *
      * @type {any[]}
-     * @memberof Main
+     * @memberof MainBase
      */
     public selections: any[] = [];
 
@@ -515,10 +515,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * 拦截行选中
      *
      * @type {boolean}
-     * @memberof Main
+     * @memberof MainBase
      */
     public stopRowClick: boolean = false;
 
+    /**
+     * 当前编辑行数据
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public curEditRowData:any;
+
 
 
 
@@ -619,6 +627,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
+    public deRules:any = {
+    };
+
+    /**
+     * 值规则集合
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
     public rules: any = {
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '资源标识 值不能为空', trigger: 'change' },
@@ -1536,6 +1553,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 row.hasUpdated = true;
             }
         }
+        this.curEditRowData = row;
         this.validate(property,row,rowIndex);
     }
 
@@ -1632,6 +1650,70 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public updateDefault(row: any){                    
     }
+
+    /**
+     * 校验属性值规则
+     *
+     * @public
+     * @param {{ name: string }} { name }
+     * @memberof MainBase
+     */
+    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND",value:any) :{isPast:boolean}{
+        let falg:any = {};
+        if(!rule || !rule[name]){
+            return falg;
+        }
+        let opValue = op == 'AND'? true :false;
+        let startOp = (val:boolean)=>{
+            if(falg.isPast){
+                if(opValue){
+                    falg.isPast = falg && val;
+                }else{
+                    falg.isPast = falg || val;
+                }
+            }else{
+                falg.isPast = val;
+            }
+        }
+        rule[name].forEach((item:any) => {
+            // 常规规则
+            if(item.type == 'SIMPLE'){
+                startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
+            }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                startOp( !this.$verify.checkFieldValueRangeRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
+            }
+            // 正则式
+            if (item.type == "REGEX") {
+                startOp(!this.$verify.checkFieldRegExRule(value,item.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 长度
+            if (item.type == "STRINGLENGTH") {
+                startOp(!this.$verify.checkFieldStringLengthRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
+            }
+            // 系统值规则
+            if(item.type == "SYSVALUERULE") {
+                startOp(!this.$verify.checkFieldSysValueRule(value,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 分组
+            if(item.type == 'GROUP'){
+                falg = this.verifyDeRules('group',item,"AND",value)
+                if(item.isNotMode){
+                   falg.isPast = !falg.isPast;
+                }
+            }
+            
+        });
+        if(!falg.hasOwnProperty("isPast")){
+            falg.isPast = true;
+        }
+        if(!value){
+           falg.isPast = true;
+        }
+        return falg;
+    }
+
 }
 </script>
 

app_web/src/widgets/sys-permission/main-grid/main-grid-service.ts

@@ -329,7 +329,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
+                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
                     requestData[item.prop] = data[item.name];
                 }
             }

app_web/src/widgets/sys-role-permission/main-grid/main-grid-base.vue

@@ -533,7 +533,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * 选中行数据
      *
      * @type {any[]}
-     * @memberof Main
+     * @memberof MainBase
      */
     public selections: any[] = [];
 
@@ -541,10 +541,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * 拦截行选中
      *
      * @type {boolean}
-     * @memberof Main
+     * @memberof MainBase
      */
     public stopRowClick: boolean = false;
 
+    /**
+     * 当前编辑行数据
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public curEditRowData:any;
+
 
 
 
@@ -653,6 +661,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
+    public deRules:any = {
+    };
+
+    /**
+     * 值规则集合
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
     public rules: any = {
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色权限关系表标识 值不能为空', trigger: 'change' },
@@ -1570,6 +1587,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 row.hasUpdated = true;
             }
         }
+        this.curEditRowData = row;
         this.validate(property,row,rowIndex);
     }
 
@@ -1666,6 +1684,70 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public updateDefault(row: any){                    
     }
+
+    /**
+     * 校验属性值规则
+     *
+     * @public
+     * @param {{ name: string }} { name }
+     * @memberof MainBase
+     */
+    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND",value:any) :{isPast:boolean}{
+        let falg:any = {};
+        if(!rule || !rule[name]){
+            return falg;
+        }
+        let opValue = op == 'AND'? true :false;
+        let startOp = (val:boolean)=>{
+            if(falg.isPast){
+                if(opValue){
+                    falg.isPast = falg && val;
+                }else{
+                    falg.isPast = falg || val;
+                }
+            }else{
+                falg.isPast = val;
+            }
+        }
+        rule[name].forEach((item:any) => {
+            // 常规规则
+            if(item.type == 'SIMPLE'){
+                startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
+            }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                startOp( !this.$verify.checkFieldValueRangeRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
+            }
+            // 正则式
+            if (item.type == "REGEX") {
+                startOp(!this.$verify.checkFieldRegExRule(value,item.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 长度
+            if (item.type == "STRINGLENGTH") {
+                startOp(!this.$verify.checkFieldStringLengthRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
+            }
+            // 系统值规则
+            if(item.type == "SYSVALUERULE") {
+                startOp(!this.$verify.checkFieldSysValueRule(value,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 分组
+            if(item.type == 'GROUP'){
+                falg = this.verifyDeRules('group',item,"AND",value)
+                if(item.isNotMode){
+                   falg.isPast = !falg.isPast;
+                }
+            }
+            
+        });
+        if(!falg.hasOwnProperty("isPast")){
+            falg.isPast = true;
+        }
+        if(!value){
+           falg.isPast = true;
+        }
+        return falg;
+    }
+
 }
 </script>
 

app_web/src/widgets/sys-role-permission/main-grid/main-grid-service.ts

@@ -329,7 +329,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
+                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
                     requestData[item.prop] = data[item.name];
                 }
             }

app_web/src/widgets/sys-role/main-grid/main-grid-base.vue

@@ -576,7 +576,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * 选中行数据
      *
      * @type {any[]}
-     * @memberof Main
+     * @memberof MainBase
      */
     public selections: any[] = [];
 
@@ -584,10 +584,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * 拦截行选中
      *
      * @type {boolean}
-     * @memberof Main
+     * @memberof MainBase
      */
     public stopRowClick: boolean = false;
 
+    /**
+     * 当前编辑行数据
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public curEditRowData:any;
+
 
 
 
@@ -720,6 +728,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
+    public deRules:any = {
+    };
+
+    /**
+     * 值规则集合
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
     public rules: any = {
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '角色标识 值不能为空', trigger: 'change' },
@@ -1637,6 +1654,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 row.hasUpdated = true;
             }
         }
+        this.curEditRowData = row;
         this.validate(property,row,rowIndex);
     }
 
@@ -1733,6 +1751,70 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public updateDefault(row: any){                    
     }
+
+    /**
+     * 校验属性值规则
+     *
+     * @public
+     * @param {{ name: string }} { name }
+     * @memberof MainBase
+     */
+    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND",value:any) :{isPast:boolean}{
+        let falg:any = {};
+        if(!rule || !rule[name]){
+            return falg;
+        }
+        let opValue = op == 'AND'? true :false;
+        let startOp = (val:boolean)=>{
+            if(falg.isPast){
+                if(opValue){
+                    falg.isPast = falg && val;
+                }else{
+                    falg.isPast = falg || val;
+                }
+            }else{
+                falg.isPast = val;
+            }
+        }
+        rule[name].forEach((item:any) => {
+            // 常规规则
+            if(item.type == 'SIMPLE'){
+                startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
+            }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                startOp( !this.$verify.checkFieldValueRangeRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
+            }
+            // 正则式
+            if (item.type == "REGEX") {
+                startOp(!this.$verify.checkFieldRegExRule(value,item.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 长度
+            if (item.type == "STRINGLENGTH") {
+                startOp(!this.$verify.checkFieldStringLengthRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
+            }
+            // 系统值规则
+            if(item.type == "SYSVALUERULE") {
+                startOp(!this.$verify.checkFieldSysValueRule(value,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 分组
+            if(item.type == 'GROUP'){
+                falg = this.verifyDeRules('group',item,"AND",value)
+                if(item.isNotMode){
+                   falg.isPast = !falg.isPast;
+                }
+            }
+            
+        });
+        if(!falg.hasOwnProperty("isPast")){
+            falg.isPast = true;
+        }
+        if(!value){
+           falg.isPast = true;
+        }
+        return falg;
+    }
+
 }
 </script>
 

app_web/src/widgets/sys-role/main-grid/main-grid-service.ts

@@ -329,7 +329,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
+                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
                     requestData[item.prop] = data[item.name];
                 }
             }

app_web/src/widgets/sys-user-role/main-grid/main-grid-base.vue

@@ -571,7 +571,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * 选中行数据
      *
      * @type {any[]}
-     * @memberof Main
+     * @memberof MainBase
      */
     public selections: any[] = [];
 
@@ -579,10 +579,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * 拦截行选中
      *
      * @type {boolean}
-     * @memberof Main
+     * @memberof MainBase
      */
     public stopRowClick: boolean = false;
 
+    /**
+     * 当前编辑行数据
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public curEditRowData:any;
+
 
 
 
@@ -707,6 +715,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
+    public deRules:any = {
+    };
+
+    /**
+     * 值规则集合
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
     public rules: any = {
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户角色关系标识 值不能为空', trigger: 'change' },
@@ -1624,6 +1641,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 row.hasUpdated = true;
             }
         }
+        this.curEditRowData = row;
         this.validate(property,row,rowIndex);
     }
 
@@ -1720,6 +1738,70 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public updateDefault(row: any){                    
     }
+
+    /**
+     * 校验属性值规则
+     *
+     * @public
+     * @param {{ name: string }} { name }
+     * @memberof MainBase
+     */
+    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND",value:any) :{isPast:boolean}{
+        let falg:any = {};
+        if(!rule || !rule[name]){
+            return falg;
+        }
+        let opValue = op == 'AND'? true :false;
+        let startOp = (val:boolean)=>{
+            if(falg.isPast){
+                if(opValue){
+                    falg.isPast = falg && val;
+                }else{
+                    falg.isPast = falg || val;
+                }
+            }else{
+                falg.isPast = val;
+            }
+        }
+        rule[name].forEach((item:any) => {
+            // 常规规则
+            if(item.type == 'SIMPLE'){
+                startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
+            }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                startOp( !this.$verify.checkFieldValueRangeRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
+            }
+            // 正则式
+            if (item.type == "REGEX") {
+                startOp(!this.$verify.checkFieldRegExRule(value,item.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 长度
+            if (item.type == "STRINGLENGTH") {
+                startOp(!this.$verify.checkFieldStringLengthRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
+            }
+            // 系统值规则
+            if(item.type == "SYSVALUERULE") {
+                startOp(!this.$verify.checkFieldSysValueRule(value,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 分组
+            if(item.type == 'GROUP'){
+                falg = this.verifyDeRules('group',item,"AND",value)
+                if(item.isNotMode){
+                   falg.isPast = !falg.isPast;
+                }
+            }
+            
+        });
+        if(!falg.hasOwnProperty("isPast")){
+            falg.isPast = true;
+        }
+        if(!value){
+           falg.isPast = true;
+        }
+        return falg;
+    }
+
 }
 </script>
 

app_web/src/widgets/sys-user-role/main-grid/main-grid-service.ts

@@ -329,7 +329,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
+                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
                     requestData[item.prop] = data[item.name];
                 }
             }

app_web/src/widgets/sys-user/main-grid/main-grid-base.vue

@@ -569,7 +569,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * 选中行数据
      *
      * @type {any[]}
-     * @memberof Main
+     * @memberof MainBase
      */
     public selections: any[] = [];
 
@@ -577,10 +577,18 @@ export default class MainBase extends Vue implements ControlInterface {
      * 拦截行选中
      *
      * @type {boolean}
-     * @memberof Main
+     * @memberof MainBase
      */
     public stopRowClick: boolean = false;
 
+    /**
+     * 当前编辑行数据
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public curEditRowData:any;
+
 
 
 
@@ -713,6 +721,15 @@ export default class MainBase extends Vue implements ControlInterface {
      * @type {*}
      * @memberof MainBase
      */
+    public deRules:any = {
+    };
+
+    /**
+     * 值规则集合
+     *
+     * @type {*}
+     * @memberof MainBase
+     */
     public rules: any = {
         srfkey: [
              { required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '用户标识 值不能为空', trigger: 'change' },
@@ -1630,6 +1647,7 @@ export default class MainBase extends Vue implements ControlInterface {
                 row.hasUpdated = true;
             }
         }
+        this.curEditRowData = row;
         this.validate(property,row,rowIndex);
     }
 
@@ -1726,6 +1744,70 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public updateDefault(row: any){                    
     }
+
+    /**
+     * 校验属性值规则
+     *
+     * @public
+     * @param {{ name: string }} { name }
+     * @memberof MainBase
+     */
+    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND",value:any) :{isPast:boolean}{
+        let falg:any = {};
+        if(!rule || !rule[name]){
+            return falg;
+        }
+        let opValue = op == 'AND'? true :false;
+        let startOp = (val:boolean)=>{
+            if(falg.isPast){
+                if(opValue){
+                    falg.isPast = falg && val;
+                }else{
+                    falg.isPast = falg || val;
+                }
+            }else{
+                falg.isPast = val;
+            }
+        }
+        rule[name].forEach((item:any) => {
+            // 常规规则
+            if(item.type == 'SIMPLE'){
+                startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
+            }
+            // 数值范围
+            if(item.type == 'VALUERANGE2'){
+                startOp( !this.$verify.checkFieldValueRangeRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
+            }
+            // 正则式
+            if (item.type == "REGEX") {
+                startOp(!this.$verify.checkFieldRegExRule(value,item.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 长度
+            if (item.type == "STRINGLENGTH") {
+                startOp(!this.$verify.checkFieldStringLengthRule(value,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
+            }
+            // 系统值规则
+            if(item.type == "SYSVALUERULE") {
+                startOp(!this.$verify.checkFieldSysValueRule(value,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
+            }
+            // 分组
+            if(item.type == 'GROUP'){
+                falg = this.verifyDeRules('group',item,"AND",value)
+                if(item.isNotMode){
+                   falg.isPast = !falg.isPast;
+                }
+            }
+            
+        });
+        if(!falg.hasOwnProperty("isPast")){
+            falg.isPast = true;
+        }
+        if(!value){
+           falg.isPast = true;
+        }
+        return falg;
+    }
+
 }
 </script>
 

app_web/src/widgets/sys-user/main-grid/main-grid-service.ts

@@ -329,7 +329,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
+                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
                     requestData[item.prop] = data[item.name];
                 }
             }

ibzuaa-util/src/main/java/cn/ibizlab/util/filter/SearchContextBase.java

@@ -67,6 +67,33 @@ public class SearchContextBase implements ISearchContext{
      * 工作流流程标识
      */
     public String processDefinitionKey;
+
+    /**
+     * 获取工作流步骤标识
+     */
+    public String getUserTaskId() {
+        if(StringUtils.isEmpty(userTaskId)){
+            Object taskId=params.get("usertaskid");
+            return StringUtils.isEmpty(taskId)?null:String.valueOf(taskId);
+        }else{
+            return userTaskId;
+        }
+    }
+
+    /**
+     * 获取工作流流程标识
+     * @return
+     */
+    public String getProcessDefinitionKey() {
+        if(StringUtils.isEmpty(processDefinitionKey)){
+            Object processKey=params.get("processdefinitionkey");
+            return StringUtils.isEmpty(processKey)?null:String.valueOf(processKey);
+        }
+        else{
+            return processDefinitionKey;
+        }
+    }
+
     /**
      * 获取分页参数
      * @return