Merge branch 'master' into 2020.07.12

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

@@ -870,7 +870,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(context[(curNavData.value).toLowerCase()]){
+			if(context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -878,7 +878,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
 					configurable : true
 				});
 			}else{
-				if(viewparams[(curNavData.value).toLowerCase()]){
+				if(viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

@CONTROL/树视图/SERVICE.ts.ftl

@@ -845,7 +845,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(context[(curNavData.value).toLowerCase()]){
+			if(context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -853,7 +853,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
 					configurable : true
 				});
 			}else{
-				if(viewparams[(curNavData.value).toLowerCase()]){
+				if(viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

@CONTROL/甘特图部件/SERVICE.ts.ftl

@@ -870,7 +870,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(context[(curNavData.value).toLowerCase()]){
+			if(context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -878,7 +878,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
 					configurable : true
 				});
 			}else{
-				if(viewparams[(curNavData.value).toLowerCase()]){
+				if(viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

@VIEW/@MACRO/VIEW_CONTENT-BASE.vue.ftl

@@ -202,7 +202,7 @@
             }
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
-			if(this.context[(curNavData.value).toLowerCase()]){
+			if(this.context[(curNavData.value).toLowerCase()] != null){
 				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
@@ -210,7 +210,7 @@
 					configurable : true
 				});
 			}else{
-				if(this.viewparams[(curNavData.value).toLowerCase()]){
+				if(this.viewparams[(curNavData.value).toLowerCase()] != null){
 					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,

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

@@ -5,7 +5,7 @@ TARGET=PSAPPDATAENTITY
 <#compress>
 <#if dataEntity.getAllPSDEOPPrivs?? && dataEntity.getAllPSDEOPPrivs()??>
 <#if mainState.getPSDEMainStateOPPrivs?? && mainState.getPSDEMainStateOPPrivs()??>
-{<#list mainState.getPSDEMainStateOPPrivs() as stateOPPriv><#if stateOPPriv.getPSDEOPPriv()?? && !stateOPPriv.getPSDEOPPriv().getMapPSDEOPPrivName()??>'${stateOPPriv.getName()}':<#if mainState.isOPPrivAllowMode()>1<#else>0</#if>,</#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>}
+{<#list mainState.getPSDEMainStateOPPrivs() as stateOPPriv><#if stateOPPriv.getPSDEOPPriv()?? && !stateOPPriv.getPSDEOPPriv().getPSDataEntity()??>'${stateOPPriv.getName()}':<#if mainState.isOPPrivAllowMode()>1<#else>0</#if>,</#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>
 {}