表格属性值规则、表格合计行去掉N/A字样、表格值清空问题

@CONTROL/表格/CONTROL-BASE.vue.ftl

@@ -110,6 +110,9 @@ import { FormItemModel } from '@/model/form-detail';
 </#assign>
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
+</#ibizinclude>
+<#ibizinclude>
+../../@MACRO/LANG_FUN.ftl
 </#ibizinclude>
 
     /**
@@ -418,7 +421,7 @@ import { FormItemModel } from '@/model/form-detail';
      * 选中行数据
      *
      * @type {any[]}
-     * @memberof Main
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public selections: any[] = [];
 
@@ -426,10 +429,18 @@ import { FormItemModel } from '@/model/form-detail';
      * 拦截行选中
      *
      * @type {boolean}
-     * @memberof Main
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
     public stopRowClick: boolean = false;
 
+    /**
+     * 当前编辑行数据
+     *
+     * @type {boolean}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    public curEditRowData:any;
+
     <#if ctrl.getAggMode() == "ALL">
     /**
      * 表格聚合行为
@@ -560,6 +571,30 @@ import { FormItemModel } from '@/model/form-detail';
      * @type {*}
      * @memberof ${srfclassname('${ctrl.codeName}')}Base
      */
+    public deRules:any = {
+        <#if ctrl.getPSDEGridEditItemVRs?? && ctrl.getPSDEGridEditItemVRs()??>
+        <#list ctrl.getPSDEGridEditItemVRs() as fideValueRule>
+            <#if fideValueRule.getCheckMode?? && fideValueRule.getCheckMode()?? && fideValueRule.getCheckMode() != 2 && fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??>
+                <#assign  deRule = fideValueRule.getPSDEFValueRule()/>
+                <#if fideValueRule.getPSDEGridEditItemName?? && fideValueRule.getPSDEGridEditItemName()??>
+                ${fideValueRule.getPSDEGridEditItemName()}:[
+                <#if deRule.getPSDEFVRGroupCondition?? && deRule.getPSDEFVRGroupCondition()?? && deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions?? &&  deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions()??>
+                <#list deRule.getPSDEFVRGroupCondition().getPSDEFVRConditions() as condItem>
+                    <@getDeRule condItem />
+                </#list>
+                </#if>],
+                </#if>
+            </#if>
+        </#list>
+        </#if>
+    };
+
+    /**
+     * 值规则集合
+     *
+     * @type {*}
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
     public rules: any = {
         <#list ctrl.getPSDEGridEditItems() as edititem>
         ${edititem.getName()}: [
@@ -578,6 +613,12 @@ import { FormItemModel } from '@/model/form-detail';
                     </#if>
                   </#if>
                 </#if>
+                <#if fideValueRule.getPSDEFValueRule()??>
+                <#assign  valueRule = fideValueRule.getPSDEFValueRule()/>
+                    <#if fideValueRule.getPSDEGridEditItemName?? && fideValueRule.getPSDEGridEditItemName()??>
+            {validator:(rule:any, value:any, callback:any)=>{return this.verifyDeRules("${fideValueRule.getPSDEGridEditItemName()}",this.deRules,"AND",value).isPast},message: "<#if valueRule.getRuleInfo()??>${valueRule.getRuleInfo()}</#if>", trigger: 'blur' },
+                    </#if>
+                </#if>
               </#if>
             </#list>
           </#if>
@@ -1469,7 +1510,7 @@ import { FormItemModel } from '@/model/form-detail';
             </#list>
             </#if>
           } else {
-            sums[index] = 'N/A';
+            sums[index] = '';
           }
         });
         return sums;
@@ -1485,7 +1526,7 @@ import { FormItemModel } from '@/model/form-detail';
             return;
         }else{
         <#if ctrl.getPSDEGridColumns()??>
-            sums[index] = 'N/A';
+            sums[index] = '';
         <#list ctrl.getPSDEGridColumns() as singleColumn>
             <#if singleColumn.getAggMode() != "NONE">
             if(Object.is(column.property,'${singleColumn.getCodeName()?lower_case}')){
@@ -1759,6 +1800,7 @@ import { FormItemModel } from '@/model/form-detail';
                 row.hasUpdated = true;
             }
         }
+        this.curEditRowData = row;
         this.validate(property,row,rowIndex);
   <#if ctrl.getPSDEGridEditItems()??>
     <#list ctrl.getPSDEGridEditItems() as editItem>
@@ -1928,6 +1970,70 @@ import { FormItemModel } from '@/model/form-detail';
   </#if>
 </#list>
     }
+
+    /**
+     * 校验属性值规则
+     *
+     * @public
+     * @param {{ name: string }} { name }
+     * @memberof ${srfclassname('${ctrl.codeName}')}Base
+     */
+    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;
+    }
+
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
 </#ibizinclude>

@CONTROL/表格/SERVICE.ts.ftl

@@ -406,7 +406,7 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
                     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];
                 }
             }