Merge branch 'master' into 2020.07.12-660 --- fix2

@CONTROL/@MACRO/MODEL/DEFAULT.ts.ftl

@@ -35,7 +35,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
       {
         name: '${majorAppDataEntity.getCodeName()?lower_case}',
-        prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+        prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
         dataType: 'FONTKEY',
       },
       </#if>

@CONTROL/@MACRO/MODEL/FORM.ts.ftl

@@ -44,7 +44,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
       {
         name: '${majorAppDataEntity.getCodeName()?lower_case}',
-        prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+        prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
         dataType: 'FONTKEY',
       },
       </#if>

@CONTROL/列表/MODEL.ts.ftl

@@ -35,7 +35,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
 			{
 				name: '${majorAppDataEntity.getCodeName()?lower_case}',
-				prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+				prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
 			},
       </#if>
     </#list>

@CONTROL/向导面板/MODEL.ts.ftl

@@ -36,7 +36,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
       {
         name: '${majorAppDataEntity.getCodeName()?lower_case}',
-        prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+        prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
         dataType: 'FONTKEY',
       },
       </#if>

@CONTROL/数据视图/MODEL.ts.ftl

@@ -31,7 +31,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
 			{
 				name: '${majorAppDataEntity.getCodeName()?lower_case}',
-				prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+				prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
 			},
       </#if>
     </#list>

@CONTROL/日历部件/MODEL.ts.ftl

@@ -27,7 +27,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
           {
             name: '${majorAppDataEntity.getCodeName()?lower_case}',
-            prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+            prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
           },
       </#if>
     </#list>

@CONTROL/树表格（增强）/MODEL.ts.ftl

@@ -27,7 +27,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
           {
             name: '${majorAppDataEntity.getCodeName()?lower_case}',
-            prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+            prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
           },
       </#if>
     </#list>

@CONTROL/状态向导面板/MODEL.ts.ftl

@@ -36,7 +36,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
       {
         name: '${majorAppDataEntity.getCodeName()?lower_case}',
-        prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+        prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
         dataType: 'FONTKEY',
       },
       </#if>

@CONTROL/看板视图/MODEL.ts.ftl

@@ -31,7 +31,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
 			{
 				name: '${majorAppDataEntity.getCodeName()?lower_case}',
-				prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}'
+				prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>'
 			},
       </#if>
     </#list>

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

@@ -386,96 +386,6 @@ import schema from 'async-validator';
         return falg;
     }
 
-    /**
-     * 属性值规则
-     *
-     * @type {*}
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public deRules:any = {
-        <#if ctrl.getPSDEFormItemVRs?? && ctrl.getPSDEFormItemVRs()??>
-        <#list ctrl.getPSDEFormItemVRs() as fideValueRule>
-            <#if fideValueRule.getCheckMode?? && fideValueRule.getCheckMode()?? && fideValueRule.getCheckMode() != 2 && fideValueRule.getPSDEFValueRule?? && fideValueRule.getPSDEFValueRule()??>
-                <#assign  deRule = fideValueRule.getPSDEFValueRule()/>
-                <#if fideValueRule.getPSDEFormItemName?? && fideValueRule.getPSDEFormItemName()??>
-                ${fideValueRule.getPSDEFormItemName()}:[
-                <#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>
-    };
-
-    /**
-     * 校验属性值规则
-     *
-     * @public
-     * @param {{ name: string }} { name }
-     * @memberof ${srfclassname('${ctrl.codeName}')}Base
-     */
-    public verifyDeRules(name:string,rule:any = this.deRules,op:string = "AND") :{isPast:boolean,infoMessage:string}{
-        let falg:any = {infoMessage:""};
-        if(!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) => {
-            let dataValue = item.deName?this.data[this.service.getItemNameByDeName(item.deName)]:"";
-            // 常规规则
-            if(item.type == 'SIMPLE'){
-                startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.data,item.isKeyCond));
-                falg.infoMessage = item.ruleInfo;
-            }
-            // 数值范围
-            if(item.type == 'VALUERANGE2'){
-                startOp( !this.$verify.checkFieldValueRangeRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond));
-                falg.infoMessage = item.ruleInfo;
-            }
-            // 正则式
-            if (item.type == "REGEX") {
-                startOp(!this.$verify.checkFieldRegExRule(dataValue,item.regExCode,item.ruleInfo,item.isKeyCond));
-                falg.infoMessage = item.ruleInfo;
-            }
-            // 长度
-            if (item.type == "STRINGLENGTH") {
-                startOp(!this.$verify.checkFieldStringLengthRule(dataValue,item.minValue,item.isIncludeMinValue,item.maxValue,item.isIncludeMaxValue,item.ruleInfo,item.isKeyCond)); 
-                falg.infoMessage = item.ruleInfo;
-            }
-            // 系统值规则
-            if(item.type == "SYSVALUERULE") {
-                startOp(!this.$verify.checkFieldSysValueRule(dataValue,item.sysRule.regExCode,item.ruleInfo,item.isKeyCond));
-                falg.infoMessage = item.ruleInfo;
-            }
-            // 分组
-            if(item.type == 'GROUP'){
-                falg = this.verifyDeRules('group',item)
-                if(item.isNotMode){
-                   falg.isPast = !falg.isPast;
-                }
-            }
-            
-        });
-        if(!falg.hasOwnProperty("isPast")){
-            falg.isPast = true;
-        }
-        return falg;
-    }
-
 
     /**
      * 详情模型集合

@CONTROL/表格/MODEL.ts.ftl

@@ -73,7 +73,7 @@
       <#assign majorAppDataEntity = minorAppDERSs.getMajorPSAppDataEntity() />
         {
           name: '${majorAppDataEntity.getCodeName()?lower_case}',
-          prop: '${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}',
+          prop: '<#if majorAppDataEntity.getPSDER1N?? && majorAppDataEntity.getPSDER1N()??>${majorAppDataEntity.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}<#else>${majorAppDataEntity.getKeyPSAppDEField().getCodeName()?lower_case}</#if>',
           dataType: 'FONTKEY',
         },
       </#if>