Merge branch 'dev' of http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuemobr7 into dev

@CONTROL/@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl

@@ -6,14 +6,10 @@ import { ControlInterface } from '@/interface/control';
 import GlobalUiService from '@/global-ui-service/global-ui-service';
 <#if appde??>
 import ${srfclassname('${appde.getCodeName()}')}Service from '@/app-core/service/${srffilepath2(appde.getCodeName())}/${srffilepath2(appde.getCodeName())}-service';
-<#if notneedCtrlService??>
 import ${srfclassname('${ctrl.codeName}')}Service from '@/app-core/ctrl-service/${srffilepath2(appde.getCodeName())}/${srffilepath2(ctrl.codeName)}-${ctrl.getControlType()?lower_case}-service';
-</#if>
 <#else>
-<#if notneedCtrlService??>
 import ${srfclassname('${ctrl.codeName}')}Service from '@/app-core/ctrl-service/app/${srffilepath2(ctrl.codeName)}-${ctrl.getControlType()?lower_case}-service';
 </#if>
-</#if>
 
 <#--  语言资源入口  -->
 <#ibizinclude>
@@ -95,7 +91,6 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      */
     protected globaluiservice: GlobalUiService = new GlobalUiService();
 
-    <#if notneedCtrlService??>
     /**
      * 建构部件服务对象
      *
@@ -103,7 +98,6 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
      * @memberof ${srfclassname('${ctrl.codeName}')}
      */
     protected service: ${srfclassname('${ctrl.codeName}')}Service = new ${srfclassname('${ctrl.codeName}')}Service({$store:this.$store});
-    </#if>
 <#if appde??>
 
     /**

APP/src/app-core/ctrl-service/%DE_PKGPATH%/%CTRL_PKGPATH%-listexpbar-service.ts.ftl

 <#ibiztemplate>
-TARGET=LISTEXPBAR
+TARGET=PSAPPVIEWCTRL_LISTEXPBAR
 </#ibiztemplate>
 ${P.getCtrlCode('SERVICE.ts').code}
\ No newline at end of file