Merge branch 'dev'

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

@@ -344,7 +344,7 @@ import schema from 'async-validator';
             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,{},item.isKeyCond));
+                startOp(!this.$verify.checkFieldSimpleRule(dataValue,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.data,item.isKeyCond));
                 falg.infoMessage = item.ruleInfo;
             }
             // 数值范围

APP/src/uiservice/%DE_PKGPATH%/%DE_PKGPATH%-ui-service-base.ts.ftl

 <#ibiztemplate>
 TARGET=PSAPPDATAENTITY
 </#ibiztemplate>
-<#macro getMainStateOPPrivs mainState>
+<#macro getMainStateOPPrivs mainState dataEntity>
 <#compress>
+<#if dataEntity.getAllPSDEOPPrivs?? && dataEntity.getAllPSDEOPPrivs()??>
 <#if mainState.getPSDEMainStateOPPrivs?? && mainState.getPSDEMainStateOPPrivs()??>
-{<#list mainState.getPSDEMainStateOPPrivs() as mainStateOPPriv>'${mainStateOPPriv.getName()}':<#if mainState.isOPPrivAllowMode()>1<#else>0</#if><#if mainStateOPPriv_has_next>,</#if></#list>}
+{<#list dataEntity.getAllPSDEOPPrivs() as mainStateOPPriv>'${mainStateOPPriv.getName()}':<#list mainState.getPSDEMainStateOPPrivs() as stateOPPriv><#if stateOPPriv.getName() == mainStateOPPriv.getName()><#assign iscurState = true/></#if></#list><#if iscurState?? && iscurState ><#if mainState.isOPPrivAllowMode()>1<#else>0</#if><#else><#if mainState.isOPPrivAllowMode()>0<#else>1</#if></#if><#assign iscurState = false/><#if mainStateOPPriv_has_next>,</#if></#list>}
+</#if>
 <#else>
 {}
-</#if> 
+</#if>
 </#compress>
 </#macro>
 import { Environment } from '@/environments/environment';
@@ -153,7 +155,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UIServiceBase exten
         <#if item.getPSDataEntity?? && item.getPSDataEntity()?? && item.getPSDataEntity().getAllPSDEMainStates()??>
         <#list item.getPSDataEntity().getAllPSDEMainStates() as demState>
         <#if demState.getMSTag()??>
-        this.allDeMainStateOPPrivsMap.set('${demState.getMSTag()}',<@getMainStateOPPrivs mainState=demState />);
+        this.allDeMainStateOPPrivsMap.set('${demState.getMSTag()}',<@getMainStateOPPrivs mainState=demState dataEntity=item.getPSDataEntity() />);
         </#if>
         </#list>
         </#if>

CHANGELOG.md

+## v7.0.0-alpha.16 [2020-8-2]
+
+### Bug修复
+
+修复表格聚合异常
+
+修复文本框精度问题
+
+修复属性值规则常规规则异常
+
+修复应用菜单标题重复问题
+
+修复界面行为异常问题
+
+修复下拉选组件代码表类型和属性进行不匹配问题
+
+### 功能新增及优化
+
+#### 模板
+
+新增应用数据看板视图（卡片样式）、实体数据看板视图（卡片样式）
+
+优化拷贝功能
+
+优化临时模式新建置空父键
+
+优化实体行为执行后逻辑
+
+优化操作栏触发界面行为逻辑
+
+优化实体主状态
+
+#### 基础文件
+
+优化数值框数值位置
+
+优化应用语言选择组件和应用组织部门信息呈现组件
+
+优化无数据主键界面行为逻辑
+
 ## v7.0.0-alpha.15 [2020-7-23]
 
 ### Bug修复