解决冲突

da0ab26b · tony001 · 2ea3e1a6 · da0ab26b · da0ab26b · da0ab26b
--- a/@CONTROL/数据看板/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/数据看板/CONTROL-BASE.vue.ftl
 <template>
  <div class='dashboard'>
    <row v-if="isEnableCustomized">
      <app-build @handleClick="handleClick"></app-build>
    </row>
    <row v-if="!isHasCustomized">
      <#list ctrl.getPSPortlets() as portlet><#t>
      <#if portlet.getPortletType?? && portlet.getPortletType()??><#t>
        <#assign layout='TABLE_24COL'><#if portlet.getPSLayoutPos()??><#if portlet.getPSLayoutPos().getParentPSLayout()??><#assign layout='${portlet.getPSLayoutPos().getParentPSLayout().getLayout()}'></#if></#if><#t>
        <#assign LayoutPos = portlet.getPSLayoutPos()><#t>
        <#if portlet_index == 0 >
        <#list ctrl.getPSPortlets() as container><#t>
        <#if container.getPortletType() == 'CONTAINER' && layout == 'FLEX'>
        <#assign flexLayout = container.getPSLayout()><#t>
        </#if>
        </#list>
          <div style = '<#if layout == 'FLEX' > display : flex; justify-content : ${flexLayout.getAlign()}; flex-direction:${flexLayout.getDir()} ;align-items:${flexLayout.getVAlign()};flex-wrap: wrap;</#if>'>
        </#if>
        <#if layout == 'TABLE_24COL' && LayoutPos??><#t>
      <i-col<#if LayoutPos.getColXS() != -1> :xs="{ span: ${LayoutPos.getColXS()}, offset: <#if LayoutPos.getColXSOffset() != -1>${LayoutPos.getColXSOffset()}<#else>0</#if>}"</#if><#if LayoutPos.getColSM() != -1> :sm="{ span: ${LayoutPos.getColSM()}, offset: <#if LayoutPos.getColSMOffset() != -1>${LayoutPos.getColSMOffset()}<#else>0</#if>}"</#if><#if LayoutPos.getColMD() != -1> :md="{ span: ${LayoutPos.getColMD()}, offset: <#if LayoutPos.getColMDOffset() != -1>${LayoutPos.getColMDOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :lg="{ span: ${LayoutPos.getColLG()}, offset: <#if LayoutPos.getColLGOffset() != -1>${LayoutPos.getColLGOffset()}<#else>0</#if> }"</#if>>
        <card class="portlet-card" :bordered="false" dis-hover :padding="0">
          <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content>
          <p slot='title'>
            ${portlet.getTitle()}
            <span class="line"></span>
          </p>
          <a slot='extra'></a>
          </#if> 
          <span>
 <@ibizindent blank=10><#t>
 ${P.getCtrlCode(portlet, 'CONTROL.html').code}
 </@ibizindent>
          </span>
        </card>
      </i-col>
        <#else>
      <card class="portlet-card" :bordered="false" dis-hover :padding="0">
        <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content><#t>
        <p slot='title'>
          ${portlet.getTitle()}
        </p>
        <a slot='extra'></a>
        </#if> 
        <span>
        <@ibizindent blank=10><#t>
        ${P.getCtrlCode(portlet, 'CONTROL.html').code}
        </@ibizindent>
        </span>
      </card>
        </#if>
        <#if layout == 'FLEX'>
      <card class="portlet-card" :bordered="false" dis-hover :padding="0">
        <#if portlet.isShowTitleBar() && portlet.getTitle()?has_content><#t>
        <p slot='title'>
          ${portlet.getTitle()}
        </p>
        <a slot='extra'></a>
        </#if> 
        <span>
        <@ibizindent blank=10><#t>
        ${P.getCtrlCode(portlet, 'CONTROL.html').code}
        </@ibizindent>
        </span>
      </card>
        </#if>
        <#if !portlet_has_next>
          </div>
        </#if>
      </#if>
      </#list>
    </row>
    <row v-if="isHasCustomized" style="width: 100%;min-height: calc(100% - 40px);">
      <div class="portlet-container" style="position: relative;width:100%;">
        <template v-for="(item, index) of modelDta">
        <#noparse><div :key="index" :style="{zIndex: 10, position: 'absolute', height: item.h*layoutRowH + 'px', width: `calc(100% / ${layoutColNum} * ${item.w})`,top: item.y*layoutRowH + 'px', left: `calc(100% / ${layoutColNum} * ${item.x})`}"></#noparse>
          <component :key="$util.createUUID()" :is="item.componentName" :name="item.portletCodeName" :context="JSON.parse(JSON.stringify(context))" :viewDefaultUsage="false" :isAdaptiveSize="true" :viewState="viewState"></component>
        </div>
        </template>
    </div>
    </row>
  </div>
 </template>
 <#assign import_block>
 import UtilService from '@/utilservice/util-service';
 </#assign>
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
 </#ibizinclude>
    /**
     * 是否支持看板定制
     *
     * @protected
     * @type {(boolean)}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    @Prop() protected isEnableCustomized!:boolean;
    /**
     * 是否已有看板定制
     *
     * @protected
     * @type {(boolean)}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected isHasCustomized:boolean = false;
    /**
     * 模型数据
     *
     * @protected
     * @type {(*)}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected modelDta:any;
    /**
     * modleId
     *
     * @type {string}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected modelId:string = "dashboard_<#if ctrl.getPSAppDataEntity()??>${ctrl.getPSAppDataEntity().getCodeName()?lower_case}<#else>app</#if>_${ctrl.getCodeName()?lower_case}";
    /**
     * 建构功能服务对象
     *
     * @type {UtilService}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected utilService:UtilService = new UtilService();
    /**
     * 功能服务名称
     *
     * @type {string}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected utilServiceName:string = "<#if ctrl.getPSAppDynaDashboardUtil?? && ctrl.getPSAppDynaDashboardUtil()??>${ctrl.getPSAppDynaDashboardUtil().getCodeName()?lower_case}</#if>";
    /**
     * 获取多项数据
     *
     * @returns {any[]}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    public getDatas(): any[] {
        return [];
    }
    /**
     * 获取单项树
     *
     * @returns {*}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    public getData(): any {
        return {};
    }
    /**
     * vue 生命周期
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected created() {
        this.afterCreated();
    }
    /**
     * 执行created后的逻辑
     *
     *  @memberof ${srfclassname('${ctrl.codeName}')}
     */    
    protected afterCreated(){
      if (this.viewState) {
          this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
              if (!Object.is(tag, this.name)) {
                  return;
              }
              if (Object.is('load', action)) {
                  this.loadModel();
              }
          });
      }
    }
    /**
     * 动态设计水平列数
     *
     *  @memberof ${srfclassname('${ctrl.codeName}')}
     */   
    public layoutColNum:number = 12;
    /**
     * 动态设计单元格高度，80px
     *
     *  @memberof ${srfclassname('${ctrl.codeName}')}
     */ 
    public layoutRowH:number = 80;
    /**
     *  通知状态
     *
     *  @memberof ${srfclassname('${ctrl.codeName}')}
     */    
    public notifyState(){
      this.$nextTick(() =>{
        if (this.isHasCustomized) {
          if (this.modelDta && this.modelDta.length > 0) {
            this.modelDta.forEach((item: any) => {
              this.viewState.next({
                tag: item.portletCodeName,
                action: "load",
                data: JSON.parse(JSON.stringify(this.viewparams))
              });
            });
          }
        } else {
          if (this.viewState) {
            const refs: any = this.$refs;
            Object.keys(refs).forEach((name: string) => {
              this.viewState.next({
                tag: name,
                action: "load",
                data: JSON.parse(JSON.stringify(this.viewparams))
              });
            });
          }
        }
      })
    }
    /**
     * 加载布局与数据模型
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected loadModel(){
        if(this.isEnableCustomized){
          this.utilService.getService(this.utilServiceName).then((service:any) =>{
            service.loadModelData(JSON.parse(JSON.stringify(this.context)),{modelid:this.modelId}).then((res:any) =>{
              if(res && res.status == 200){
                const data:any = res.data;
                if(data && data.length >0){
                  this.isHasCustomized = true;
                  this.modelDta = data;
                  this.$forceUpdate();
                }else{
                  this.isHasCustomized = false;
                }
                this.notifyState();
              }else{
                console.error("加载面板模型异常");
                this.isHasCustomized = false;
                this.notifyState();
              }
            })
          })
        }else{
          this.notifyState();
        }
    }
    /**
     * 处理私人定制按钮
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected handleClick(){
      const view:any ={
        viewname: 'app-portal-design',
        title: '面板设计',
        width: 1600,
        placement: 'DRAWER_RIGHT'
      }
      const viewparam:any ={
        modelid:this.modelId,
        utilServiceName:this.utilServiceName,
        appdeName:<#if ctrl.getPSAppDataEntity?? && ctrl.getPSAppDataEntity()??>'${ctrl.getPSAppDataEntity().getCodeName()}'<#else>'app'</#if>
      }
      const appdrawer = this.$appdrawer.openDrawer(view, JSON.parse(JSON.stringify(this.context)), viewparam);
      appdrawer.subscribe((result: any) => {
          if(Object.is(result.ret,'OK')){
            this.loadModel();
          }
      });
    }
    /**
     * vue 生命周期
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected destroyed() {
        this.afterDestroy();
    }
    /**
     * 执行destroyed后的逻辑
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected afterDestroy() {
        if (this.viewStateEvent) {
            this.viewStateEvent.unsubscribe();
        }
        <#if destroyed_block??>
        ${destroyed_block}
        </#if>
    }
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
 </#ibizinclude>
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL-BASE.style.ftl
 </#ibizinclude>
\ No newline at end of file
--- a/@CONTROL/选择视图面板/CONTROL-BASE.vue.ftl
+++ b/@CONTROL/选择视图面板/CONTROL-BASE.vue.ftl
 <template>
    <div class='pickupviewpanel'>
        <component 
          v-if="inited && view.viewname && !Object.is(view.viewname, '')" 
          :is="view.viewname"
          class="viewcontainer3"
          :openMode="openMode"
          :viewdata="viewdata"
          :viewparam="viewparam"
          :viewDefaultUsage="false"
          :isSingleSelect="isSingleSelect"
          :selectedData="selectedData"
          :isShowButton="isShowButton"
          @viewdataschange="onViewDatasChange"
          @viewdatasactivated="viewDatasActivated"
          @viewload="onViewLoad">
        </component>
    </div>
 </template>
 <#assign import_block>
 import ${srfclassname('${ctrl.codeName}')}Model from './${srffilepath2(ctrl.codeName)}-${ctrl.getControlType()?lower_case}-model';
 </#assign>
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
 </#ibizinclude>
    /**
     * 视图打开模式
     *
     * @protected
     * @type {('DEFAULT' | 'MODAL')}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    @Prop({ default: 'DEFAULT' })
    protected openMode!: 'DEFAULT' | 'MODAL';
    /**
     * 选中数据字符串
     *
     * @type {string}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    @Prop() protected selectedData?: string;
    /**
     * 获取多项数据
     *
     * @returns {any[]}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    public getDatas(): any[] {
        return [];
    }
    /**
     * 获取单项树
     *
     * @returns {*}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    public getData(): any {
        return {};
    }
    /**
     * 视图名称
     *
     * @type {*}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected view: any = {
        viewname: '<#if ctrl.getPSAppDEView()??>${srffilepath2(ctrl.getPSAppDEView().getCodeName())}</#if>',
        data: {},
    }
    /**
     * 视图数据
     *
     * @type {*}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected viewdata: string  = JSON.stringify(this.context);
    /**
     * 视图参数
     *
     * @type {*}
     * @memberof PickupViewpickupviewpanel
     */
    protected viewparam: string  = JSON.stringify(this.viewparams);
    /**
     * 是否显示按钮
     *
     * @type {boolean}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    @Prop({default: true}) protected isShowButton!: boolean;
    /**
     * 是否单选
     *
     * @type {boolean}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    @Prop() protected isSingleSelect?: boolean;
    /**
     * 初始化完成
     *
     * @type {boolean}
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected inited: boolean = false;
    /**
     * 视图数据变化
     *
     * @param {*} $event
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected onViewDatasChange($event: any): void {
        if($event.length>0){
          $event.forEach((item:any,index:any) => {
              let srfmajortext = item['${ctrl.getPSAppDataEntity().getMajorPSAppDEField().getCodeName()?lower_case}'];
              if(srfmajortext){
                Object.assign($event[index],{srfmajortext: srfmajortext});
              }
          });
        }
        this.$emit('selectionchange', $event);
    }
    /**
     * 视图数据被激活
     *
     * @param {*} $event
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected viewDatasActivated($event: any): void {
        this.$emit('activated', $event);
    }
    /**
     * 视图加载完成
     *
     * @param {*} $event
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected onViewLoad($event: any): void {
        this.$emit('load', $event);
    }
    /**
     * vue 生命周期
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected created() {
        this.afterCreated();
    }
    /**
     * 执行created后的逻辑
     *
     *  @memberof ${srfclassname('${ctrl.codeName}')}
     */    
    protected afterCreated(){
        if (this.viewState) {
            this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
                if (!Object.is(tag, this.name)) {
                    return;
                }
                if (Object.is('load', action)) {
                    this.viewdata = JSON.stringify(this.context);
                    this.viewparam = JSON.stringify(Object.assign(data, this.viewparams));
                    this.inited = true;
                }
            });
        }
    }
    /**
     * vue 生命周期
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected destroyed() {
        this.afterDestroy();
    }
    /**
     * 执行destroyed后的逻辑
     *
     * @memberof ${srfclassname('${ctrl.codeName}')}
     */
    protected afterDestroy() {
        if (this.viewStateEvent) {
            this.viewStateEvent.unsubscribe();
        }
        <#if destroyed_block??>
        ${destroyed_block}
        </#if>
    }
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
 </#ibizinclude>
 <#ibizinclude>
 ../@MACRO/CONTROL/CONTROL-BASE.style.ftl
 </#ibizinclude>
\ No newline at end of file
--- a/@CONTROL/选择视图面板/CONTROL.html.ftl
+++ b/@CONTROL/选择视图面板/CONTROL.html.ftl
 <#--  content  -->
 <#assign content>
    :isSingleSelect="isSingleSelect"
    :selectedData="selectedData"
    :isShowButton="isShowButton"
    :openMode="openMode"
 </#assign>
 <#ibizinclude>
 ../@MACRO/HTML/DEFAULT.html.ftl
 </#ibizinclude>
\ No newline at end of file
--- a/@VIEW/@MACRO/VIEW_HEADER-BASE.vue.ftl
+++ b/@VIEW/@MACRO/VIEW_HEADER-BASE.vue.ftl
 <script lang='tsx'>
 import { Vue, Component, Prop, Provide, Emit, Watch } from 'vue-property-decorator';
 import { Subject } from 'rxjs';
 import { UIActionTool, Util } from '@/utils';
 import { VueLifeCycleProcessing<#if view_base_name??>, ${view_base_name}</#if> } from '@/crm-core';
 <#if view.getPSAppDataEntity?? && view.getPSAppDataEntity()??>
 <#assign appde = view.getPSAppDataEntity()/>
 import ${srfclassname(appde.getCodeName())}Service from '@/service/${srffilepath2(appde.getCodeName())}/${srffilepath2(appde.getCodeName())}-service';
 </#if>
 <#if view.getPSAppViewEngines()??>
 <#list view.getPSAppViewEngines() as engine>
 import ${engine.getEngineType()}Engine from '@engine/${engine.getEngineCat()?lower_case}/${srffilepath2(engine.getEngineType())}-engine';
 </#list>
 </#if>
 <#if view.getPSUIActions()??>
 <#list view.getPSUIActions() as uiAction>
 <#if uiAction.getPSAppDataEntity?? && uiAction.getPSAppDataEntity()??>
 <#assign curAppEntity = uiAction.getPSAppDataEntity()/>
 <#if !P.exists("importService", curAppEntity.getId(), "")>
 import ${srfclassname('${curAppEntity.getCodeName()}')}UIService from '@/uiservice/${srffilepath2(curAppEntity.getCodeName())}/${srffilepath2(curAppEntity.getCodeName())}-ui-service';
 </#if>
 </#if>
 </#list>
 </#if>
 <#if import_block??>
 ${import_block}
 </#if>
 /**
 * ${view.getTitle()}基类
 *
 * @export
 * @class ${srfclassname(view.name)}Base
 * @extends {<#if view_base_name??>${view_base_name}<#else>Vue</#if>}
 */
 @Component({})
 @VueLifeCycleProcessing
 export default class ${srfclassname(view.name)}Base extends <#if view_base_name??>${view_base_name}<#else>ViewBase</#if> {
 <#if view.getPSAppDataEntity?? && view.getPSAppDataEntity()??>
 <#assign appde = view.getPSAppDataEntity()/>
    /**
     * 实体服务对象
     *
     * @type {${srfclassname(appde.getCodeName())}Service}
     * @memberof ${srfclassname(view.name)}Base
     */
    public appEntityService: ${srfclassname(appde.getCodeName())}Service = new ${srfclassname(appde.getCodeName())}Service;
 </#if>
    /**
     * 数据变化
     *
     * @param {*} val
     * @returns {*}
     * @memberof ${srfclassname(view.name)}Base
     */
    @Emit() 
    public viewDatasChange(val: any):any {
        return val;
    }
 	/**
 	 * 视图标识
 	 *
 	 * @type {string}
 	 * @memberof ${srfclassname(view.name)}Base
 	 */
 	public viewtag: string = '${view.getId()}';
    /**
     * 父数据对象
     *
     * @protected
     * @type {*}
     * @memberof ${srfclassname(view.name)}Base
     */
    protected srfparentdata: any = {};
 	/**
 	 * 自定义视图导航上下文集合
 	 *
 	 * @type {*}
 	 * @memberof ${srfclassname('${view.name}')}Base
 	 */
    protected customViewNavContexts:any ={
    <#if view.getPSAppViewNavContexts()??>
    <#list view.getPSAppViewNavContexts() as viewNavContext>
        "${viewNavContext.getKey()?lower_case}":{"isRawValue":${viewNavContext.isRawValue()?c},"value":"${viewNavContext.getValue()?lower_case}"}<#if viewNavContext_has_next>,</#if>
    </#list>
    </#if>
    };
 	/**
 	 * 自定义视图导航参数集合
 	 *
 	 * @type {*}
 	 * @memberof ${srfclassname('${view.name}')}Base
 	 */
    protected customViewParams:any ={
    <#if view.getPSAppViewNavParams()??>
    <#list view.getPSAppViewNavParams() as viewNavParam>
        "${viewNavParam.getKey()?lower_case}":{"isRawValue":${viewNavParam.isRawValue()?c},"value":"${viewNavParam.getValue()?lower_case}"}<#if viewNavParam_has_next>,</#if>
    </#list>
    </#if>
    };
    /**
     * 视图模型数据
     *
     * @type {*}
     * @memberof ${srfclassname(view.name)}Base
     */
    public model: any = {
        srfCaption: '<#if view.getPSAppDataEntity()??>entities.${view.getPSAppDataEntity().getCodeName()?lower_case}.views.${view.getPSDEViewCodeName()?lower_case}.caption<#else>app.views.${view.getCodeName()?lower_case}.caption</#if>',
        srfTitle: '<#if view.getPSAppDataEntity()??>entities.${view.getPSAppDataEntity().getCodeName()?lower_case}.views.${view.getPSDEViewCodeName()?lower_case}.title<#else>app.views.${view.getCodeName()?lower_case}.title</#if>',
        srfSubTitle: '<#if view.getPSAppDataEntity()??>entities.${view.getPSAppDataEntity().getCodeName()?lower_case}.views.${view.getPSDEViewCodeName()?lower_case}.subtitle<#else>app.views.${view.getCodeName()?lower_case}.subtitle</#if>',
        dataInfo: ''
    }
    /**
     * 容器模型
     *
     * @type {*}
     * @memberof ${srfclassname(view.name)}Base
     */
    public containerModel: any = {
        <#if view.getPSControls()??>
        <#list view.getPSControls() as ctrl>
        view_${ctrl.name}: { name: '${ctrl.name}', type: '${ctrl.getControlType()}' },
        </#list>
        </#if>
        <#if view.isPickupView() || (view.getViewType?? && (view.getViewType() == 'DEOPTVIEW' || view.getViewType() == 'DEWFSTARTVIEW' || view.getViewType() == 'DEWFACTIONVIEW'))>
        view_okbtn: { name: 'okbtn', type: 'button', text: '确定', disabled: true },
        view_cancelbtn: { name: 'cancelbtn', type: 'button', text: '取消', disabled: false },
        view_leftbtn: { name: 'leftbtn', type: 'button', text: '左移', disabled: true },
        view_rightbtn: { name: 'rightbtn', type: 'button', text: '右移', disabled: true },
        view_allleftbtn: { name: 'allleftbtn', type: 'button', text: '全部左移', disabled: true },
        view_allrightbtn: { name: 'allrightbtn', type: 'button', text: '全部右移', disabled: true },
        </#if>
        <#if view.getPSWorkflow?? && view.getPSWorkflow()??>
        wflinks: [],
        </#if>
    };
    /**
     * 视图状态订阅对象
     *
     * @private
     * @type {Subject<{action: string, data: any}>}
     * @memberof ${srfclassname(view.name)}Base
     */
    public viewState: Subject<ViewState> = new Subject();
 <#if view.hasPSControl('toolbar')>
 ${P.getCtrlCode('toolbar', 'CONTROL.vue').code}
 </#if>
\ No newline at end of file