Skip to content

iBiz-Vue-R7-Plus
iBiz-Vue-R7-Plus
提交 0985de7c 编写于 作者: tony001's avatar tony001
浏览文件
操作

Merge remote-tracking branch 'local/master' into dev

上级 24688cd8
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 1332 行增加 和 392 行删除
@CONTROL/@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
浏览文件 @ 0985de7c
<script lang='tsx'> <script lang='tsx'>
import { Vue, Component, Prop, Provide, Emit, Watch, Model } from 'vue-property-decorator'; import { Vue, Component, Prop, Provide, Emit, Watch, Model,Inject } from 'vue-property-decorator';
import { CreateElement } from 'vue'; import { CreateElement } from 'vue';
import { Subject, Subscription } from 'rxjs'; import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control'; import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils'; import { UIActionTool,Util } from '@/utils';
import NavDataService from '@/service/app/navdata-service';
<#if ctrl.getPSAppCounterRefs?? && ctrl.getPSAppCounterRefs()??> <#if ctrl.getPSAppCounterRefs?? && ctrl.getPSAppCounterRefs()??>
<#list ctrl.getPSAppCounterRefs() as singleCounterRef> <#list ctrl.getPSAppCounterRefs() as singleCounterRef>
<#if singleCounterRef.getPSAppCounter()??> <#if singleCounterRef.getPSAppCounter()??>
...@@ -44,7 +45,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -44,7 +45,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* 名称 * 名称
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public name?: string; @Prop() public name?: string;
...@@ -52,7 +53,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -52,7 +53,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* 视图通讯对象 * 视图通讯对象
* *
* @type {Subject<ViewState>} * @type {Subject<ViewState>}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public viewState!: Subject<ViewState>; @Prop() public viewState!: Subject<ViewState>;
...@@ -60,7 +61,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -60,7 +61,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* 应用上下文 * 应用上下文
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public context: any; @Prop() public context: any;
...@@ -68,7 +69,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -68,7 +69,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* 视图参数 * 视图参数
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public viewparams: any; @Prop() public viewparams: any;
...@@ -77,7 +78,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -77,7 +78,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* *
* @public * @public
* @type {(Subscription | undefined)} * @type {(Subscription | undefined)}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public viewStateEvent: Subscription | undefined; public viewStateEvent: Subscription | undefined;
...@@ -85,7 +86,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -85,7 +86,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* 获取部件类型 * 获取部件类型
* *
* @returns {string} * @returns {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getControlType(): string { public getControlType(): string {
return '${ctrl.getControlType()}' return '${ctrl.getControlType()}'
...@@ -103,7 +104,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -103,7 +104,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* ${srfclassname('${appCounter.getCodeName()}')}CounterService计数器服务对象 * ${srfclassname('${appCounter.getCodeName()}')}CounterService计数器服务对象
* *
* @type {${srfclassname('${appCounter.getCodeName()}')}CounterService} * @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService(); public ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService();
</#if> </#if>
...@@ -113,7 +114,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -113,7 +114,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* 计数器服务对象集合 * 计数器服务对象集合
* *
* @type {Array<*>} * @type {Array<*>}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public counterServiceArray:Array<any> = [${counterRefs}]; public counterServiceArray:Array<any> = [${counterRefs}];
</#if> </#if>
...@@ -122,7 +123,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -122,7 +123,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* 建构部件服务对象 * 建构部件服务对象
* *
* @type {${srfclassname('${ctrl.codeName}')}Service} * @type {${srfclassname('${ctrl.codeName}')}Service}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public service: ${srfclassname('${ctrl.codeName}')}Service = new ${srfclassname('${ctrl.codeName}')}Service({ $store: this.$store }); public service: ${srfclassname('${ctrl.codeName}')}Service = new ${srfclassname('${ctrl.codeName}')}Service({ $store: this.$store });
<#if appde??> <#if appde??>
...@@ -131,7 +132,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -131,7 +132,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* 实体服务对象 * 实体服务对象
* *
* @type {${srfclassname('${appde.getCodeName()}')}Service} * @type {${srfclassname('${appde.getCodeName()}')}Service}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store }); public appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store });
</#if> </#if>
...@@ -146,7 +147,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme ...@@ -146,7 +147,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* *
* @param {*} [args={}] * @param {*} [args={}]
* @param {*} $event * @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) { public ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
<#if childCtrl.getPSControlLogics(eventName)??> <#if childCtrl.getPSControlLogics(eventName)??>
...@@ -192,7 +193,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code} ...@@ -192,7 +193,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
* 关闭视图 * 关闭视图
* *
* @param {any} args * @param {any} args
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public closeView(args: any): void { public closeView(args: any): void {
let _this: any = this; let _this: any = this;
...@@ -202,7 +203,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code} ...@@ -202,7 +203,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
/** /**
* 计数器刷新 * 计数器刷新
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public counterRefresh(){ public counterRefresh(){
const _this:any =this; const _this:any =this;
......
@CONTROL/@MACRO/CONTROL/CONTROL_PORTLET-HEADER-BASE.vue.ftl
浏览文件 @ 0985de7c
<script lang='tsx'> <script lang='tsx'>
import { Vue, Component, Prop, Provide, Emit, Watch, Model } from 'vue-property-decorator'; import { Vue, Component, Prop, Provide, Emit, Watch, Model,Inject } from 'vue-property-decorator';
import { CreateElement } from 'vue'; import { CreateElement } from 'vue';
import { Subject, Subscription } from 'rxjs'; import { Subject, Subscription } from 'rxjs';
import { ControlInterface } from '@/interface/control'; import { ControlInterface } from '@/interface/control';
import { UIActionTool,Util } from '@/utils'; import { UIActionTool,Util } from '@/utils';
import NavDataService from '@/service/app/navdata-service';
<#if ctrl.getPSAppCounterRefs?? && ctrl.getPSAppCounterRefs()??> <#if ctrl.getPSAppCounterRefs?? && ctrl.getPSAppCounterRefs()??>
<#list ctrl.getPSAppCounterRefs() as singleCounterRef> <#list ctrl.getPSAppCounterRefs() as singleCounterRef>
<#if singleCounterRef.getPSAppCounter()??> <#if singleCounterRef.getPSAppCounter()??>
...@@ -44,7 +45,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -44,7 +45,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* 名称 * 名称
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public name?: string; @Prop() public name?: string;
...@@ -52,7 +53,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -52,7 +53,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* 视图通讯对象 * 视图通讯对象
* *
* @type {Subject<ViewState>} * @type {Subject<ViewState>}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public viewState!: Subject<ViewState>; @Prop() public viewState!: Subject<ViewState>;
...@@ -60,7 +61,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -60,7 +61,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* 应用上下文 * 应用上下文
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public context: any; @Prop() public context: any;
...@@ -68,7 +69,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -68,7 +69,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* 视图参数 * 视图参数
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public viewparams: any; @Prop() public viewparams: any;
...@@ -77,7 +78,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -77,7 +78,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* *
* @public * @public
* @type {(Subscription | undefined)} * @type {(Subscription | undefined)}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public viewStateEvent: Subscription | undefined; public viewStateEvent: Subscription | undefined;
...@@ -85,7 +86,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -85,7 +86,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* 获取部件类型 * 获取部件类型
* *
* @returns {string} * @returns {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getControlType(): string { public getControlType(): string {
return '${ctrl.getControlType()}' return '${ctrl.getControlType()}'
...@@ -103,7 +104,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -103,7 +104,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* ${srfclassname('${appCounter.getCodeName()}')}CounterService计数器服务对象 * ${srfclassname('${appCounter.getCodeName()}')}CounterService计数器服务对象
* *
* @type {${srfclassname('${appCounter.getCodeName()}')}CounterService} * @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService(); public ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService();
</#if> </#if>
...@@ -113,7 +114,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -113,7 +114,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* 计数器服务对象集合 * 计数器服务对象集合
* *
* @type {Array<*>} * @type {Array<*>}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public counterServiceArray:Array<any> = [${counterRefs}]; public counterServiceArray:Array<any> = [${counterRefs}];
</#if> </#if>
...@@ -122,7 +123,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -122,7 +123,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* 建构部件服务对象 * 建构部件服务对象
* *
* @type {${srfclassname('${ctrl.codeName}')}Service} * @type {${srfclassname('${ctrl.codeName}')}Service}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public service: ${srfclassname('${ctrl.codeName}')}Service = new ${srfclassname('${ctrl.codeName}')}Service({ $store: this.$store }); public service: ${srfclassname('${ctrl.codeName}')}Service = new ${srfclassname('${ctrl.codeName}')}Service({ $store: this.$store });
<#if appde??> <#if appde??>
...@@ -131,7 +132,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -131,7 +132,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* 实体服务对象 * 实体服务对象
* *
* @type {${srfclassname('${appde.getCodeName()}')}Service} * @type {${srfclassname('${appde.getCodeName()}')}Service}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store }); public appEntityService: ${srfclassname('${appde.getCodeName()}')}Service = new ${srfclassname('${appde.getCodeName()}')}Service({ $store: this.$store });
</#if> </#if>
...@@ -146,7 +147,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get ...@@ -146,7 +147,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* *
* @param {*} [args={}] * @param {*} [args={}]
* @param {*} $event * @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) { public ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
<#if childCtrl.getPSControlLogics(eventName)??> <#if childCtrl.getPSControlLogics(eventName)??>
...@@ -192,7 +193,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code} ...@@ -192,7 +193,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
* 关闭视图 * 关闭视图
* *
* @param {any} args * @param {any} args
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public closeView(args: any): void { public closeView(args: any): void {
let _this: any = this; let _this: any = this;
...@@ -202,7 +203,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code} ...@@ -202,7 +203,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
/** /**
* 计数器刷新 * 计数器刷新
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public counterRefresh(){ public counterRefresh(){
const _this:any =this; const _this:any =this;
......
@CONTROL/@MACRO/CONTROL/FORM_MEMBER_LAYOUT.vue.ftl
浏览文件 @ 0985de7c
<#assign layout='TABLE_24COL'><#if formmenber.getPSLayoutPos()??><#if formmenber.getPSLayoutPos().getParentPSLayout()??><#assign layout='${formmenber.getPSLayoutPos().getParentPSLayout().getLayout()}'></#if></#if> <#assign layout = 'TABLE_24COL'/>
<#assign LayoutPos = formmenber.getPSLayoutPos()> <#if formmenber.getPSLayoutPos()??>
<#assign LayoutPos = formmenber.getPSLayoutPos()/>
<#assign layout = LayoutPos.getLayout()/>
</#if>
<#if layout == 'TABLE_24COL' && LayoutPos??> <#if layout == 'TABLE_24COL' && LayoutPos??>
<i-col v-show="detailsModel.${formmenber.name}.visible" :style="{<#if (formmenber.getHeight?? && formmenber.getHeight() gt 0)>'height': '${formmenber.getHeight()?c}px !important',</#if><#if (formmenber.getWidth?? && formmenber.getWidth() gt 0)>'width':'${formmenber.getWidth()?c}px !important'</#if>}" <#if LayoutPos.getColXS() != -1> :sm="{ span: ${LayoutPos.getColXS()}, offset: <#if LayoutPos.getColXSOffset() != -1>${LayoutPos.getColXSOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColSM() != -1> :md="{ span: ${LayoutPos.getColSM()}, offset: <#if LayoutPos.getColSMOffset() != -1>${LayoutPos.getColSMOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColMD() != -1> :lg="{ span: ${LayoutPos.getColMD()}, offset: <#if LayoutPos.getColMDOffset() != -1>${LayoutPos.getColMDOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :xl="{ span: ${LayoutPos.getColLG()}, offset: <#if LayoutPos.getColLGOffset() != -1>${LayoutPos.getColLGOffset()}<#else>0</#if> }"</#if>> <i-col v-show="detailsModel.${formmenber.name}.visible" :style="{<#if (formmenber.getHeight?? && formmenber.getHeight() gt 0)>'height': '${formmenber.getHeight()?c}px !important',</#if><#if (formmenber.getWidth?? && formmenber.getWidth() gt 0)>'width':'${formmenber.getWidth()?c}px !important'</#if>}" <#if LayoutPos.getColXS() != -1> :sm="{ span: ${LayoutPos.getColXS()}, offset: <#if LayoutPos.getColXSOffset() != -1>${LayoutPos.getColXSOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColSM() != -1> :md="{ span: ${LayoutPos.getColSM()}, offset: <#if LayoutPos.getColSMOffset() != -1>${LayoutPos.getColSMOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColMD() != -1> :lg="{ span: ${LayoutPos.getColMD()}, offset: <#if LayoutPos.getColMDOffset() != -1>${LayoutPos.getColMDOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :xl="{ span: ${LayoutPos.getColLG()}, offset: <#if LayoutPos.getColLGOffset() != -1>${LayoutPos.getColLGOffset()}<#else>0</#if> }"</#if>>
${P.getPartCode(formmenber).code} ${P.getPartCode(formmenber).code}
......
@CONTROL/@MACRO/SERVICE/FORM.ts.ftl
浏览文件 @ 0985de7c
...@@ -137,7 +137,7 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi ...@@ -137,7 +137,7 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
@Errorlog @Errorlog
public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> { public wfsubmit(action: string,context: any = {}, data: any = {}, isloading?: boolean,localdata?:any): Promise<any> {
data = this.handleWFData(data,true); data = this.handleWFData(data,true);
context = this.handleRequestData(action,context,data).context; context = this.handleRequestData(action,context,data,true).context;
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
...@@ -299,10 +299,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi ...@@ -299,10 +299,12 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
@Errorlog @Errorlog
public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> { public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data); const {data:Data,context:Context} = this.handleRequestData(action,context,data);
<#if ctrl.getControlType() != 'SEARCHFORM'>
//仿真主键数据 //仿真主键数据
const PrimaryKey = Util.createUUID(); const PrimaryKey = Util.createUUID();
Data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = PrimaryKey; Data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = PrimaryKey;
Data.${appde.getCodeName()?lower_case} = PrimaryKey; Data.${appde.getCodeName()?lower_case} = PrimaryKey;
</#if>
return new Promise((resolve: any, reject: any) => { return new Promise((resolve: any, reject: any) => {
let result: Promise<any>; let result: Promise<any>;
const _appEntityService: any = this.appEntityService; const _appEntityService: any = this.appEntityService;
...@@ -312,7 +314,9 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi ...@@ -312,7 +314,9 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
result = this.appEntityService.GetDraft(Context,Data, isloading); result = this.appEntityService.GetDraft(Context,Data, isloading);
} }
result.then((response) => { result.then((response) => {
<#if ctrl.getControlType() != 'SEARCHFORM'>
response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = PrimaryKey; response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = PrimaryKey;
</#if>
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
...@@ -357,13 +361,16 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi ...@@ -357,13 +361,16 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
* @param data 数据 * @param data 数据
* @memberof ${srfclassname('${ctrl.codeName}')}Service * @memberof ${srfclassname('${ctrl.codeName}')}Service
*/ */
public handleRequestData(action: string,context:any, data: any = {}){ public handleRequestData(action: string,context:any, data: any = {},isMerge:boolean = false){
let mode: any = this.getMode(); let mode: any = this.getMode();
if (!mode && mode.getDataItems instanceof Function) { if (!mode && mode.getDataItems instanceof Function) {
return data; return data;
} }
let formItemItems: any[] = mode.getDataItems(); let formItemItems: any[] = mode.getDataItems();
let requestData:any = {}; let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
formItemItems.forEach((item:any) =>{ formItemItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){ if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop){ if(item && item.prop){
...@@ -375,9 +382,6 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi ...@@ -375,9 +382,6 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
} }
} }
}); });
if(data && data.viewparams){
Object.assign(requestData,data.viewparams);
}
let tempContext:any = JSON.parse(JSON.stringify(context)); let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){ if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid; tempContext.srfsessionkey = tempContext.srfsessionid;
......
@CONTROL/分页导航面板/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
<template> <template>
<div class='tabviewpanel' style="height:100%;"> <div class='tabviewpanel' style="height:100%;">
<tabs :animated="false" class='tabexppanel' name='${ctrl.getCodeName()?lower_case}' @on-click="tabPanelClick"> <tabs :value="tabValue" :animated="false" class='tabexppanel' name='${ctrl.getCodeName()?lower_case}' @on-click="tabPanelClick">
<#list ctrl.getPSControls() as tabviewpanel> <#list ctrl.getPSControls() as tabviewpanel>
<tab-pane :index="${tabviewpanel_index}" name='${tabviewpanel.name}' tab='${ctrl.getCodeName()?lower_case}' class='<#if tabviewpanel.getPSSysCss?? && tabviewpanel.getPSSysCss()??>${tabviewpanel.getPSSysCss().getCssName()}</#if>' <tab-pane :index="${tabviewpanel_index}" name='${tabviewpanel.name}' tab='${ctrl.getCodeName()?lower_case}' class='<#if tabviewpanel.getPSSysCss?? && tabviewpanel.getPSSysCss()??>${tabviewpanel.getPSSysCss().getCssName()}</#if>'
:label="(h) =>{ :label="(h) =>{
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
* 是否初始化 * 是否初始化
* *
* @returns {any} * @returns {any}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public isInit: any = { public isInit: any = {
<#list ctrl.getPSControls() as tabviewpanel> <#list ctrl.getPSControls() as tabviewpanel>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return []; return [];
...@@ -68,18 +68,38 @@ ...@@ -68,18 +68,38 @@
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return null; return null;
} }
/**
* 从父传入的当前分页面板panel值
*
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() public tabValue?: string;
/**
* 值变化
*
* @param {*} newVal
* @param {*} oldVal
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Watch('tabValue')
public onValueChange(newVal: any, oldVal: any) {
this.tabPanelClick(newVal);
}
/** /**
* 行为参数 * 行为参数
* *
* @public * @public
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public action:any = ''; public action:any = '';
...@@ -87,14 +107,14 @@ ...@@ -87,14 +107,14 @@
* 被激活的分页面板 * 被激活的分页面板
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public activiedTabViewPanel: string = '<#list ctrl.getPSControls() as tabviewpanel><#if tabviewpanel_index==0>${tabviewpanel.name}</#if></#list>'; public activiedTabViewPanel: string = '<#list ctrl.getPSControls() as tabviewpanel><#if tabviewpanel_index==0>${tabviewpanel.name}</#if></#list>';
/** /**
* 分页视图面板数据变更 * 分页视图面板数据变更
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public tabViewPanelDatasChange(){ public tabViewPanelDatasChange(){
this.counterRefresh(); this.counterRefresh();
...@@ -104,7 +124,7 @@ ...@@ -104,7 +124,7 @@
* vue 生命周期 * vue 生命周期
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.afterCreated(); this.afterCreated();
...@@ -113,7 +133,7 @@ ...@@ -113,7 +133,7 @@
/** /**
* 执行created后的逻辑 * 执行created后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterCreated(){ public afterCreated(){
//设置分页导航srfparentdename和srfparentkey //设置分页导航srfparentdename和srfparentkey
...@@ -138,7 +158,7 @@ ...@@ -138,7 +158,7 @@
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public destroyed() { public destroyed() {
this.afterDestroy(); this.afterDestroy();
...@@ -147,7 +167,7 @@ ...@@ -147,7 +167,7 @@
/** /**
* 执行destroyed后的逻辑 * 执行destroyed后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterDestroy() { public afterDestroy() {
if (this.viewStateEvent) { if (this.viewStateEvent) {
...@@ -163,7 +183,7 @@ ...@@ -163,7 +183,7 @@
* *
* @param {*} $event * @param {*} $event
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public tabPanelClick($event: any) { public tabPanelClick($event: any) {
if (!$event) { if (!$event) {
......
@CONTROL/分页导航面板/CONTROL.html.ftl
浏览文件 @ 0985de7c
<#assign content>
<#if view.getViewType() == 'DETABSEARCHVIEW' || view.getViewType() == 'DETABSEARCHVIEW9'>
:tabValue="tabValue"
</#if>
</#assign>
<#ibizinclude> <#ibizinclude>
../@MACRO/HTML/DEFAULT.html.ftl ../@MACRO/HTML/DEFAULT.html.ftl
</#ibizinclude> </#ibizinclude>
\ No newline at end of file
@CONTROL/分页视图面板/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return []; return [];
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return null; return null;
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
* 是否被激活 * 是否被激活
* *
* @type {boolean} * @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public isActivied: boolean = true; public isActivied: boolean = true;
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
* 局部上下文 * 局部上下文
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public localContext: any = <#if ctrl.getPSNavigateContexts?? && ctrl.getPSNavigateContexts()??><@getNavigateContext ctrl /><#else>null</#if>; public localContext: any = <#if ctrl.getPSNavigateContexts?? && ctrl.getPSNavigateContexts()??><@getNavigateContext ctrl /><#else>null</#if>;
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
* 局部视图参数 * 局部视图参数
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public localViewParam: any = <#if ctrl.getPSNavigateParams?? && ctrl.getPSNavigateParams()??><@getNavigateParams ctrl /><#else>null</#if>; public localViewParam: any = <#if ctrl.getPSNavigateParams?? && ctrl.getPSNavigateParams()??><@getNavigateParams ctrl /><#else>null</#if>;
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
* 传入上下文 * 传入上下文
* *
* @type {string} * @type {string}
* @memberof TabExpViewtabviewpanel * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public viewdata: string = JSON.stringify(this.context); public viewdata: string = JSON.stringify(this.context);
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
* 视图面板过滤项 * 视图面板过滤项
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public navfilter: string = "<#if ctrl.getNavFilter?? && ctrl.getNavFilter()??>${ctrl.getNavFilter()}</#if>"; public navfilter: string = "<#if ctrl.getNavFilter?? && ctrl.getNavFilter()??>${ctrl.getNavFilter()}</#if>";
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
* vue 生命周期 * vue 生命周期
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.afterCreated(); this.afterCreated();
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
/** /**
* 执行created后的逻辑 * 执行created后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterCreated(){ public afterCreated(){
this.initNavParam(); this.initNavParam();
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
/** /**
* 初始化导航参数 * 初始化导航参数
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public initNavParam(){ public initNavParam(){
if(!Object.is(this.navfilter,"")){ if(!Object.is(this.navfilter,"")){
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
/** /**
* 视图数据变化 * 视图数据变化
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public viewDatasChange($event:any){ public viewDatasChange($event:any){
this.$emit('viewpanelDatasChange',$event); this.$emit('viewpanelDatasChange',$event);
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public destroyed() { public destroyed() {
this.afterDestroy(); this.afterDestroy();
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
/** /**
* 执行destroyed后的逻辑 * 执行destroyed后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterDestroy() { public afterDestroy() {
if (this.viewStateEvent) { if (this.viewStateEvent) {
......
@CONTROL/分页视图面板/CONTROL.less.ftl
浏览文件 @ 0985de7c
<#ibizinclude> <#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl ../@MACRO/CSS/DEFAULT.less.ftl
</#ibizinclude> </#ibizinclude>
.tabviewpanel{
>.view-container {
height: 100%;
}
}
\ No newline at end of file
@CONTROL/列表/SERVICE.ts.ftl
浏览文件 @ 0985de7c
...@@ -62,6 +62,65 @@ ...@@ -62,6 +62,65 @@
}); });
} }
/**
* 添加数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
}else{
result =_appEntityService.Create(Context,Data, isloading);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 修改数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Data,Context,isloading);
}else{
result =_appEntityService.Update(Data,Context,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
<#ibizinclude> <#ibizinclude>
../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl ../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl
</#ibizinclude> </#ibizinclude>
\ No newline at end of file
@CONTROL/向导面板/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
* 部件行为--init * 部件行为--init
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public initAction!: string; @Prop() public initAction!: string;
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
* 部件行为--finish * 部件行为--finish
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public finishAction!: string; @Prop() public finishAction!: string;
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
* 显示处理提示 * 显示处理提示
* *
* @type {boolean} * @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop({ default: true }) public showBusyIndicator?: boolean; @Prop({ default: true }) public showBusyIndicator?: boolean;
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return [this.formParam]; return [this.formParam];
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
* 获取单项数据 * 获取单项数据
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return this.formParam; return this.formParam;
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
* *
* @public * @public
* @type {Subject<{action: string, data: any}>} * @type {Subject<{action: string, data: any}>}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public wizardState: Subject<ViewState> = new Subject(); public wizardState: Subject<ViewState> = new Subject();
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
* 当前激活表单 * 当前激活表单
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
<#if ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getFirstPSDEWizardForm()??> <#if ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getFirstPSDEWizardForm()??>
<#assign firstForm = ctrl.getPSDEWizard().getFirstPSDEWizardForm()> <#assign firstForm = ctrl.getPSDEWizard().getFirstPSDEWizardForm()>
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
* 向导表单参数 * 向导表单参数
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public formParam: any = {}; public formParam: any = {};
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
* *
* @public * @public
* @type {Array<string>} * @type {Array<string>}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public historyForms: Array<string> = []; public historyForms: Array<string> = [];
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
* 步骤行为集合 * 步骤行为集合
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public stepActions: any = {}; public stepActions: any = {};
...@@ -137,21 +137,21 @@ ...@@ -137,21 +137,21 @@
* 向导表单集合 * 向导表单集合
* *
* @type {Array<any>} * @type {Array<any>}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public wizardForms: Array<any> = []; public wizardForms: Array<any> = [];
/** /**
* 当前状态 * 当前状态
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public curState = ''; public curState = '';
/** /**
* Vue声明周期(处理组件的输入属性) * Vue声明周期(处理组件的输入属性)
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created(): void { public created(): void {
this.regFormActions(); this.regFormActions();
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public destroyed() { public destroyed() {
if (this.viewStateEvent) { if (this.viewStateEvent) {
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
/** /**
* 注册表单步骤行为 * 注册表单步骤行为
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public regFormActions() { public regFormActions() {
<#if ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardForms()??> <#if ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getPSDEWizardForms()??>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
/** /**
* 注册表单步骤行为 * 注册表单步骤行为
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public regFormAction(name: string, actions: Array<string>) { public regFormAction(name: string, actions: Array<string>) {
this.stepActions[name] = actions; this.stepActions[name] = actions;
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
/** /**
* 初始化行为 * 初始化行为
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public doInit(opt: any = {}) { public doInit(opt: any = {}) {
<#if ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getInitPSDEAction()??> <#if ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getInitPSDEAction()??>
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
/** /**
* 表单加载 * 表单加载
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public formLoad() { public formLoad() {
if(this.activeForm) { if(this.activeForm) {
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
/** /**
* 完成行为 * 完成行为
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public doFinish() { public doFinish() {
<#if ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getFinishPSDEAction()??> <#if ctrl.getPSDEWizard()?? && ctrl.getPSDEWizard().getFinishPSDEAction()??>
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
* *
* @param {*} args * @param {*} args
* @param {string} name * @param {string} name
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public ${ctrl.name}_formload(args: any, name: string, $event2?: any) { public ${ctrl.name}_formload(args: any, name: string, $event2?: any) {
if(args) { if(args) {
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
* *
* @param {*} args * @param {*} args
* @param {string} name * @param {string} name
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public ${ctrl.name}_formsave(args: any, name: string, $event2?: any) { public ${ctrl.name}_formsave(args: any, name: string, $event2?: any) {
Object.assign(this.formParam, args); Object.assign(this.formParam, args);
...@@ -311,7 +311,7 @@ ...@@ -311,7 +311,7 @@
/** /**
* 获取下一步向导表单 * 获取下一步向导表单
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getNextForm() { public getNextForm() {
let index = this.wizardForms.indexOf(this.activeForm); let index = this.wizardForms.indexOf(this.activeForm);
...@@ -327,7 +327,7 @@ ...@@ -327,7 +327,7 @@
/** /**
* 上一步 * 上一步
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public onClickPrev() { public onClickPrev() {
const length = this.historyForms.length; const length = this.historyForms.length;
...@@ -344,7 +344,7 @@ ...@@ -344,7 +344,7 @@
/** /**
* 下一步 * 下一步
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public onClickNext() { public onClickNext() {
if(this.activeForm) { if(this.activeForm) {
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
/** /**
* 完成 * 完成
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public onClickFinish() { public onClickFinish() {
if(this.activeForm) { if(this.activeForm) {
...@@ -383,7 +383,7 @@ ...@@ -383,7 +383,7 @@
* 是否禁用 * 是否禁用
* *
* @param {string} type * @param {string} type
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public isDisabled(type: string) { public isDisabled(type: string) {
const actions: Array<string> = this.stepActions[this.activeForm] const actions: Array<string> = this.stepActions[this.activeForm]
......
@CONTROL/多编辑视图面板/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return []; return [];
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return null; return null;
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
* 显示处理提示 * 显示处理提示
* *
* @type {boolean} * @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop({ default: true }) public showBusyIndicator?: boolean; @Prop({ default: true }) public showBusyIndicator?: boolean;
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
* 部件行为--update * 部件行为--update
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public updateAction!: string; @Prop() public updateAction!: string;
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
* 部件行为--fetch * 部件行为--fetch
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public fetchAction!: string; @Prop() public fetchAction!: string;
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
* 部件行为--remove * 部件行为--remove
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public removeAction!: string; @Prop() public removeAction!: string;
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
* 部件行为--load * 部件行为--load
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public loadAction!: string; @Prop() public loadAction!: string;
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
* 部件行为--loaddraft * 部件行为--loaddraft
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public loaddraftAction!: string; @Prop() public loaddraftAction!: string;
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
* 部件行为--create * 部件行为--create
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public createAction!: string; @Prop() public createAction!: string;
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
* 刷新数据 * 刷新数据
* *
* @type {number} * @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public saveRefView?: number; @Prop() public saveRefView?: number;
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
* *
* @param {*} newVal * @param {*} newVal
* @param {*} oldVal * @param {*} oldVal
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Watch('saveRefView') @Watch('saveRefView')
onSaveRefView(newVal: any, oldVal: any) { onSaveRefView(newVal: any, oldVal: any) {
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
* 对象转字符串 * 对象转字符串
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public toString(item:any): string{ public toString(item:any): string{
return JSON.stringify(item); return JSON.stringify(item);
...@@ -149,7 +149,7 @@ ...@@ -149,7 +149,7 @@
* 视图名称 * 视图名称
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public viewname: string = '<#if ctrl.getEmbeddedPSAppView()??>${srffilepath2(ctrl.getEmbeddedPSAppView().getCodeName())}</#if>'; public viewname: string = '<#if ctrl.getEmbeddedPSAppView()??>${srffilepath2(ctrl.getEmbeddedPSAppView().getCodeName())}</#if>';
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
* 获取数据对象 * 获取数据对象
* *
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public items: any[] = []; public items: any[] = [];
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
* 计数器 * 计数器
* *
* @type number * @type number
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public count: number = 0; public count: number = 0;
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public deResParameters: any[] = []; public deResParameters: any[] = [];
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public parameters: any[] = []; public parameters: any[] = [];
<#else> <#else>
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public deResParameters: any[] = [ public deResParameters: any[] = [
<#-- BEGIN：存在父关系路径 --> <#-- BEGIN：存在父关系路径 -->
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public parameters: any[] = [ public parameters: any[] = [
{ pathName: '${srfpluralize(appDataEntity.codeName)?lower_case}', parameterName: '${appDataEntity.getCodeName()?lower_case}' }, { pathName: '${srfpluralize(appDataEntity.codeName)?lower_case}', parameterName: '${appDataEntity.getCodeName()?lower_case}' },
...@@ -229,7 +229,7 @@ ...@@ -229,7 +229,7 @@
/** /**
* vue 声明周期 * vue 声明周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.afterCreated(); this.afterCreated();
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
/** /**
* 执行created后的逻辑 * 执行created后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterCreated(){ public afterCreated(){
if (this.viewState) { if (this.viewState) {
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public destroyed() { public destroyed() {
this.afterDestroy(); this.afterDestroy();
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
/** /**
* 执行destroyed后的逻辑 * 执行destroyed后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterDestroy() { public afterDestroy() {
if (this.viewStateEvent) { if (this.viewStateEvent) {
...@@ -299,7 +299,7 @@ ...@@ -299,7 +299,7 @@
* *
* @public * @public
* @param {any[]} datas * @param {any[]} datas
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public doItems(datas: any[]): void { public doItems(datas: any[]): void {
const [{ pathName, parameterName }] = this.parameters; const [{ pathName, parameterName }] = this.parameters;
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
* *
* @public * @public
* @param {*} data * @param {*} data
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public load(data: any): void { public load(data: any): void {
if(!this.fetchAction){ if(!this.fetchAction){
...@@ -372,7 +372,7 @@ ...@@ -372,7 +372,7 @@
/** /**
* 增加数据 * 增加数据
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public handleAdd(){ public handleAdd(){
if(!this.loaddraftAction){ if(!this.loaddraftAction){
...@@ -402,7 +402,7 @@ ...@@ -402,7 +402,7 @@
* *
* @param {*} item * @param {*} item
* @param {boolean} $event * @param {boolean} $event
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public setViewDirty(item: any, $event: boolean) { public setViewDirty(item: any, $event: boolean) {
let index: number = this.items.findIndex((_item: any) => Object.is(_item.id, item.id)); let index: number = this.items.findIndex((_item: any) => Object.is(_item.id, item.id));
...@@ -421,7 +421,7 @@ ...@@ -421,7 +421,7 @@
/** /**
* 部件抛出事件 * 部件抛出事件
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public viewDataChange($event:any){ public viewDataChange($event:any){
if($event){ if($event){
...@@ -456,7 +456,7 @@ ...@@ -456,7 +456,7 @@
* 视图加载完成 * 视图加载完成
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public viewload($event:any){ public viewload($event:any){
console.log('视图加载完成'); console.log('视图加载完成');
...@@ -466,7 +466,7 @@ ...@@ -466,7 +466,7 @@
* editview9 视图数据变化 * editview9 视图数据变化
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public viewdirty(item:any,$event:any){ public viewdirty(item:any,$event:any){
// editview9 视图数据变化; // editview9 视图数据变化;
......
@CONTROL/应用菜单/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -151,6 +151,10 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code} ...@@ -151,6 +151,10 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
*/ */
protected click(item: any) { protected click(item: any) {
if (item) { if (item) {
let navDataService = NavDataService.getInstance(this.$store);
if(Object.is(this.navModel,"route")){
navDataService.removeNavData(this.viewtag);
}
switch (item.appfunctag) { switch (item.appfunctag) {
<#if ctrl.getPSAppFuncs()??> <#if ctrl.getPSAppFuncs()??>
<#assign appFuncs = ctrl.getPSAppFuncs()> <#assign appFuncs = ctrl.getPSAppFuncs()>
......
@CONTROL/搜索栏/CONTROL-BASE.vue.ftl 0 → 100644
浏览文件 @ 0985de7c
<template>
</template>
<#ibizinclude>
../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
</#ibizinclude>
/**
* 获取多项数据
*
* @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public getDatas(): any[] {
return [];
}
/**
* 获取单项树
*
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
public getData(): any {
return null;
}
<#ibizinclude>
../@MACRO/CONTROL/CONTROL_BOTTOM-BASE.vue.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/CONTROL/CONTROL-BASE.style.ftl
</#ibizinclude>
\ No newline at end of file
@CONTROL/搜索栏/CONTROL.html.ftl 0 → 100644
浏览文件 @ 0985de7c
<#-- content -->
<#assign content>
</#assign>
<#ibizinclude>
../@MACRO/HTML/DEFAULT.html.ftl
</#ibizinclude>
\ No newline at end of file
@CONTROL/搜索栏/CONTROL.less.ftl 0 → 100644
浏览文件 @ 0985de7c
<#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl
</#ibizinclude>
\ No newline at end of file
@CONTROL/搜索栏/CONTROL.vue.ftl 0 → 100644
浏览文件 @ 0985de7c
<#ibizinclude>
../@MACRO/CONTROL/CONTROL.vue.ftl
</#ibizinclude>
\ No newline at end of file
@CONTROL/搜索栏/MODEL.ts.ftl 0 → 100644
浏览文件 @ 0985de7c
<#ibizinclude>
../@MACRO/MODEL/MODEL_HEADER.ts.ftl
</#ibizinclude>
/**
* 获取数据项集合
*
* @returns {any[]}
* @memberof ${srfclassname('${ctrl.getCodeName()}')}${srfclassname('${ctrl.name}')}Mode
*/
public getDataItems(): any[] {
return [
]
}
<#ibizinclude>
../@MACRO/MODEL/MODEL_BOTTOM.ts.ftl
</#ibizinclude>
\ No newline at end of file
@CONTROL/搜索栏/SERVICE.ts.ftl 0 → 100644
浏览文件 @ 0985de7c
<#ibizinclude>
../@MACRO/SERVICE/SERVICE_HEADER.ts.ftl
</#ibizinclude>
<#ibizinclude>
../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl
</#ibizinclude>
\ No newline at end of file
@CONTROL/搜索栏/template.properties 0 → 100644
浏览文件 @ 0985de7c
CTRLTYPE=SEARCHBAR
\ No newline at end of file
@CONTROL/搜索表单/CONTROL.html.ftl
浏览文件 @ 0985de7c
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</#if> </#if>
loaddraftAction="<#if ctrl.getGetDraftPSControlAction()?? && ctrl.getGetDraftPSControlAction().getPSAppDEMethod()??>${ctrl.getGetDraftPSControlAction().getPSAppDEMethod().getCodeName()}</#if>" loaddraftAction="<#if ctrl.getGetDraftPSControlAction()?? && ctrl.getGetDraftPSControlAction().getPSAppDEMethod()??>${ctrl.getGetDraftPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
loadAction="<#if ctrl.getGetPSControlAction()?? && ctrl.getGetPSControlAction().getPSAppDEMethod()??>${ctrl.getGetPSControlAction().getPSAppDEMethod().getCodeName()}</#if>" loadAction="<#if ctrl.getGetPSControlAction()?? && ctrl.getGetPSControlAction().getPSAppDEMethod()??>${ctrl.getGetPSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
<#if ctrl.getFormStyle() == "SEARCHBAR">@valuechange="qucikFormValueChange"</#if> <#if ctrl.getFormStyle() == "SEARCHBAR">@valuechange="quickFormValueChange"</#if>
<#if view.getViewType() == "DECALENDARVIEW" || view.getViewType() == "DECALENDARVIEW9"> <#if view.getViewType() == "DECALENDARVIEW" || view.getViewType() == "DECALENDARVIEW9">
@search="searchform_search($event)" @search="searchform_search($event)"
@load="searchform_load($event)" @load="searchform_load($event)"
......
@CONTROL/数据关系栏/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return this.items; return this.items;
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return this.selection; return this.selection;
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
* 加载行为 * 加载行为
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public loadAction?: string; @Prop() public loadAction?: string;
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
* 数据选中项 * 数据选中项
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public selection: any = {}; public selection: any = {};
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
* 关系栏数据项 * 关系栏数据项
* *
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public items: any[] = [ public items: any[] = [
<#if view.hasPSControl('form')> <#if view.hasPSControl('form')>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
* 默认打开项 * 默认打开项
* *
* @type {string[]} * @type {string[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public defaultOpeneds: string[] = []; public defaultOpeneds: string[] = [];
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
* *
* @public * @public
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public parentData: any = {}; public parentData: any = {};
...@@ -144,14 +144,14 @@ ...@@ -144,14 +144,14 @@
* 宽度 * 宽度
* *
* @type {number} * @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public width: number = <#if ctrl.getWidth() gt 240><#else>240</#if>; public width: number = <#if ctrl.getWidth() gt 240><#else>240</#if>;
/** /**
* 生命周期 * 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created(): void { public created(): void {
if (this.viewState) { if (this.viewState) {
...@@ -174,7 +174,7 @@ ...@@ -174,7 +174,7 @@
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public destroyed() { public destroyed() {
if (this.viewStateEvent) { if (this.viewStateEvent) {
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
* @public * @public
* @param {*} [arg={}] * @param {*} [arg={}]
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDRBarItem(arg: any = {}): any { public getDRBarItem(arg: any = {}): any {
let expmode = arg.nodetype; let expmode = arg.nodetype;
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
* *
* @public * @public
* @param {any[]} items * @param {any[]} items
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public dataProcess(items: any[]): void { public dataProcess(items: any[]): void {
items.forEach((_item: any) => { items.forEach((_item: any) => {
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
* @param {any[]} items * @param {any[]} items
* @param {string} id * @param {string} id
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getItem(items: any[], id: string): any { public getItem(items: any[], id: string): any {
const item: any = {}; const item: any = {};
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
* 节点选中 * 节点选中
* *
* @param {*} $event * @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public onSelect($event: any): void { public onSelect($event: any): void {
const item = this.getItem(this.items, $event); const item = this.getItem(this.items, $event);
...@@ -323,7 +323,7 @@ ...@@ -323,7 +323,7 @@
* 子节点打开 * 子节点打开
* *
* @param {*} $event * @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public onOpen($event: any): void { public onOpen($event: any): void {
const item = this.getItem(this.items, $event); const item = this.getItem(this.items, $event);
...@@ -341,7 +341,7 @@ ...@@ -341,7 +341,7 @@
* 子节点关闭 * 子节点关闭
* *
* @param {*} $event * @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public onClose($event: any): void { public onClose($event: any): void {
const item = this.getItem(this.items, $event); const item = this.getItem(this.items, $event);
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
* *
* @param {any[]} items * @param {any[]} items
* @param {boolean} state * @param {boolean} state
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public setItemDisabled(items: any[], state: boolean) { public setItemDisabled(items: any[], state: boolean) {
items.forEach((item: any) => { items.forEach((item: any) => {
......
@CONTROL/数据图表 (新)/CONTROL-BASE.vue#SERIES_BAR.ftl
浏览文件 @ 0985de7c
<#ibizinclude>
./CONTROL-COMMON.vue.ftl
</#ibizinclude>
<#-- 柱状图序列start --> <#-- 柱状图序列start -->
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
...@@ -6,9 +9,9 @@ ${item.render.code} ...@@ -6,9 +9,9 @@ ${item.render.code}
id:'<#if item.getName()??>${item.getName()?lower_case}</#if>', id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
name:'<#if item.getCaption()??>${item.getCaption()}</#if>', name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
type:'bar', type:'bar',
xAxisIndex:${item.getIndex()}, xAxisIndex:<@getXIndex item />,
yAxisIndex:${item.getIndex()}, yAxisIndex:<@getYIndex item />,
datasetIndex:${item.getIndex()}, datasetIndex:<@getDataSetIndex item />,
encode: { encode: {
<#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if> <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>], x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],
......
@CONTROL/数据图表 (新)/CONTROL-BASE.vue#SERIES_FUNNEL.ftl
浏览文件 @ 0985de7c
<#ibizinclude>
./CONTROL-COMMON.vue.ftl
</#ibizinclude>
<#-- 折线图序列start --> <#-- 折线图序列start -->
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
...@@ -6,7 +9,7 @@ ${item.render.code} ...@@ -6,7 +9,7 @@ ${item.render.code}
id:'<#if item.getName()??>${item.getName()?lower_case}</#if>', id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
name:'<#if item.getCaption()??>${item.getCaption()}</#if>', name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
type:'funnel', type:'funnel',
datasetIndex:${item.getIndex()}, datasetIndex:<@getDataSetIndex item />,
<#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if> <#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if>
<#if item.getTop()??>top:"${item.getTop()}",</#if> <#if item.getTop()??>top:"${item.getTop()}",</#if>
<#if item.getBottom()??>bottom:"${item.getBottom()}",</#if> <#if item.getBottom()??>bottom:"${item.getBottom()}",</#if>
......
@CONTROL/数据图表 (新)/CONTROL-BASE.vue#SERIES_LINE.ftl
浏览文件 @ 0985de7c
<#ibizinclude>
./CONTROL-COMMON.vue.ftl
</#ibizinclude>
<#-- 折线图序列start --> <#-- 折线图序列start -->
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
...@@ -6,9 +9,9 @@ ${item.render.code} ...@@ -6,9 +9,9 @@ ${item.render.code}
id:'<#if item.getName()??>${item.getName()?lower_case}</#if>', id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
name:'<#if item.getCaption()??>${item.getCaption()}</#if>', name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
type:'line', type:'line',
xAxisIndex:${item.getIndex()}, xAxisIndex:<@getXIndex item />,
yAxisIndex:${item.getIndex()}, yAxisIndex:<@getYIndex item />,
datasetIndex:${item.getIndex()}, datasetIndex:<@getDataSetIndex item />,
encode: { encode: {
<#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if> <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>], x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],
......
@CONTROL/数据图表 (新)/CONTROL-BASE.vue#SERIES_PIE.ftl
浏览文件 @ 0985de7c
<#ibizinclude>
./CONTROL-COMMON.vue.ftl
</#ibizinclude>
<#-- 折线图序列start --> <#-- 折线图序列start -->
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
...@@ -6,8 +9,8 @@ ${item.render.code} ...@@ -6,8 +9,8 @@ ${item.render.code}
id:'<#if item.getName()??>${item.getName()?lower_case}</#if>', id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
name:'<#if item.getCaption()??>${item.getCaption()}</#if>', name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
type:'pie', type:'pie',
datasetIndex:${item.getIndex()}, datasetIndex:<@getDataSetIndex item />,
<#compress><#if item.getLeft()?? && item.getLeft() != "">left:"${item.getLeft()}",</#if> <#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if>
<#if item.getTop()??>top:"${item.getTop()}",</#if> <#if item.getTop()??>top:"${item.getTop()}",</#if>
<#if item.getBottom()??>bottom:"${item.getBottom()}",</#if> <#if item.getBottom()??>bottom:"${item.getBottom()}",</#if>
<#if item.getRight()??>right:"${item.getRight()}",</#if> <#if item.getRight()??>right:"${item.getRight()}",</#if>
......
@CONTROL/数据图表 (新)/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -24,7 +24,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -24,7 +24,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return []; return [];
...@@ -34,7 +34,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -34,7 +34,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return null; return null;
...@@ -44,7 +44,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -44,7 +44,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* 显示处理提示 * 显示处理提示
* *
* @type {boolean} * @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop({ default: true }) public showBusyIndicator!: boolean; @Prop({ default: true }) public showBusyIndicator!: boolean;
...@@ -52,14 +52,14 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -52,14 +52,14 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* 部件行为--fetch * 部件行为--fetch
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public fetchAction!: string; @Prop() public fetchAction!: string;
/** /**
* Vue声明周期(组件初始化完毕) * Vue声明周期(组件初始化完毕)
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.afterCreated(); this.afterCreated();
...@@ -68,7 +68,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -68,7 +68,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
/** /**
* 执行created后的逻辑 * 执行created后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterCreated(){ public afterCreated(){
if (this.viewState) { if (this.viewState) {
...@@ -86,7 +86,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -86,7 +86,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public destroyed() { public destroyed() {
this.afterDestroy(); this.afterDestroy();
...@@ -95,7 +95,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -95,7 +95,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
/** /**
* 执行destroyed后的逻辑 * 执行destroyed后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterDestroy() { public afterDestroy() {
if (this.viewStateEvent) { if (this.viewStateEvent) {
...@@ -347,13 +347,13 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -347,13 +347,13 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
Object.keys(this.seriesModel).forEach((seriesName:string) =>{ Object.keys(this.seriesModel).forEach((seriesName:string) =>{
if(_chartOption && _chartOption.series.length > 0){ if(_chartOption && _chartOption.series.length > 0){
_chartOption.series.forEach((item:any) =>{ _chartOption.series.forEach((item:any) =>{
if(this.seriesModel[seriesName].ecxObject){ if(this.seriesModel[seriesName].ecxObject && Object.is(seriesName,item.id)){
item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecxObject); item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecxObject);
} }
if(this.seriesModel[seriesName].baseOption && Object.keys(this.seriesModel[seriesName].baseOption).length > 0){ if(this.seriesModel[seriesName].baseOption && Object.keys(this.seriesModel[seriesName].baseOption).length > 0 && Object.is(seriesName,item.id)){
item = Util.deepObjectMerge(item,this.seriesModel[seriesName].baseOption); item = Util.deepObjectMerge(item,this.seriesModel[seriesName].baseOption);
} }
if(this.seriesModel[seriesName].ecObject){ if(this.seriesModel[seriesName].ecObject && Object.is(seriesName,item.id)){
item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecObject); item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecObject);
} }
}) })
......
@CONTROL/数据图表 (新)/CONTROL-COMMON.vue.ftl 0 → 100644
浏览文件 @ 0985de7c
<#-- 获取序列映射X轴的索引start-->
<#macro getXIndex item>
<#compress>
<#if item.getPSChartCoordinateSystem?? && item.getPSChartCoordinateSystem()??>
<#assign chartCoordinateSystem = item.getPSChartCoordinateSystem() />
<#if chartCoordinateSystem.getPSChartGrid?? && chartCoordinateSystem.getPSChartGrid()?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0()??>
${chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0().getIndex()}<#else>0</#if>
</#if>
</#compress>
</#macro>
<#-- 获取序列映射X轴的索引end-->
<#-- 获取序列映射Y轴的索引start-->
<#macro getYIndex item>
<#compress>
<#if item.getPSChartCoordinateSystem?? && item.getPSChartCoordinateSystem()??>
<#assign chartCoordinateSystem = item.getPSChartCoordinateSystem() />
<#if chartCoordinateSystem.getPSChartGrid?? && chartCoordinateSystem.getPSChartGrid()?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0()??>
${chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0().getIndex()}<#else>0</#if>
</#if>
</#compress>
</#macro>
<#-- 获取序列映射Y轴的索引end-->
<#-- 获取序列映射数据集的索引start-->
<#macro getDataSetIndex item>
<#compress>
<#if item.getPSChartDataSet?? && item.getPSChartDataSet()??>
<#assign chartDataSet = item.getPSChartDataSet() />
${chartDataSet.getIndex()}<#else>0
</#if>
</#compress>
</#macro>
<#-- 获取序列映射数据集的索引end-->
\ No newline at end of file
@CONTROL/数据图表/CONTROL-BASE.vue#SERIES_BAR.ftl
浏览文件 @ 0985de7c
<#ibizinclude>
./CONTROL-COMMON.vue.ftl
</#ibizinclude>
<#-- 柱状图序列start --> <#-- 柱状图序列start -->
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
...@@ -6,9 +9,9 @@ ${item.render.code} ...@@ -6,9 +9,9 @@ ${item.render.code}
id:'<#if item.getName()??>${item.getName()?lower_case}</#if>', id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
name:'<#if item.getCaption()??>${item.getCaption()}</#if>', name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
type:'bar', type:'bar',
xAxisIndex:${item.getIndex()}, xAxisIndex:<@getXIndex item />,
yAxisIndex:${item.getIndex()}, yAxisIndex:<@getYIndex item />,
datasetIndex:${item.getIndex()}, datasetIndex:<@getDataSetIndex item />,
encode: { encode: {
<#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if> <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>], x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],
......
@CONTROL/数据图表/CONTROL-BASE.vue#SERIES_FUNNEL.ftl
浏览文件 @ 0985de7c
<#ibizinclude>
./CONTROL-COMMON.vue.ftl
</#ibizinclude>
<#-- 折线图序列start --> <#-- 折线图序列start -->
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
...@@ -6,7 +9,7 @@ ${item.render.code} ...@@ -6,7 +9,7 @@ ${item.render.code}
id:'<#if item.getName()??>${item.getName()?lower_case}</#if>', id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
name:'<#if item.getCaption()??>${item.getCaption()}</#if>', name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
type:'funnel', type:'funnel',
datasetIndex:${item.getIndex()}, datasetIndex:<@getDataSetIndex item />,
<#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if> <#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if>
<#if item.getTop()??>top:"${item.getTop()}",</#if> <#if item.getTop()??>top:"${item.getTop()}",</#if>
<#if item.getBottom()??>bottom:"${item.getBottom()}",</#if> <#if item.getBottom()??>bottom:"${item.getBottom()}",</#if>
......
@CONTROL/数据图表/CONTROL-BASE.vue#SERIES_LINE.ftl
浏览文件 @ 0985de7c
<#ibizinclude>
./CONTROL-COMMON.vue.ftl
</#ibizinclude>
<#-- 折线图序列start --> <#-- 折线图序列start -->
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
...@@ -6,9 +9,9 @@ ${item.render.code} ...@@ -6,9 +9,9 @@ ${item.render.code}
id:'<#if item.getName()??>${item.getName()?lower_case}</#if>', id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
name:'<#if item.getCaption()??>${item.getCaption()}</#if>', name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
type:'line', type:'line',
xAxisIndex:${item.getIndex()}, xAxisIndex:<@getXIndex item />,
yAxisIndex:${item.getIndex()}, yAxisIndex:<@getYIndex item />,
datasetIndex:${item.getIndex()}, datasetIndex:<@getDataSetIndex item />,
encode: { encode: {
<#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if> <#if item.getPSChartSeriesEncode()??><#assign chartSeriesEncode = item.getPSChartSeriesEncode() /></#if>
x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>], x: [<#if chartSeriesEncode.getX()??><#list chartSeriesEncode.getX() as xValue>'${xValue?lower_case}'<#if xValue_has_next>,</#if></#list></#if>],
......
@CONTROL/数据图表/CONTROL-BASE.vue#SERIES_PIE.ftl
浏览文件 @ 0985de7c
<#ibizinclude>
./CONTROL-COMMON.vue.ftl
</#ibizinclude>
<#-- 折线图序列start --> <#-- 折线图序列start -->
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
...@@ -6,7 +9,7 @@ ${item.render.code} ...@@ -6,7 +9,7 @@ ${item.render.code}
id:'<#if item.getName()??>${item.getName()?lower_case}</#if>', id:'<#if item.getName()??>${item.getName()?lower_case}</#if>',
name:'<#if item.getCaption()??>${item.getCaption()}</#if>', name:'<#if item.getCaption()??>${item.getCaption()}</#if>',
type:'pie', type:'pie',
datasetIndex:${item.getIndex()}, datasetIndex:<@getDataSetIndex item />,
<#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if> <#compress><#if item.getLeft()??>left:"${item.getLeft()}",</#if>
<#if item.getTop()??>top:"${item.getTop()}",</#if> <#if item.getTop()??>top:"${item.getTop()}",</#if>
<#if item.getBottom()??>bottom:"${item.getBottom()}",</#if> <#if item.getBottom()??>bottom:"${item.getBottom()}",</#if>
......
@CONTROL/数据图表/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -24,7 +24,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -24,7 +24,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return []; return [];
...@@ -34,7 +34,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -34,7 +34,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return null; return null;
...@@ -44,7 +44,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -44,7 +44,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* 显示处理提示 * 显示处理提示
* *
* @type {boolean} * @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop({ default: true }) public showBusyIndicator!: boolean; @Prop({ default: true }) public showBusyIndicator!: boolean;
...@@ -52,14 +52,14 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -52,14 +52,14 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* 部件行为--fetch * 部件行为--fetch
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public fetchAction!: string; @Prop() public fetchAction!: string;
/** /**
* Vue声明周期(组件初始化完毕) * Vue声明周期(组件初始化完毕)
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.afterCreated(); this.afterCreated();
...@@ -68,7 +68,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -68,7 +68,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
/** /**
* 执行created后的逻辑 * 执行created后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterCreated(){ public afterCreated(){
if (this.viewState) { if (this.viewState) {
...@@ -86,7 +86,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -86,7 +86,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public destroyed() { public destroyed() {
this.afterDestroy(); this.afterDestroy();
...@@ -95,7 +95,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -95,7 +95,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
/** /**
* 执行destroyed后的逻辑 * 执行destroyed后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterDestroy() { public afterDestroy() {
if (this.viewStateEvent) { if (this.viewStateEvent) {
...@@ -347,13 +347,13 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char ...@@ -347,13 +347,13 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
Object.keys(this.seriesModel).forEach((seriesName:string) =>{ Object.keys(this.seriesModel).forEach((seriesName:string) =>{
if(_chartOption && _chartOption.series.length > 0){ if(_chartOption && _chartOption.series.length > 0){
_chartOption.series.forEach((item:any) =>{ _chartOption.series.forEach((item:any) =>{
if(this.seriesModel[seriesName].ecxObject){ if(this.seriesModel[seriesName].ecxObject && Object.is(seriesName,item.id)){
item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecxObject); item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecxObject);
} }
if(this.seriesModel[seriesName].baseOption && Object.keys(this.seriesModel[seriesName].baseOption).length > 0){ if(this.seriesModel[seriesName].baseOption && Object.keys(this.seriesModel[seriesName].baseOption).length > 0 && Object.is(seriesName,item.id)){
item = Util.deepObjectMerge(item,this.seriesModel[seriesName].baseOption); item = Util.deepObjectMerge(item,this.seriesModel[seriesName].baseOption);
} }
if(this.seriesModel[seriesName].ecObject){ if(this.seriesModel[seriesName].ecObject && Object.is(seriesName,item.id)){
item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecObject); item = Util.deepObjectMerge(item,this.seriesModel[seriesName].ecObject);
} }
}) })
......
@CONTROL/数据图表/CONTROL-COMMON.vue.ftl 0 → 100644
浏览文件 @ 0985de7c
<#-- 获取序列映射X轴的索引start-->
<#macro getXIndex item>
<#compress>
<#if item.getPSChartCoordinateSystem?? && item.getPSChartCoordinateSystem()??>
<#assign chartCoordinateSystem = item.getPSChartCoordinateSystem() />
<#if chartCoordinateSystem.getPSChartGrid?? && chartCoordinateSystem.getPSChartGrid()?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0()??>
${chartCoordinateSystem.getPSChartGrid().getPSChartGridXAxis0().getIndex()}<#else>0</#if>
</#if>
</#compress>
</#macro>
<#-- 获取序列映射X轴的索引end-->
<#-- 获取序列映射Y轴的索引start-->
<#macro getYIndex item>
<#compress>
<#if item.getPSChartCoordinateSystem?? && item.getPSChartCoordinateSystem()??>
<#assign chartCoordinateSystem = item.getPSChartCoordinateSystem() />
<#if chartCoordinateSystem.getPSChartGrid?? && chartCoordinateSystem.getPSChartGrid()?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0?? && chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0()??>
${chartCoordinateSystem.getPSChartGrid().getPSChartGridYAxis0().getIndex()}<#else>0</#if>
</#if>
</#compress>
</#macro>
<#-- 获取序列映射Y轴的索引end-->
<#-- 获取序列映射数据集的索引start-->
<#macro getDataSetIndex item>
<#compress>
<#if item.getPSChartDataSet?? && item.getPSChartDataSet()??>
<#assign chartDataSet = item.getPSChartDataSet() />
${chartDataSet.getIndex()}<#else>0
</#if>
</#compress>
</#macro>
<#-- 获取序列映射数据集的索引end-->
\ No newline at end of file
@CONTROL/数据看板/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -95,7 +95,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -95,7 +95,7 @@ import UtilService from '@/utilservice/util-service';
* *
* @public * @public
* @type {(boolean)} * @type {(boolean)}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public isEnableCustomized!:boolean; @Prop() public isEnableCustomized!:boolean;
...@@ -104,7 +104,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -104,7 +104,7 @@ import UtilService from '@/utilservice/util-service';
* *
* @public * @public
* @type {(boolean)} * @type {(boolean)}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public isHasCustomized:boolean = false; public isHasCustomized:boolean = false;
...@@ -113,7 +113,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -113,7 +113,7 @@ import UtilService from '@/utilservice/util-service';
* *
* @public * @public
* @type {(*)} * @type {(*)}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public modelDta:any; public modelDta:any;
...@@ -121,7 +121,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -121,7 +121,7 @@ import UtilService from '@/utilservice/util-service';
* modleId * modleId
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public modelId:string = "dashboard_<#if ctrl.getPSAppDataEntity()??>${ctrl.getPSAppDataEntity().getCodeName()?lower_case}<#else>app</#if>_${ctrl.getCodeName()?lower_case}"; public modelId:string = "dashboard_<#if ctrl.getPSAppDataEntity()??>${ctrl.getPSAppDataEntity().getCodeName()?lower_case}<#else>app</#if>_${ctrl.getCodeName()?lower_case}";
...@@ -129,7 +129,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -129,7 +129,7 @@ import UtilService from '@/utilservice/util-service';
* 建构功能服务对象 * 建构功能服务对象
* *
* @type {UtilService} * @type {UtilService}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public utilService:UtilService = new UtilService(); public utilService:UtilService = new UtilService();
...@@ -137,7 +137,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -137,7 +137,7 @@ import UtilService from '@/utilservice/util-service';
* 功能服务名称 * 功能服务名称
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public utilServiceName:string = "<#if ctrl.getPSAppDynaDashboardUtil?? && ctrl.getPSAppDynaDashboardUtil()??>${ctrl.getPSAppDynaDashboardUtil().getCodeName()?lower_case}</#if>"; public utilServiceName:string = "<#if ctrl.getPSAppDynaDashboardUtil?? && ctrl.getPSAppDynaDashboardUtil()??>${ctrl.getPSAppDynaDashboardUtil().getCodeName()?lower_case}</#if>";
...@@ -145,7 +145,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -145,7 +145,7 @@ import UtilService from '@/utilservice/util-service';
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return []; return [];
...@@ -155,7 +155,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -155,7 +155,7 @@ import UtilService from '@/utilservice/util-service';
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return {}; return {};
...@@ -164,7 +164,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -164,7 +164,7 @@ import UtilService from '@/utilservice/util-service';
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.afterCreated(); this.afterCreated();
...@@ -173,7 +173,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -173,7 +173,7 @@ import UtilService from '@/utilservice/util-service';
/** /**
* 执行created后的逻辑 * 执行created后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterCreated(){ public afterCreated(){
if (this.viewState) { if (this.viewState) {
...@@ -191,21 +191,21 @@ import UtilService from '@/utilservice/util-service'; ...@@ -191,21 +191,21 @@ import UtilService from '@/utilservice/util-service';
/** /**
* 动态设计水平列数 * 动态设计水平列数
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public layoutColNum:number = 12; public layoutColNum:number = 12;
/** /**
* 动态设计单元格高度，80px * 动态设计单元格高度，80px
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public layoutRowH:number = 80; public layoutRowH:number = 80;
/** /**
* 通知状态 * 通知状态
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public notifyState(){ public notifyState(){
this.$nextTick(() =>{ this.$nextTick(() =>{
...@@ -237,7 +237,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -237,7 +237,7 @@ import UtilService from '@/utilservice/util-service';
/** /**
* 加载布局与数据模型 * 加载布局与数据模型
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public loadModel(){ public loadModel(){
if(this.isEnableCustomized){ if(this.isEnableCustomized){
...@@ -273,7 +273,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -273,7 +273,7 @@ import UtilService from '@/utilservice/util-service';
/** /**
* 处理私人定制按钮 * 处理私人定制按钮
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public handleClick(){ public handleClick(){
const view:any ={ const view:any ={
...@@ -298,7 +298,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -298,7 +298,7 @@ import UtilService from '@/utilservice/util-service';
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public destroyed() { public destroyed() {
this.afterDestroy(); this.afterDestroy();
...@@ -307,7 +307,7 @@ import UtilService from '@/utilservice/util-service'; ...@@ -307,7 +307,7 @@ import UtilService from '@/utilservice/util-service';
/** /**
* 执行destroyed后的逻辑 * 执行destroyed后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterDestroy() { public afterDestroy() {
if (this.viewStateEvent) { if (this.viewStateEvent) {
......
@CONTROL/数据视图/CONTROL.html.ftl
浏览文件 @ 0985de7c
...@@ -9,6 +9,16 @@ ...@@ -9,6 +9,16 @@
<#if view.getViewType() == 'DEDATAVIEWEXPVIEW'> <#if view.getViewType() == 'DEDATAVIEWEXPVIEW'>
:isSelectFirstDefault="true" :isSelectFirstDefault="true"
</#if> </#if>
<#if view.getPSAppViewLogics?? && view.getPSAppViewLogics()??>
<#list view.getPSAppViewLogics() as logic>
<#if logic.getPFLogicCodeType() == 'APP_NEWDATA'>
:newdata="newdata"
</#if>
<#if logic.getPFLogicCodeType() == 'APP_OPENDATA'>
:opendata="opendata"
</#if>
</#list>
</#if>
</#assign> </#assign>
<#ibizinclude> <#ibizinclude>
../@MACRO/HTML/DEFAULT.html.ftl ../@MACRO/HTML/DEFAULT.html.ftl
......
@CONTROL/数据视图/SERVICE.ts.ftl
浏览文件 @ 0985de7c
...@@ -65,7 +65,65 @@ ...@@ -65,7 +65,65 @@
}); });
} }
/**
* 添加数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Context,Data, isloading);
}else{
result =_appEntityService.Create(Context,Data, isloading);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
/**
* 修改数据
*
* @param {string} action
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Data,Context,isloading);
}else{
result =_appEntityService.Update(Data,Context,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
resolve(response);
}).catch(response => {
reject(response);
});
});
}
<#ibizinclude> <#ibizinclude>
../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl ../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl
......
@CONTROL/日历导航/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
* 打开新建数据视图 * 打开新建数据视图
* *
* @type {any} * @type {any}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public newdata: any; @Prop() public newdata: any;
</#if> </#if>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
* 打开编辑数据视图 * 打开编辑数据视图
* *
* @type {any} * @type {any}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public opendata: any; @Prop() public opendata: any;
</#if> </#if>
......
@CONTROL/树表格（增强）/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
* 显示处理提示 * 显示处理提示
* *
* @type {boolean} * @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop({ default: true }) public showBusyIndicator?: boolean; @Prop({ default: true }) public showBusyIndicator?: boolean;
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
* 部件行为--load * 部件行为--load
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public loadAction!: string; @Prop() public loadAction!: string;
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
* 是否单选 * 是否单选
* *
* @type {boolean} * @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop({ default: true }) public isSingleSelect!: boolean; @Prop({ default: true }) public isSingleSelect!: boolean;
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public controlClass: string = "${ctrl.name}"; public controlClass: string = "${ctrl.name}";
...@@ -75,28 +75,28 @@ ...@@ -75,28 +75,28 @@
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public items: any[] = []; public items: any[] = [];
/** /**
* 默认展开节点集合 * 默认展开节点集合
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public defExpands: any = []; public defExpands: any = [];
/** /**
* 行节点下标 * 行节点下标
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public itemNum: any = {}; public itemNum: any = {};
/** /**
* 计数下标 * 计数下标
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public num: number = 0; public num: number = 0;
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
* 获取列属性值 * 获取列属性值
* *
* @public * @public
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getColumnValue(task: any, field: string) { public getColumnValue(task: any, field: string) {
<#if ctrl.getPSDETreeNodes()??> <#if ctrl.getPSDETreeNodes()??>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
* 获取代码项 * 获取代码项
* *
* @public * @public
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getCodeListItem(codelist: any, val: any) { public getCodeListItem(codelist: any, val: any) {
for(let i = 0; i < codelist.items.length; i++) { for(let i = 0; i < codelist.items.length; i++) {
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
* 搜索获取日程事件 * 搜索获取日程事件
* *
* @param {*} $event 日期信息 * @param {*} $event 日期信息
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public load(task: any = {}, resolve?: any) { public load(task: any = {}, resolve?: any) {
const params: any = { const params: any = {
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
* 计算当前节点的上下文 * 计算当前节点的上下文
* *
* @param {*} curNode 当前节点 * @param {*} curNode 当前节点
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public computecurNodeContext(curNode:any){ public computecurNodeContext(curNode:any){
let tempContext:any = {}; let tempContext:any = {};
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
* 节点展开 * 节点展开
* *
* @param {*} item 当前节点 * @param {*} item 当前节点
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public itemExpand(item: any) { public itemExpand(item: any) {
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
/** /**
* 刷新 * 刷新
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public refresh() { public refresh() {
this.load(); this.load();
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
* 选中的数据 * 选中的数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public selections: any[] = []; public selections: any[] = [];
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return this.selections; return this.selections;
...@@ -264,7 +264,7 @@ ...@@ -264,7 +264,7 @@
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return null; return null;
...@@ -274,7 +274,7 @@ ...@@ -274,7 +274,7 @@
* vue 生命周期 * vue 生命周期
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.load(); this.load();
...@@ -284,7 +284,7 @@ ...@@ -284,7 +284,7 @@
* 设置行Class * 设置行Class
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public setRowClass({row, rowIndex}: {row: any, rowIndex: number}) { public setRowClass({row, rowIndex}: {row: any, rowIndex: number}) {
return 'treegrid' + this.itemNum[row.id]; return 'treegrid' + this.itemNum[row.id];
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
* 展开默认节点 * 展开默认节点
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public expandDefNode() { public expandDefNode() {
if(this.defExpands.length > 0) { if(this.defExpands.length > 0) {
...@@ -312,7 +312,7 @@ ...@@ -312,7 +312,7 @@
* 选中变化 * 选中变化
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public select($event: any) { public select($event: any) {
if (!$event) { if (!$event) {
......
@CONTROL/流程导航栏/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return []; return [];
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return {}; return {};
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
* 选中数据 * 选中数据
* *
* @type {*} * @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public selection: any = {}; public selection: any = {};
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
* 过滤值 * 过滤值
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public srffilter: string = ''; public srffilter: string = '';
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
* *
* @public * @public
* @type {boolean} * @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public refViews: any = [ public refViews: any = [
<#list view.getAllRelatedPSAppViews() as refview> <#list view.getAllRelatedPSAppViews() as refview>
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,7 @@
* 分割宽度 * 分割宽度
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public split: number = 0.2; public split: number = 0.2;
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
* *
* @param {*} [arg={}] * @param {*} [arg={}]
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public select(index: any, indexs: any[]) { public select(index: any, indexs: any[]) {
this.refViews.some((item:any) =>{ this.refViews.some((item:any) =>{
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
/** /**
* 执行created后的逻辑 * 执行created后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterCreated(){ public afterCreated(){
if (this.viewState) { if (this.viewState) {
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
/** /**
* vue 生命周期 * vue 生命周期
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public destroyed() { public destroyed() {
this.afterDestroy(); this.afterDestroy();
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
/** /**
* 执行destroyed后的逻辑 * 执行destroyed后的逻辑
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public afterDestroy() { public afterDestroy() {
if (this.viewStateEvent) { if (this.viewStateEvent) {
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
* 视图数据变化 * 视图数据变化
* *
* @param {*} $event * @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public onViewDatasChange($event: any): void { public onViewDatasChange($event: any): void {
this.$emit('selectionchange', $event); this.$emit('selectionchange', $event);
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
* 视图数据被激活 * 视图数据被激活
* *
* @param {*} $event * @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public viewDatasActivated($event: any): void { public viewDatasActivated($event: any): void {
this.$emit('activated', $event); this.$emit('activated', $event);
...@@ -201,7 +201,7 @@ ...@@ -201,7 +201,7 @@
* 视图数据加载完成 * 视图数据加载完成
* *
* @param {*} $event * @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public onViewLoad($event: any): void { public onViewLoad($event: any): void {
this.$emit('load', $event); this.$emit('load', $event);
......
@CONTROL/甘特图部件/CONTROL-BASE.vue.ftl
浏览文件 @ 0985de7c
...@@ -21,7 +21,7 @@ GanttElastic, ...@@ -21,7 +21,7 @@ GanttElastic,
* 显示处理提示 * 显示处理提示
* *
* @type {boolean} * @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop({ default: true }) public showBusyIndicator?: boolean; @Prop({ default: true }) public showBusyIndicator?: boolean;
...@@ -29,7 +29,7 @@ GanttElastic, ...@@ -29,7 +29,7 @@ GanttElastic,
* 部件行为--load * 部件行为--load
* *
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Prop() public loadAction!: string; @Prop() public loadAction!: string;
...@@ -38,7 +38,7 @@ GanttElastic, ...@@ -38,7 +38,7 @@ GanttElastic,
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public ganttClass: string = "gantt"; public ganttClass: string = "gantt";
...@@ -47,7 +47,7 @@ GanttElastic, ...@@ -47,7 +47,7 @@ GanttElastic,
* *
* @public * @public
* @type {string} * @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public locale: string = 'zh-CN'; public locale: string = 'zh-CN';
...@@ -56,7 +56,7 @@ GanttElastic, ...@@ -56,7 +56,7 @@ GanttElastic,
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public localeZH: any = { public localeZH: any = {
weekdays: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'], weekdays: ['星期一','星期二','星期三','星期四','星期五','星期六','星期日'],
...@@ -72,7 +72,7 @@ GanttElastic, ...@@ -72,7 +72,7 @@ GanttElastic,
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public options: any = { public options: any = {
isflex: true, isflex: true,
...@@ -141,7 +141,7 @@ GanttElastic, ...@@ -141,7 +141,7 @@ GanttElastic,
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public dynamicStyle: any = {}; public dynamicStyle: any = {};
...@@ -150,7 +150,7 @@ GanttElastic, ...@@ -150,7 +150,7 @@ GanttElastic,
* *
* @public * @public
* @type {any[]} * @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public tasks: any[] = []; public tasks: any[] = [];
...@@ -158,7 +158,7 @@ GanttElastic, ...@@ -158,7 +158,7 @@ GanttElastic,
* 监听语言变化 * 监听语言变化
* *
* @public * @public
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
@Watch('$i18n.locale') @Watch('$i18n.locale')
public onLocaleChange(newval: any, val: any) { public onLocaleChange(newval: any, val: any) {
...@@ -169,7 +169,7 @@ GanttElastic, ...@@ -169,7 +169,7 @@ GanttElastic,
* 获取列属性值 * 获取列属性值
* *
* @public * @public
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getColumnValue(task: any, field: string) { public getColumnValue(task: any, field: string) {
<#if ctrl.getPSDETreeNodes()??> <#if ctrl.getPSDETreeNodes()??>
...@@ -198,7 +198,7 @@ GanttElastic, ...@@ -198,7 +198,7 @@ GanttElastic,
* 获取代码项 * 获取代码项
* *
* @public * @public
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getCodeListItem(codelist: any, val: any) { public getCodeListItem(codelist: any, val: any) {
for(let i = 0; i < codelist.items.length; i++) { for(let i = 0; i < codelist.items.length; i++) {
...@@ -213,7 +213,7 @@ GanttElastic, ...@@ -213,7 +213,7 @@ GanttElastic,
* 获取部件参数 * 获取部件参数
* *
* @returns {any} * @returns {any}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getOptions() { public getOptions() {
if(Object.is(this.locale, 'zh-CN')) { if(Object.is(this.locale, 'zh-CN')) {
...@@ -226,7 +226,7 @@ GanttElastic, ...@@ -226,7 +226,7 @@ GanttElastic,
* 搜索获取日程事件 * 搜索获取日程事件
* *
* @param {*} $event 日期信息 * @param {*} $event 日期信息
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public load(task: any = {}) { public load(task: any = {}) {
const params: any = { const params: any = {
...@@ -270,7 +270,7 @@ GanttElastic, ...@@ -270,7 +270,7 @@ GanttElastic,
* 计算当前节点的上下文 * 计算当前节点的上下文
* *
* @param {*} curNode 当前节点 * @param {*} curNode 当前节点
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public computecurNodeContext(curNode:any){ public computecurNodeContext(curNode:any){
let tempContext:any = {}; let tempContext:any = {};
...@@ -286,7 +286,7 @@ GanttElastic, ...@@ -286,7 +286,7 @@ GanttElastic,
* 节点展开 * 节点展开
* *
* @param {*} task 当前节点 * @param {*} task 当前节点
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public taskItemExpand(task: any) { public taskItemExpand(task: any) {
if(!task.collapsed) { if(!task.collapsed) {
...@@ -300,7 +300,7 @@ GanttElastic, ...@@ -300,7 +300,7 @@ GanttElastic,
/** /**
* 刷新 * 刷新
* *
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public refresh() { public refresh() {
this.load(); this.load();
...@@ -312,7 +312,7 @@ GanttElastic, ...@@ -312,7 +312,7 @@ GanttElastic,
* 选中的数据 * 选中的数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public selections: any[] = []; public selections: any[] = [];
...@@ -320,7 +320,7 @@ GanttElastic, ...@@ -320,7 +320,7 @@ GanttElastic,
* 获取多项数据 * 获取多项数据
* *
* @returns {any[]} * @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getDatas(): any[] { public getDatas(): any[] {
return this.selections; return this.selections;
...@@ -330,7 +330,7 @@ GanttElastic, ...@@ -330,7 +330,7 @@ GanttElastic,
* 获取单项树 * 获取单项树
* *
* @returns {*} * @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public getData(): any { public getData(): any {
return null; return null;
...@@ -340,7 +340,7 @@ GanttElastic, ...@@ -340,7 +340,7 @@ GanttElastic,
* vue 生命周期 * vue 生命周期
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public created() { public created() {
this.locale = this.$i18n.locale; this.locale = this.$i18n.locale;
...@@ -351,7 +351,7 @@ GanttElastic, ...@@ -351,7 +351,7 @@ GanttElastic,
* 点击事件 * 点击事件
* *
* @returns * @returns
* @memberof ${srfclassname('${ctrl.codeName}')} * @memberof ${srfclassname('${ctrl.codeName}')}Base
*/ */
public taskClick({event, data}: {event: any, data: any}) { public taskClick({event, data}: {event: any, data: any}) {
const _this: any = this; const _this: any = this;
......
@CONTROL/看板视图/CONTROL.less.ftl
浏览文件 @ 0985de7c
...@@ -37,6 +37,21 @@ ...@@ -37,6 +37,21 @@
.dataview-group-content:nth-child(1) { .dataview-group-content:nth-child(1) {
border-left: 1px solid #ddd; border-left: 1px solid #ddd;
} }
.quick-action {
flex-shrink: 0;
margin-left: 5px;
.quick-action-item {
width: 37px;
height: 37px;
text-align: center;
line-height: 37px;
border: 1px solid #ddd;
border-top-width: 0;
}
.quick-action-item:nth-child(1) {
border-top-width: 1px;
}
}
} }
<#ibizinclude> <#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl ../@MACRO/CSS/DEFAULT.less.ftl
......
@CONTROL/表单/CONTROL-BASE.vue#DETAIL_GROUPPANEL.ftl
浏览文件 @ 0985de7c
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<#if item.render??> <#if item.render??>
${item.render.code} ${item.render.code}
<#else> <#else>
<app-form-group layoutType="<#if item.getPSLayoutPos()??>${item.getPSLayoutPos().getLayout()}</#if>" titleStyle="<#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??>${item.getLabelPSSysCss().getCssName()}</#if>" class='<#if item.getPSSysCss?? && item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' :uiActionGroup="detailsModel.${item.name}.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>" :isShowCaption="${item.isShowCaption()?c}" uiStyle="${item.getDetailStyle()}" :titleBarCloseMode="${item.getTitleBarCloseMode()}" :isInfoGroupMode="${item.isInfoGroupMode()?c}" <#if item.getPSSysImage()??>:iconInfo="{<#assign img=item.getPSSysImage()><#if img.getImagePath() == "">'iconclass':'${img.getCssClass()}'<#else>'iconpath':'${img.getImagePath()}'</#if>}"</#if>> <app-form-group layoutType="<#if item.getPSLayout()??>${item.getPSLayout().getLayout()}</#if>" titleStyle="<#if item.getLabelPSSysCss?? && item.getLabelPSSysCss()??>${item.getLabelPSSysCss().getCssName()}</#if>" class='<#if item.getPSSysCss?? && item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' :uiActionGroup="detailsModel.${item.name}.uiActionGroup" @groupuiactionclick="groupUIActionClick($event)" :caption="<#if langbase??>$t('${langbase}.details.${item.name}')<#else>'${item.getCaption()}'</#if>" :isShowCaption="${item.isShowCaption()?c}" uiStyle="${item.getDetailStyle()}" :titleBarCloseMode="${item.getTitleBarCloseMode()}" :isInfoGroupMode="${item.isInfoGroupMode()?c}" <#if item.getPSSysImage()??>:iconInfo="{<#assign img=item.getPSSysImage()><#if img.getImagePath() == "">'iconclass':'${img.getCssClass()}'<#else>'iconpath':'${img.getImagePath()}'</#if>}"</#if>>
<#assign content> <#assign content>
<#list item.getPSDEFormDetails() as formmenber> <#list item.getPSDEFormDetails() as formmenber>
<#if !(formmenber.isHidden?? && formmenber.isHidden())> <#if !(formmenber.isHidden?? && formmenber.isHidden())>
......
@CONTROL/表单/CONTROL-BASE.vue#DETAIL_MODEL.ftl
浏览文件 @ 0985de7c
...@@ -14,7 +14,7 @@ new FormPageModel({ ${detail} }) ...@@ -14,7 +14,7 @@ new FormPageModel({ ${detail} })
<#elseif item.getDetailType() == 'FORMPART'> <#elseif item.getDetailType() == 'FORMPART'>
new FormPartModel({ ${detail} }) new FormPartModel({ ${detail} })
<#elseif item.getDetailType() == 'GROUPPANEL'> <#elseif item.getDetailType() == 'GROUPPANEL'>
new FormGroupPanelModel({ ${detail}, uiActionGroup: { caption: '<#if item.getPSUIActionGroup()??>${item.getPSUIActionGroup().getName()}</#if>', langbase: '<#if langbase??>${langbase}</#if>', extractMode: '<#if item.getActionGroupExtractMode?? && item.getActionGroupExtractMode()??>${item.getActionGroupExtractMode()}<#else>ITEM</#if>', details: [<#if item.getPSUIActionGroup()??><#list item.getPSUIActionGroup().getPSUIActionGroupDetails() as uadetails><#if uadetails_index gt 0>, </#if>{ name: '${item.getName()}_${uadetails.getName()}', caption: '${uadetails.getPSUIAction().getCaption()}', uiactiontag: '${uadetails.getPSUIAction().getUIActionTag()?lower_case}'<#if uadetails.getPSUIAction().getPSSysImage()??>, <#assign viewimg=uadetails.getPSUIAction().getPSSysImage()/><#if viewimg.getCssClass() != ''>icon: '${viewimg.getCssClass()}'<#else>img: '${viewimg.getImagePath()}'</#if></#if> }</#list></#if>] } }) new FormGroupPanelModel({ ${detail}, uiActionGroup: { caption: '<#if item.getPSUIActionGroup()??>${item.getPSUIActionGroup().getName()}</#if>', langbase: '<#if langbase??>${langbase}</#if>', extractMode: '<#if item.getActionGroupExtractMode?? && item.getActionGroupExtractMode()??>${item.getActionGroupExtractMode()}<#else>ITEM</#if>', details: [<#if item.getPSUIActionGroup()??><#list item.getPSUIActionGroup().getPSUIActionGroupDetails() as uadetails><#if uadetails_index gt 0>, </#if>{ name: '${item.getName()}_${uadetails.getName()}', caption: '${uadetails.getPSUIAction().getCaption()}', uiactiontag: '${uadetails.getPSUIAction().getUIActionTag()?lower_case}'<#if uadetails.getPSUIAction().getPSSysImage()??>, <#assign viewimg=uadetails.getPSUIAction().getPSSysImage()/><#if viewimg.getCssClass() != ''>icon: '${viewimg.getCssClass()}'<#else>img: '${viewimg.getImagePath()}'</#if></#if>,isShowCaption:${uadetails.isShowCaption()?c},isShowIcon:${uadetails.isShowIcon()?c} }</#list></#if>] } })
<#elseif item.getDetailType() == 'IFRAME'> <#elseif item.getDetailType() == 'IFRAME'>
new FormIFrameModel({ ${detail} }) new FormIFrameModel({ ${detail} })
<#elseif item.getDetailType() == 'RAWITEM'> <#elseif item.getDetailType() == 'RAWITEM'>
......
@CONTROL/表格/CONTROL-BASE.vue#COLUMN.ftl
浏览文件 @ 0985de7c
...@@ -72,17 +72,29 @@ ...@@ -72,17 +72,29 @@
<el-table-column :column-key="'${item.getName()?lower_case}'" :label="<#if langbase??>$t('${langbase}.columns.${item.getName()?lower_case}')<#else>'${item.getCaption()}'</#if>"<#if item.getWidthUnit()!='STAR'> :width="${item.width?c}" <#else> :min-width="${item.width?c}" </#if> :align="'${item.getAlign()?lower_case}'"> <el-table-column :column-key="'${item.getName()?lower_case}'" :label="<#if langbase??>$t('${langbase}.columns.${item.getName()?lower_case}')<#else>'${item.getCaption()}'</#if>"<#if item.getWidthUnit()!='STAR'> :width="${item.width?c}" <#else> :min-width="${item.width?c}" </#if> :align="'${item.getAlign()?lower_case}'">
<@getColumnHeader item 8 /> <@getColumnHeader item 8 />
<template slot-scope="scope"> <template slot-scope="scope">
<span> <div style="text-align: center;">
<#if item.getPSDEUIActionGroup().getPSDEUIActions()??> <#if item.getPSDEUIActionGroup().getPSDEUIActions()??>
<#list item.getPSDEUIActionGroup().getPSUIActions() as uiaction> <#list item.getPSDEUIActionGroup().getPSUIActionGroupDetails() as uiactionDetail>
<#if uiaction_index gt 0><divider type='vertical'></divider></#if> <#if uiactionDetail_index gt 0>
<divider type='vertical'></divider>
</#if>
<#if uiactionDetail.getPSUIAction?? && uiactionDetail.getPSUIAction()??>
<#assign uiaction = uiactionDetail.getPSUIAction() />
<#if !uiactionDetail.isShowCaption()>
<tooltip :transfer="true" :max-width="600">
</#if>
<a @click="uiAction(scope.row, '${uiaction.getUIActionTag()}', $event)"> <a @click="uiAction(scope.row, '${uiaction.getUIActionTag()}', $event)">
<i class='<#if uiaction.getIconCls?? && uiaction.getIconCls()??>${uiaction.getIconCls()}</#if>'></i> <#if uiactionDetail.isShowIcon()><i class='<#if uiaction.getIconCls?? && uiaction.getIconCls()??>${uiaction.getIconCls()}</#if>'></i></#if>
{{<#if langbase??>$t('${langbase}.uiactions.${uiaction.getUIActionTag()?lower_case}')<#else>'${uiaction.getCaption()}'</#if>}} <#if uiactionDetail.isShowCaption()>{{<#if langbase??>$t('${langbase}.uiactions.${uiaction.getUIActionTag()?lower_case}')<#else>'${uiaction.getCaption()}'</#if>}}</#if>
</a> </a>
<#if !uiactionDetail.isShowCaption()>
<div slot='content'>{{<#if langbase??>$t('${langbase}.uiactions.${uiaction.getUIActionTag()?lower_case}')<#else>'${uiaction.getCaption()}'</#if>}}</div>
</tooltip>
</#if>
</#if>
</#list> </#list>
</#if> </#if>
</span> </div>
</template> </template>
</el-table-column> </el-table-column>
<#-- [2]END：操作列 --> <#-- [2]END：操作列 -->
......
@CONTROL/表格/CONTROL.less.ftl
浏览文件 @ 0985de7c
...@@ -46,6 +46,13 @@ ...@@ -46,6 +46,13 @@
margin-bottom: unset !important; margin-bottom: unset !important;
} }
} }
.el-table__body .edit-cell{
padding:0;
.app-form-item{
margin-top: 20px;
margin-bottom: 20px;
}
}
} }
.grid-pagination { .grid-pagination {
height: 36px; height: 36px;
......
@CONTROL/表格/SERVICE.ts.ftl
浏览文件 @ 0985de7c
...@@ -312,7 +312,6 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi ...@@ -312,7 +312,6 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = Util.createUUID(); response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = Util.createUUID();
} }
this.handleResponse(action, response, true); this.handleResponse(action, response, true);
this.mergeDefaults(response);
resolve(response); resolve(response);
}).catch(response => { }).catch(response => {
reject(response); reject(response);
...@@ -320,23 +319,6 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi ...@@ -320,23 +319,6 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
}); });
} }
/**
* 合并配置的默认值
* @param {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
public mergeDefaults(response:any = {}){
if(response.data){
<#list ctrl.getPSDEGridEditItems() as edititem><#t>
<#if edititem.getCreateDV?? && edititem.getCreateDV()??><#t>
<#if !(edititem.getCreateDV() == '')><#t>
Object.assign(response.data,{'${edititem.getCodeName()?lower_case}':'${edititem.getCreateDV()}'});
</#if>
</#if>
</#list>
}
}
<#if ctrl.getAggMode() == "ALL" && ctrl.getAggPSAppDataEntity()??> <#if ctrl.getAggMode() == "ALL" && ctrl.getAggPSAppDataEntity()??>
<#assign aggAppDataEntity = ctrl.getAggPSAppDataEntity() > <#assign aggAppDataEntity = ctrl.getAggPSAppDataEntity() >
/** /**
......
@CONTROL/视图布局面板/@MACRO/VIEW_CAPTION.vue.ftl
浏览文件 @ 0985de7c
<#-- 不带数据信息标题 --> <#-- 不带数据信息标题 -->
<#if view.isShowCaptionBar()> <#if view.isShowCaptionBar()>
<p slot='title'> <div slot='title' class="header-container">
<#if view.getPSSysImage()??> <#if view.getPSSysImage()??>
<#assign viewimg = view.getPSSysImage()/> <#assign viewimg = view.getPSSysImage()/>
<#if viewimg.getImagePath() != ""> <#if viewimg.getImagePath() != "">
...@@ -10,5 +10,5 @@ ...@@ -10,5 +10,5 @@
</#if> </#if>
</#if> </#if>
<span class='caption-info'>{{$t(model.srfTitle)}}</span> <span class='caption-info'>{{$t(model.srfTitle)}}</span>
</p> </div>
</#if> </#if>
\ No newline at end of file
@CONTROL/视图布局面板/@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
浏览文件 @ 0985de7c
<#-- 带数据信息标题 --> <#-- 带数据信息标题 -->
<#if view.isShowCaptionBar() || view.hasPSControl('toolbar')> <#if view.isShowCaptionBar() || view.hasPSControl('toolbar')>
<p slot='title'> <div slot='title' class="header-container">
<#if view.isShowCaptionBar()> <#if view.isShowCaptionBar()>
<#if view.getPSSysImage()??> <#if view.getPSSysImage()??>
<#assign viewimg = view.getPSSysImage()/> <#assign viewimg = view.getPSSysImage()/>
<#if viewimg.getImagePath() != ''> <#if viewimg.getImagePath() != ''>
...@@ -11,6 +11,17 @@ ...@@ -11,6 +11,17 @@
</#if> </#if>
</#if> </#if>
<span class='caption-info'>{{$t(model.srfTitle)}}</span> <span class='caption-info'>{{$t(model.srfTitle)}}</span>
</#if> </#if>
</p> <#if view.hasPSControl('toolbar')>
<#if selfToolbarRender??>
<@ibizindent blank=4>
${selfToolbarRender}<#t>
</@ibizindent>
<#else>
<@ibizindent blank=4>
${P.getCtrlCode('toolbar', 'CONTROL.html').code}<#t>
</@ibizindent>
</#if>
</#if>
</div>
</#if> </#if>
\ No newline at end of file
@CONTROL/视图布局面板/实体分页搜索视图/VIEW.less.ftl 0 → 100644
浏览文件 @ 0985de7c
<#ibizinclude>
../@MACRO/DEFAULT.less.ftl
</#ibizinclude>
.detabsearchview{
.toolbars-container{
margin-bottom: 6px;
overflow:hidden;
.tab-panel-group{
float: right;
.el-radio-button__inner{
color: #303133;
padding: 12px;
min-width: 42px;
min-height: 42px;
i{
font-size: 14px;
}
}
.el-radio-button.is-active .el-radio-button__inner{
background-color: #c5c8ce;
border-color: #c5c8ce;
box-shadow: -1px 0 0 0 #c5c8ce;
}
}
}
.tabexppanel {
> .ivu-tabs-bar{
display: none;
}
> .ivu-tabs-content{
border-top: 1px solid #dcdee2;
height: 100%;
}
}
}
\ No newline at end of file
@CONTROL/视图布局面板/实体分页搜索视图/VIEW.vue.ftl 0 → 100644
浏览文件 @ 0985de7c
<div class='view-container ${view.getViewType()?lower_case} ${srffilepath2(view.getCodeName())}<#if view.getPSSysCss?? && view.getPSSysCss()??> ${view.getPSSysCss().getCssName()}</#if>'>
<app-studioaction :viewTitle="$t(model.srfTitle)" viewName="${view.getCodeName()?lower_case}"></app-studioaction>
<card class='view-card<#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :dis-hover="true" :bordered="false">
<#ibizinclude>
../@MACRO/VIEW_CAPTION_DATAINFO.vue.ftl
</#ibizinclude>
<div class="toolbars-container" style=''>
<#if view.hasPSControl('tabexppanel')>
<#assign tabexppanel = view.getPSControl('tabexppanel') />
<el-radio-group v-model="tabValue" class="tab-panel-group">
<#if tabexppanel.getPSControls?? && tabexppanel.getPSControls()??>
<#list tabexppanel.getPSControls() as tabviewpanel>
<el-radio-button label="${tabviewpanel.name}">
<tooltip :transfer="true" :max-width="600">
<#if tabviewpanel.getPSSysImage()??>
<#assign sysimage = tabviewpanel.getPSSysImage()/>
<#if sysimage.getImagePath() == "">
<i class='${sysimage.getCssClass()}'></i>
<#else>
<img src='${sysimage.getImagePath()}'>
</#if>
<#else>
<i class='fa fa-th-large'></i>
</#if>
<div slot='content'>${tabviewpanel.getCaption()}</div>
</tooltip>
</el-radio-button>
</#list>
</#if>
</el-radio-group>
</#if>
</div>
<div class='content-container'>
<#if view.hasPSControl('tabexppanel')>
${P.getCtrlCode('tabexppanel', 'CONTROL.html').code}
</#if>
</div>
</card>
</div>
\ No newline at end of file
@CONTROL/视图布局面板/实体分页搜索视图/template.properties 0 → 100644
浏览文件 @ 0985de7c
CTRLTYPE=VIEWLAYOUTPANEL#APPDETABSEARCHVIEW
\ No newline at end of file
@CONTROL/视图布局面板/实体工作流动态导航表格视图/VIEW.less.ftl
浏览文件 @ 0985de7c
...@@ -18,3 +18,27 @@ ...@@ -18,3 +18,27 @@
} }
} }
} }
.dewfdynaexpgridview{
.el-tree {
padding-right: 10px;
}
.el-tree-node__content {
height: 40px;
border-left: solid transparent;
}
.el-tree-node__label {
font-size: 15px;
font-family: "Microsoft YaHei";
}
.el-tree-node {
margin-top: 10px;
}
.el-tree-node:nth-child(1) {
margin-top: 0px;
}
.el-tree--highlight-current .el-tree-node.is-current>.el-tree-node__content {
background-color: #f0f7ff;
border-color: #1890ff6e;
}
}
\ No newline at end of file
@CONTROL/选择视图面板/CONTROL.html.ftl
浏览文件 @ 0985de7c
<#-- content -->
<#assign content> <#assign content>
:isSingleSelect="isSingleSelect" :isSingleSelect="isSingleSelect"
:selectedData="selectedData" :selectedData="selectedData"
......
@CONTROL/面板/CONTROL.html.ftl
浏览文件 @ 0985de7c
此差异已折叠。
@EDITOR/图片控件/EDITOR.vue.ftl
浏览文件 @ 0985de7c
此差异已折叠。
@EDITOR/数值框/EDITOR.vue.ftl
浏览文件 @ 0985de7c
此差异已折叠。
@EDITOR/文件上传/EDITOR.vue.ftl
浏览文件 @ 0985de7c
此差异已折叠。
@VIEW/@MACRO/DATAVIEW_VIEW.vue.ftl
浏览文件 @ 0985de7c
此差异已折叠。
@VIEW/@MACRO/GRID_VIEW-BASE.vue.ftl
浏览文件 @ 0985de7c
此差异已折叠。
@VIEW/@MACRO/LIST_VIEW.vue.ftl
浏览文件 @ 0985de7c
此差异已折叠。
@VIEW/@MACRO/VIEW.vue.ftl
浏览文件 @ 0985de7c
此差异已折叠。
@VIEW/实体分页搜索视图/VIEW-BASE.vue.ftl 0 → 100644
浏览文件 @ 0985de7c
此差异已折叠。
@VIEW/实体分页搜索视图/VIEW.less.ftl 0 → 100644
浏览文件 @ 0985de7c
此差异已折叠。
@VIEW/实体分页搜索视图/VIEW.vue.ftl 0 → 100644
浏览文件 @ 0985de7c
此差异已折叠。
@VIEW/实体分页搜索视图/template.properties 0 → 100644
浏览文件 @ 0985de7c
此差异已折叠。
APP/src/locale/lang/en-US.ts.ftl
浏览文件 @ 0985de7c
此差异已折叠。
APP/src/locale/lang/zh-CN.ts.ftl
浏览文件 @ 0985de7c
此差异已折叠。
CHANGELOG.md
浏览文件 @ 0985de7c
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或