Skip to content

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

202.5.14 更新

上级 794d9fc0
隐藏空白字符变更
内嵌 并排
正在显示 包含 1446 行增加 和 847 行删除
@CONTROL/@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -46,7 +46,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected name?: string;
@Prop() public name?: string;
/**
* 视图通讯对象
......@@ -54,7 +54,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @type {Subject<ViewState>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected viewState!: Subject<ViewState>;
@Prop() public viewState!: Subject<ViewState>;
/**
* 应用上下文
......@@ -62,7 +62,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected context: any;
@Prop() public context: any;
/**
* 视图参数
......@@ -70,16 +70,16 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected viewparams: any;
@Prop() public viewparams: any;
/**
* 视图状态事件
*
* @protected
* @public
* @type {(Subscription | undefined)}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected viewStateEvent: Subscription | undefined;
public viewStateEvent: Subscription | undefined;
/**
* 获取部件类型
......@@ -87,7 +87,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @returns {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getControlType(): string {
public getControlType(): string {
return '${ctrl.getControlType()}'
}
......@@ -105,7 +105,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected ${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>
</#list>
......@@ -115,7 +115,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @type {Array<*>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected counterServiceArray:Array<any> = [${counterRefs}];
public counterServiceArray:Array<any> = [${counterRefs}];
</#if>
/**
......@@ -124,7 +124,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @type {${srfclassname('${ctrl.codeName}')}Service}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected 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??>
/**
......@@ -133,7 +133,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @type {${srfclassname('${appde.getCodeName()}')}Service}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected 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 ctrl.getPSControls?? && ctrl.getPSControls()??>
<#list ctrl.getPSControls() as childCtrl>
......@@ -148,7 +148,7 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
public ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
<#if childCtrl.getPSControlLogics(eventName)??>
<#list childCtrl.getPSControlLogics(eventName) as ctrlLogic>
<#if ctrlLogic.getLogicType?? && ctrlLogic.getLogicType() == "APPVIEWENGINE" && ctrlLogic.getPSAppViewEngine()??>
......@@ -194,7 +194,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
* @param {any} args
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected closeView(args: any): void {
public closeView(args: any): void {
let _this: any = this;
_this.$emit('closeview', [args]);
}
......
@CONTROL/@MACRO/CONTROL/CONTROL_PORTLET-HEADER-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -46,7 +46,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected name?: string;
@Prop() public name?: string;
/**
* 视图通讯对象
......@@ -54,7 +54,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @type {Subject<ViewState>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected viewState!: Subject<ViewState>;
@Prop() public viewState!: Subject<ViewState>;
/**
* 应用上下文
......@@ -62,7 +62,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected context: any;
@Prop() public context: any;
/**
* 视图参数
......@@ -70,16 +70,16 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected viewparams: any;
@Prop() public viewparams: any;
/**
* 视图状态事件
*
* @protected
* @public
* @type {(Subscription | undefined)}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected viewStateEvent: Subscription | undefined;
public viewStateEvent: Subscription | undefined;
/**
* 获取部件类型
......@@ -87,7 +87,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @returns {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getControlType(): string {
public getControlType(): string {
return '${ctrl.getControlType()}'
}
......@@ -105,7 +105,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected ${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>
</#list>
......@@ -115,7 +115,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @type {Array<*>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected counterServiceArray:Array<any> = [${counterRefs}];
public counterServiceArray:Array<any> = [${counterRefs}];
</#if>
/**
......@@ -124,7 +124,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @type {${srfclassname('${ctrl.codeName}')}Service}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected 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??>
/**
......@@ -133,7 +133,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @type {${srfclassname('${appde.getCodeName()}')}Service}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected 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 ctrl.getPSControls?? && ctrl.getPSControls()??>
<#list ctrl.getPSControls() as childCtrl>
......@@ -148,7 +148,7 @@ export default class <#if ctrl.getPSAppDataEntity()??>${srfclassname('${ctrl.get
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
public ${childCtrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
<#if childCtrl.getPSControlLogics(eventName)??>
<#list childCtrl.getPSControlLogics(eventName) as ctrlLogic>
<#if ctrlLogic.getLogicType?? && ctrlLogic.getLogicType() == "APPVIEWENGINE" && ctrlLogic.getPSAppViewEngine()??>
......@@ -194,7 +194,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
* @param {any} args
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected closeView(args: any): void {
public closeView(args: any): void {
let _this: any = this;
_this.$emit('closeview', [args]);
}
......
@CONTROL/@MACRO/SERVICE/FORM.ts.ftl
浏览文件 @ d597b5ee
......@@ -300,8 +300,9 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
public loadDraft(action: string,context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
//仿真主键数据
Data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = Util.createUUID();
Data.${appde.getCodeName()?lower_case} = Data.${appde.getKeyPSAppDEField().getCodeName()?lower_case};
const PrimaryKey = Util.createUUID();
Data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = PrimaryKey;
Data.${appde.getCodeName()?lower_case} = PrimaryKey;
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......@@ -311,6 +312,7 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
result = this.appEntityService.GetDraft(Context,Data, isloading);
}
result.then((response) => {
response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = PrimaryKey;
this.handleResponse(action, response, true);
resolve(response);
}).catch(response => {
......
@CONTROL/分页导航面板/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -48,7 +48,7 @@
* @returns {any}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected isInit: any = {
public isInit: any = {
<#list ctrl.getPSControls() as tabviewpanel>
${tabviewpanel.name}: <#if tabviewpanel_index == 0> true <#else> false </#if>,
</#list>
......@@ -77,11 +77,11 @@
/**
* 行为参数
*
* @protected
* @public
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected action:any = '';
public action:any = '';
/**
* 被激活的分页面板
......@@ -89,7 +89,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected 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>';
/**
* 分页视图面板数据变更
......@@ -106,7 +106,7 @@
* @returns
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created() {
public created() {
this.afterCreated();
}
......@@ -115,7 +115,14 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
//设置分页导航srfparentdename和srfparentkey
<#if ctrl.getPSAppDataEntity()??>
<#assign appDataEntity = ctrl.getPSAppDataEntity()/>
if(this.context.${appDataEntity.getCodeName()?lower_case}){
Object.assign(this.context,{srfparentdename:'${appDataEntity.getCodeName()}',srfparentkey:this.context.${appDataEntity.getCodeName()?lower_case}})
}
</#if>
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -132,7 +139,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -141,7 +148,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -157,7 +164,7 @@
* @returns
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected tabPanelClick($event: any) {
public tabPanelClick($event: any) {
if (!$event) {
return;
}
......
@CONTROL/分页视图面板/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -40,7 +40,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected isActivied: boolean = true;
public isActivied: boolean = true;
/**
* vue 生命周期
......@@ -48,7 +48,7 @@
* @returns
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created() {
public created() {
this.afterCreated();
}
......@@ -57,7 +57,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -81,7 +81,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected viewDatasChange($event:any){
public viewDatasChange($event:any){
this.$emit('viewpanelDatasChange',$event);
}
......@@ -90,7 +90,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -99,7 +99,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......
@CONTROL/列表/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
<template>
<div :class="['app-list', this.items.length > 0 ? '' : 'app-list-empty' ]">
<div v-if="items.length > 0">
<div v-if="items.length > 0" style="height:100%;">
<#if ctrl.render??>
${ctrl.render.code}
<#else>
......@@ -51,7 +51,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: false }) protected isSelectFirstDefault!: boolean;
@Prop({ default: false }) public isSelectFirstDefault!: boolean;
/**
* 显示处理提示
......@@ -59,7 +59,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
@Prop({ default: true }) public showBusyIndicator?: boolean;
/**
* 部件行为--create
......@@ -67,7 +67,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected createAction!: string;
@Prop() public createAction!: string;
/**
* 部件行为--remove
......@@ -75,7 +75,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected removeAction!: string;
@Prop() public removeAction!: string;
/**
* 部件行为--update
......@@ -83,7 +83,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected updateAction!: string;
@Prop() public updateAction!: string;
/**
* 部件行为--fetch
......@@ -91,7 +91,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected fetchAction!: string;
@Prop() public fetchAction!: string;
/**
* 当前页
......@@ -99,7 +99,7 @@
* @type {number}
* @memberof Main
*/
protected curPage: number = 1;
public curPage: number = 1;
/**
* 数据
......@@ -107,7 +107,7 @@
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected items: any[] = [];
public items: any[] = [];
/**
* 是否支持分页
......@@ -115,7 +115,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected isEnablePagingBar: boolean = true;
public isEnablePagingBar: boolean = true;
/**
* 分页条数
......@@ -123,7 +123,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected limit: number = 20;
public limit: number = 20;
/**
* 总条数
......@@ -131,21 +131,21 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected totalRecord: number = 0;
public totalRecord: number = 0;
/**
* 选中数组
* @type {Array<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected selections: Array<any> = [];
public selections: Array<any> = [];
/**
* Vue声明周期，组件挂载完毕
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected mounted () {
public mounted () {
this.afterMounted();
}
......@@ -154,7 +154,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterMounted () {
public afterMounted () {
this.$el.addEventListener('scroll', ()=> {
if( this.$el.scrollTop + this.$el.clientHeight >= this.$el.scrollHeight) {
this.loadMore();
......@@ -167,7 +167,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created() {
public created() {
this.afterCreated()
}
......@@ -176,7 +176,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(this.name, tag)) {
......@@ -194,7 +194,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -203,7 +203,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -217,7 +217,7 @@
*
* @memberof Mob
*/
protected loadMore(){
public loadMore(){
if(this.totalRecord>this.items.length)
{
this.curPage = ++this.curPage;
......@@ -231,7 +231,7 @@
* @param {*} [opt={}]
* @memberof Main
*/
protected refresh(opt: any = {}) {
public refresh(opt: any = {}) {
this.curPage = 1;
this.items = [];
this.load(opt);
......@@ -240,11 +240,11 @@
/**
* 列表数据加载
*
* @private
* @public
* @param {*} [arg={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private load(opt: any = {}): void {
public load(opt: any = {}): void {
if(!this.fetchAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图列表fetchAction参数未配置' });
return;
......@@ -296,7 +296,7 @@
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected async remove(datas: any[]): Promise<any> {
public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表格removeAction参数未配置' });
return;
......@@ -382,7 +382,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')}
*
*/
protected handleClick(args: any) {
public handleClick(args: any) {
this.clearSelection();
args.isselected = !args.isselected;
this.selectchange();
......@@ -393,7 +393,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')}
*
*/
protected handleDblClick(args: any) {
public handleDblClick(args: any) {
this.$emit('rowdblclick', args);
}
......@@ -402,7 +402,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')}
*
*/
protected selectchange() {
public selectchange() {
this.selections = [];
this.items.map((item: any) => {
if (item.isselected) {
......@@ -417,7 +417,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected clearSelection(){
public clearSelection(){
this.items.map((item: any) => {
Object.assign(item, { isselected: false });
});
......
@CONTROL/列表/CONTROL.less.ftl
浏览文件 @ d597b5ee
......@@ -3,6 +3,7 @@
</#ibizinclude>
.app-list {
height:100%;
flex-grow: 1;
overflow-y: auto;
.app-list-item {
......@@ -16,6 +17,7 @@
}
}
.app-list-empty {
height:100%;
color: #909399;
display: flex;
justify-content: center;
......
@CONTROL/列表导航/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -62,25 +62,25 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected viewUID!:string;
@Prop() public viewUID!:string;
/**
* 是否单选
*
* @protected
* @public
* @type {(boolean)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected isSingleSelect:boolean = true;
public isSingleSelect:boolean = true;
/**
* 呈现模式，可选值：horizontal或者vertical
*
* @protected
* @public
* @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
public showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
/**
* 控件宽度
......@@ -88,7 +88,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
public ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
/**
* 控件高度
......@@ -96,16 +96,16 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
public ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
/**
* 搜素值
*
* @protected
* @public
* @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected searchText:string = "";
public searchText:string = "";
/**
* 分割宽度
......@@ -113,7 +113,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected split: number = 0.5;
public split: number = 0.5;
<#if ctrl.getXDataPSControl()??>
<#assign xDataControl = ctrl.getXDataPSControl() />
......@@ -124,7 +124,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
public navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
/**
* 导航视图参数
......@@ -132,7 +132,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
public navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
/**
* 导航过滤项
......@@ -140,7 +140,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
public navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
</#if>
/**
......@@ -149,7 +149,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop({ default: true }) protected showBusyIndicator!: boolean;
@Prop({ default: true }) public showBusyIndicator!: boolean;
<#if ctrl.getPSControls()??>
<#assign controls = ctrl.getPSControls()/>
......@@ -187,7 +187,7 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected selection: any = {};
public selection: any = {};
/**
* split值变化事件
......@@ -266,7 +266,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -275,7 +275,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -289,7 +289,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
let data:any = {};
if (args.length === 0) {
return ;
......@@ -317,7 +317,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
public ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
this.$emit('load',args);
}
......@@ -326,7 +326,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onSearch($event:any) {
public onSearch($event:any) {
<#if ctrl.getPSDEList()??>
<#assign list = ctrl.getPSDEList()/>
this.viewState.next({ tag: '${list.name}', action: "load", data: {query : this.searchText}});
......
@CONTROL/卡片视图导航/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -62,25 +62,25 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected viewUID!:string;
@Prop() public viewUID!:string;
/**
* 是否单选
*
* @protected
* @public
* @type {(boolean)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected isSingleSelect:boolean = true;
public isSingleSelect:boolean = true;
/**
* 呈现模式，可选值：horizontal或者vertical
*
* @protected
* @public
* @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
public showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
/**
* 控件宽度
......@@ -88,7 +88,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
public ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
/**
* 控件高度
......@@ -96,16 +96,16 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
public ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
/**
* 搜素值
*
* @protected
* @public
* @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected searchText:string = "";
public searchText:string = "";
/**
* 分割宽度
......@@ -113,7 +113,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected split: number = 0.5;
public split: number = 0.5;
<#if ctrl.getXDataPSControl()??>
<#assign xDataControl = ctrl.getXDataPSControl() />
......@@ -124,7 +124,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
public navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
/**
* 导航视图参数
......@@ -132,7 +132,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
public navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
/**
* 导航过滤项
......@@ -140,7 +140,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
public navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
</#if>
/**
......@@ -149,7 +149,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop({ default: true }) protected showBusyIndicator!: boolean;
@Prop({ default: true }) public showBusyIndicator!: boolean;
<#if ctrl.getPSControls()??>
<#assign controls = ctrl.getPSControls()/>
......@@ -187,7 +187,7 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected selection: any = {};
public selection: any = {};
/**
* split值变化事件
......@@ -266,7 +266,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -275,7 +275,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -293,7 +293,7 @@
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
let data:any = {};
if (args.length === 0) {
return ;
......@@ -325,7 +325,7 @@
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
public ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
this.$emit('load',args);
}
......@@ -334,7 +334,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onSearch() {
public onSearch() {
<#if ctrl.getPSDEDataView()??>
<#assign dataview = ctrl.getPSDEDataView()/>
this.viewState.next({ tag: '${dataview.name}', action: 'filter', data: { query: this.searchText} });
......
@CONTROL/向导面板/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -47,7 +47,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected initAction!: string;
@Prop() public initAction!: string;
/**
* 部件行为--finish
......@@ -55,7 +55,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected finishAction!: string;
@Prop() public finishAction!: string;
/**
* 显示处理提示
......@@ -63,7 +63,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
@Prop({ default: true }) public showBusyIndicator?: boolean;
/**
* 获取多项数据
......@@ -88,11 +88,11 @@
/**
* 视图状态订阅对象
*
* @private
* @public
* @type {Subject<{action: string, data: any}>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private wizardState: Subject<ViewState> = new Subject();
public wizardState: Subject<ViewState> = new Subject();
/**
* 当前激活表单
......@@ -118,7 +118,7 @@
/**
* 执行过的表单
*
* @private
* @public
* @type {Array<string>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
......
@CONTROL/多编辑视图面板/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -52,7 +52,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
@Prop({ default: true }) public showBusyIndicator?: boolean;
/**
* 部件行为--update
......@@ -60,7 +60,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected updateAction!: string;
@Prop() public updateAction!: string;
/**
* 部件行为--fetch
......@@ -68,7 +68,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected fetchAction!: string;
@Prop() public fetchAction!: string;
/**
* 部件行为--remove
......@@ -76,7 +76,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected removeAction!: string;
@Prop() public removeAction!: string;
/**
* 部件行为--load
......@@ -84,7 +84,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected loadAction!: string;
@Prop() public loadAction!: string;
/**
* 部件行为--loaddraft
......@@ -92,7 +92,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected loaddraftAction!: string;
@Prop() public loaddraftAction!: string;
/**
* 部件行为--create
......@@ -100,7 +100,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected createAction!: string;
@Prop() public createAction!: string;
/**
* 刷新数据
......@@ -108,7 +108,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected saveRefView?: number;
@Prop() public saveRefView?: number;
/**
* 刷新数据
......@@ -132,18 +132,18 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected toString(item:any): string{
public toString(item:any): string{
return JSON.stringify(item);
}
/**
* 面板状态订阅对象
*
* @private
* @public
* @type {Subject<{action: string, data: any}>}
* @memberof Meditviewpanel
*/
protected panelState: Subject<ViewState> = new Subject();
public panelState: Subject<ViewState> = new Subject();
/**
* 视图名称
......@@ -151,7 +151,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected viewname: string = '<#if ctrl.getEmbeddedPSAppView()??>${srffilepath2(ctrl.getEmbeddedPSAppView().getCodeName())}</#if>';
public viewname: string = '<#if ctrl.getEmbeddedPSAppView()??>${srffilepath2(ctrl.getEmbeddedPSAppView().getCodeName())}</#if>';
/**
* 获取数据对象
......@@ -159,7 +159,7 @@
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected items: any[] = [];
public items: any[] = [];
/**
* 计数器
......@@ -167,7 +167,7 @@
* @type number
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected count: number = 0;
public count: number = 0;
<#-- BEGIN：参数处理 -->
<#list ctrl.getAllRelatedPSAppViews() as dataview>
......@@ -176,20 +176,20 @@
/**
* 关系实体参数对象
*
* @private
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private deResParameters: any[] = [];
public deResParameters: any[] = [];
/**
* 当前应用视图参数对象
*
* @private
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private parameters: any[] = [];
public parameters: any[] = [];
<#else>
<#-- <#assign dataview = ctrl.getAllRelatedPSAppViews()[0]> -->
<#assign appDataEntity = dataview.getPSAppDataEntity()/>
......@@ -197,11 +197,11 @@
/**
* 关系实体参数对象
*
* @private
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private deResParameters: any[] = [
public deResParameters: any[] = [
<#-- BEGIN：存在父关系路径 -->
<#if dataview.getPSAppDERSPathCount() gt 0>
<#list dataview.getPSAppDERSPath(dataview.getPSAppDERSPathCount() - 1) as deRSPath>
......@@ -215,11 +215,11 @@
/**
* 当前应用视图参数对象
*
* @private
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private parameters: any[] = [
public parameters: any[] = [
{ pathName: '${srfpluralize(appDataEntity.codeName)?lower_case}', parameterName: '${appDataEntity.getCodeName()?lower_case}' },
];
</#if>
......@@ -231,7 +231,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created() {
public created() {
this.afterCreated();
}
......@@ -240,7 +240,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -261,7 +261,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -270,7 +270,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -284,7 +284,7 @@
*
* @memberof Meditviewpanel
*/
protected saveData(data?: any) {
public saveData(data?: any) {
this.count = 0;
if(this.items.length >0){
Object.assign(data,{showResultInfo:false});
......@@ -297,11 +297,11 @@
/**
* 处理数据
*
* @private
* @public
* @param {any[]} datas
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private doItems(datas: any[]): void {
public doItems(datas: any[]): void {
const [{ pathName, parameterName }] = this.parameters;
datas.forEach((arg: any) => {
let id: string = arg[parameterName] ? arg[parameterName] : this.$util.createUUID();
......@@ -335,11 +335,11 @@
/**
* 数据加载
*
* @private
* @public
* @param {*} data
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private load(data: any): void {
public load(data: any): void {
if(!this.fetchAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图多编辑视图面板fetchAction参数未配置' });
return;
......@@ -374,7 +374,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected handleAdd(){
public handleAdd(){
if(!this.loaddraftAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图多编辑视图面板loaddraftAction参数未配置' });
return;
......@@ -404,7 +404,7 @@
* @param {boolean} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected 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));
if (index === -1) {
return;
......@@ -423,7 +423,7 @@
* 部件抛出事件
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected viewDataChange($event:any){
public viewDataChange($event:any){
if($event){
try{
$event = JSON.parse($event);
......@@ -458,7 +458,7 @@
* @returns
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected viewload($event:any){
public viewload($event:any){
console.log('视图加载完成');
}
......@@ -468,7 +468,7 @@
* @returns
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected viewdirty(item:any,$event:any){
public viewdirty(item:any,$event:any){
// editview9 视图数据变化;
this.setViewDirty(item, $event);
}
......
@CONTROL/工具栏/CONTROL.html#ITEM_DEUIACTION.ftl
浏览文件 @ d597b5ee
......@@ -2,14 +2,19 @@
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<#if ctrl.getName() != 'toolbar'>
<#assign ModelsName>${ctrl.getCodeName()?lower_case}Models</#assign>
<#else>
<#assign ModelsName = 'toolBarModels' />
</#if>
<#assign deuiaction=item.getPSUIAction()>
<#if item.getTooltip()?? && item.getTooltip() != ''>
<tooltip :transfer="true" :max-width="600">
<#if deuiaction.getUIActionTag() == 'ExportExcel'>
<app-export-excel :item="toolBarModels.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
<app-export-excel :item="${ModelsName}.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
<#else>
<@badge item>
<i-button v-show="toolBarModels.${item.name}.visabled" :disabled="toolBarModels.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">
<i-button v-show="${ModelsName}.${item.name}.visabled" :disabled="${ModelsName}.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">
<#if item.isShowIcon()><i class='<#if item.getPSSysImage()??><#assign img=item.getPSSysImage()><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>${img.getCssClass()}</#if></#if>'></i></#if>
<#if item.isShowCaption()><span class='caption'>{{<#if langbase??>$t('${langbase}.${item.name}.caption')<#else>'${item.getCaption()}'</#if>}}</span></#if>
</i-button>
......@@ -19,10 +24,10 @@
</tooltip>
<#else>
<#if deuiaction.getUIActionTag() == 'ExportExcel'>
<app-export-excel :item="toolBarModels.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
<app-export-excel :item="${ModelsName}.${item.name}" :caption="$t('${langbase}.${item.name}.caption')" @exportexcel="${ctrl.name}_click({ tag: '${item.name}' }, $event)"></app-export-excel>
<#else>
<@badge item>
<i-button v-show="toolBarModels.${item.name}.visabled" :disabled="toolBarModels.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">
<i-button v-show="${ModelsName}.${item.name}.visabled" :disabled="${ModelsName}.${item.name}.disabled" class='<#if item.getPSSysCss()??> ${item.getPSSysCss().getCssName()}</#if>' @click="${ctrl.name}_click({ tag: '${item.name}' }, $event)">
<#if item.isShowIcon()><i class='<#if item.getPSSysImage()??><#assign img=item.getPSSysImage()><#if img.getCssClass()?? && (img.getCssClass()?length gt 0)>${img.getCssClass()}</#if></#if>'></i></#if>
<#if item.isShowCaption()><span class='caption'>{{<#if langbase??>$t('${langbase}.${item.name}.caption')<#else>'${item.getCaption()}'</#if>}}</span></#if>
</i-button>
......
@CONTROL/工具栏/CONTROL.html#ITEM_ITEMS.ftl
浏览文件 @ d597b5ee
......@@ -2,7 +2,12 @@
<#ibizinclude>
../@MACRO/CONTROL/LANGBASE.vue.ftl
</#ibizinclude>
<dropdown v-show="toolBarModels.${item.name}.visabled" trigger='click'>
<#if ctrl.getName() != 'toolbar'>
<#assign ModelsName>${ctrl.getCodeName()?lower_case}Models</#assign>
<#else>
<#assign ModelsName = 'toolBarModels' />
</#if>
<dropdown v-show="${ModelsName}.${item.name}.visabled" trigger='click'>
<#if item.getTooltip()?? && item.getTooltip() != ''>
<tooltip :transfer="true" :max-width="600">
<@badge item>
......
@CONTROL/工具栏/CONTROL.html.ftl
浏览文件 @ d597b5ee
<#if ctrl.getName() != 'toolbar'>
<#assign ModelsName>${ctrl.getCodeName()?lower_case}Models</#assign>
<#else>
<#assign ModelsName = 'toolBarModels' />
</#if>
<div class='toolbar-container'>
<#if (view.getPSWorkflow?? && view.getPSWorkflow()??) && (view.isWFIAMode?? && view.isWFIAMode()) && (view.getWFStepValue?? && view.getWFStepValue() == "") && (view.getViewType?? && (view.getViewType() == 'DEWFEDITVIEW3' || view.getViewType() == 'DEWFEDITVIEW'))><#t>
<template v-for="item in containerModel.wflinks">
......
@CONTROL/工具栏/CONTROL.vue.ftl
浏览文件 @ d597b5ee
<#-- 工具栏模型 -->
<#if ctrl.getName() != 'toolbar'>
<#assign ModelsName>${ctrl.getCodeName()?lower_case}Models</#assign>
<#else>
<#assign ModelsName = 'toolBarModels' />
</#if>
/**
* 工具栏模型
*
* @type {*}
* @memberof ${srfclassname('${view.name}')}
*/
public toolBarModels: any = {
public ${ModelsName}: any = {
<#if ctrl.getPSDEToolbarItems()??>
<#list ctrl.getPSDEToolbarItems() as item>
${P.getPartCode(item).code}
......
@CONTROL/应用菜单/MODEL.ts.ftl
浏览文件 @ d597b5ee
......@@ -5,11 +5,11 @@
/**
* 菜单项集合
*
* @private
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}Model
*/
private items: any[] = [
public items: any[] = [
<#list ctrl.getPSAppMenuItems() as child>
${P.getPartCode(child,"ITEM").code},
</#list>
......@@ -18,11 +18,11 @@
/**
* 应用功能集合
*
* @private
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}Model
*/
private funcs: any[] = [
public funcs: any[] = [
<#if view.isDefaultPage?? && view.isDefaultPage()>
<#list ctrl.getPSAppFuncs() as appFuncs>
{
......
@CONTROL/搜索表单/CONTROL-BASE.vue#FORM.ftl
浏览文件 @ d597b5ee
......@@ -4,7 +4,7 @@
<i-form :model="this.data" class='app-search-form<#if ctrl.getPSSysCss()??> ${ctrl.getPSSysCss().getCssName()}</#if><#if ctrl.isInfoFormMode?? && ctrl.isInfoFormMode()> info-form-mode</#if>' ref='${ctrl.name}' style="<#if ctrl.getFormWidth() gt 1>width: ${ctrl.getFormWidth()?c}px;</#if>">
<input style="display:none;"/>
<row>
<i-col span="20">
<i-col span="20" class="form-content">
<row>
<#if ctrl.isNoTabHeader()>
<#list ctrl.getPSDEFormPages() as formmenber>
......@@ -49,11 +49,13 @@
</#if>
</row>
</i-col>
<i-col span="4">
<#if ctrl.getFormStyle() != "SEARCHBAR">
<i-col span="4" class="search-button">
<row v-show="Object.keys(data).length>0">
<i-button class='search_reset' size="default" type="primary" @click="onSearch">{{$t('app.searchButton.search')}}</i-button>
<i-button class='search_reset' size="default" @click="onReset">{{this.$t('app.searchButton.reset')}}</i-button>
</row>
</i-col>
</#if>
</row>
</i-form>
\ No newline at end of file
@CONTROL/搜索表单/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -38,7 +38,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
@Prop({ default: true }) public showBusyIndicator?: boolean;
/**
* 部件行为--loaddraft
......@@ -46,7 +46,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected loaddraftAction!: string;
@Prop() public loaddraftAction!: string;
/**
* 部件行为--load
......@@ -54,7 +54,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected loadAction!: string;
@Prop() public loadAction!: string;
/**
* 视图标识
......@@ -62,7 +62,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected viewtag!: string;
@Prop() public viewtag!: string;
/**
* 表单状态
......@@ -70,7 +70,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {Subject<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected formState: Subject<any> = new Subject();
public formState: Subject<any> = new Subject();
/**
* 忽略表单项值变化
......@@ -78,34 +78,34 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ignorefieldvaluechange: boolean = false;
public ignorefieldvaluechange: boolean = false;
/**
* 数据变化
*
* @private
* @public
* @type {Subject<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private dataChang: Subject<any> = new Subject();
public dataChang: Subject<any> = new Subject();
/**
* 视图状态事件
*
* @private
* @public
* @type {(Subscription | undefined)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private dataChangEvent: Subscription | undefined;
public dataChangEvent: Subscription | undefined;
/**
* 原始数据
*
* @private
* @public
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private oldData: any = {};
public oldData: any = {};
/**
* 表单数据对象
......@@ -113,7 +113,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected data: any = {
public data: any = {
<#list ctrl.getPSDEFormItems() as item>
${item.getName()}: null,
</#list>
......@@ -125,7 +125,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected rules: any = {
public rules: any = {
<#list ctrl.getAllPSDEFormDetails() as formdetail>
<#if formdetail.getDetailType?? && formdetail.getDetailType() == 'FORMITEM'>
${formdetail.getName()}: [
......@@ -144,7 +144,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected detailsModel: any = {
public detailsModel: any = {
<#list ctrl.getAllPSDEFormDetails() as formdetail>
${formdetail.name}: ${P.getPartCode(formdetail, 'DETAIL_MODEL').code},
</#list>
......@@ -171,11 +171,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 重置表单项值
*
* @private
* @public
* @param {{ name: string, newVal: any, oldVal: any }} { name, newVal, oldVal }
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private resetFormData({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
public resetFormData({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
<#list ctrl.getPSDEFormItems() as item>
<#if item.getResetItemName?? && item.getResetItemName()??>
if (Object.is(name, '${item.getResetItemName()}')) {
......@@ -191,11 +191,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 表单逻辑
*
* @private
* @public
* @param {{ name: string, newVal: any, oldVal: any }} { name, newVal, oldVal }
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
public formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
<#if P.getPartCode(item,'FORM_LOGIC').code?length gt 0>
${P.getPartCode(item,'FORM_LOGIC').code}
</#if>
......@@ -216,28 +216,32 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 表单值变化
*
* @private
* @public
* @param {{ name: string, newVal: any, oldVal: any }} { name, newVal, oldVal }
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private formDataChange({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
public formDataChange({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
if (this.ignorefieldvaluechange) {
return;
}
this.resetFormData({ name: name, newVal: newVal, oldVal: oldVal });
this.formLogic({ name: name, newVal: newVal, oldVal: oldVal });
this.dataChang.next(JSON.stringify(this.data));
<#-- 搜索栏值变更抛值 -->
<#if ctrl.getFormStyle() == "SEARCHBAR">
this.$emit('valuechange',this.data);
</#if>
}
/**
* 表单加载完成
*
* @private
* @public
* @param {*} [data={}]
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private onFormLoad(data: any = {}): void {
public onFormLoad(data: any = {}): void {
this.setFormEnableCond(data);
this.fillForm(data);
<#if ctrl.getControlType() == 'FORM'>
......@@ -254,7 +258,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {*} [_datas={}]
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected fillForm(_datas: any = {}): void {
public fillForm(_datas: any = {}): void {
this.ignorefieldvaluechange = true;
Object.keys(_datas).forEach((name: string) => {
if (this.data.hasOwnProperty(name)) {
......@@ -269,11 +273,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 设置表单项是否启用
*
* @protected
* @public
* @param {*} data
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected setFormEnableCond(data: any): void {
public setFormEnableCond(data: any): void {
Object.values(this.detailsModel).forEach((detail: any) => {
if (!Object.is(detail.detailType, 'FORMITEM')) {
return;
......@@ -286,10 +290,10 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 重置草稿表单状态
*
* @private
* @public
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private resetDraftFormStates(): void {
public resetDraftFormStates(): void {
const form: any = this.$refs.form;
if (form) {
form.resetFields();
......@@ -301,7 +305,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected resetValidates(): void {
public resetValidates(): void {
Object.values(this.detailsModel).forEach((detail: any) => {
if (!Object.is(detail.detailType, 'FORMITEM')) {
return;
......@@ -317,7 +321,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {any[]} fieldErrors
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected fillValidates(fieldErrors: any[]): void {
public fillValidates(fieldErrors: any[]): void {
fieldErrors.forEach((error: any) => {
const formItem: FormItemModel = this.detailsModel[error.field];
if (!formItem) {
......@@ -335,7 +339,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected formValidateStatus(): boolean {
public formValidateStatus(): boolean {
const form: any = this.$refs.${ctrl.name};
let validatestate: boolean = true;
form.validate((valid: boolean) => {
......@@ -350,7 +354,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected getValues(): any {
public getValues(): any {
return this.data;
}
......@@ -361,7 +365,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onFormItemValueChange($event: { name: string, value: any }): void {
public onFormItemValueChange($event: { name: string, value: any }): void {
if (!$event) {
return;
}
......@@ -379,7 +383,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected setDataItemValue(name: string, value: any): void {
public setDataItemValue(name: string, value: any): void {
if (!name || Object.is(name, '') || !this.data.hasOwnProperty(name)) {
return;
}
......@@ -399,7 +403,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${formdetail.getName()}_click($event: any): void {
public ${formdetail.getName()}_click($event: any): void {
<#if formdetail.getPSUIAction?? && formdetail.getPSUIAction()??>
<#assign uiaction = formdetail.getPSUIAction()>
this.${ctrl.name}_${formdetail.getName()}_click(null, null, $event);
......@@ -414,7 +418,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${formdetail.getName()}_click($event: any): void {
public ${formdetail.getName()}_click($event: any): void {
<#assign itemUpdate=formdetail.getPSDEFormItemUpdate()/>
<#if formdetail.getParamPickupPSAppView()??>
<#assign dataview = formdetail.getParamPickupPSAppView()>
......@@ -498,7 +502,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected groupUIActionClick($event: any): void {
public groupUIActionClick($event: any): void {
if (!$event) {
return;
}
......@@ -521,7 +525,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected created(): void {
public created(): void {
this.afterCreated();
}
......@@ -530,7 +534,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -554,7 +558,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -563,7 +567,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -582,7 +586,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected autoLoad(arg: any = {}): void {
public autoLoad(arg: any = {}): void {
if (arg.srfkey && !Object.is(arg.srfkey, '')) {
Object.assign(arg, { srfkey: arg.srfkey });
this.load(arg);
......@@ -599,11 +603,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 加载
*
* @private
* @public
* @param {*} [opt={}]
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private load(opt: any = {}): void {
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图搜索表单loadAction参数未配置' });
return;
......@@ -640,7 +644,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {*} [opt={}]
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected loadDraft(opt: any = {},mode?:string): void {
public loadDraft(opt: any = {},mode?:string): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图搜索表单loaddraftAction参数未配置' });
return;
......@@ -702,7 +706,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected updateFormItems(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
public updateFormItems(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
}
......@@ -712,12 +716,12 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onEnter($event: any): void {
public onEnter($event: any): void {
<#if ctrl.getControlType() == 'SEARCHFORM' && !ctrl.isEnableAutoSearch()>
if (!this.formValidateStatus()) {
return;
}
this.$emit('load', this.data);
this.$emit('search', this.data);
</#if>
}
<#-- 搜索表单：Begin -->
......@@ -729,11 +733,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onSearch() {
public onSearch() {
if (!this.formValidateStatus()) {
return;
}
this.$emit('load', this.data);
this.$emit('search', this.data);
}
/**
......@@ -741,7 +745,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onReset() {
public onReset() {
this.loadDraft({},'RESET');
}
</#if>
......@@ -752,11 +756,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onSearch() {
public onSearch() {
if (!this.formValidateStatus()) {
return;
}
this.$emit('load', this.data);
this.$emit('search', this.data);
}
</#if>
</#if>
......
@CONTROL/搜索表单/CONTROL.html.ftl
浏览文件 @ d597b5ee
......@@ -2,10 +2,11 @@
<#assign content>
:showBusyIndicator="${ctrl.isShowBusyIndicator()?c}"
<#if view.isExpandSearchForm??>
v-show="isExpandSearchForm"
v-show="<#if ctrl.getFormStyle() == "SEARCHBAR">true<#else>isExpandSearchForm</#if>"
</#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>"
<#if ctrl.getFormStyle() == "SEARCHBAR">@valuechange="qucikFormValueChange"</#if>
</#assign>
<#ibizinclude>
../@MACRO/HTML/DEFAULT.html.ftl
......
@CONTROL/搜索表单/CONTROL.less.ftl
浏览文件 @ d597b5ee
......@@ -13,6 +13,9 @@
margin-right: 12px;
margin-bottom: 8px;
}
.search-button{
text-align: right;
}
}
.app-search-form-flex {
height: 100%;
......
@CONTROL/数据关系分页部件/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -34,7 +34,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop({default:true}) protected isShowSlot?: boolean;
@Prop({default:true}) public isShowSlot?: boolean;
/**
* 应用实体参数名称
......@@ -42,7 +42,7 @@
* @type string
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected parentName!: string;
@Prop() public parentName!: string;
/**
* 获取多项数据
......@@ -70,16 +70,16 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected selection: any = {};
public selection: any = {};
/**
* 父数据
*
* @private
* @public
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private parentData: any = {};
public parentData: any = {};
/**
* 关系栏数据项
......@@ -87,7 +87,7 @@
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected items: any[] = [
public items: any[] = [
<#list ctrl.getRootItem().getAllItems() as dritem>
{
index: ${dritem_index?c},
......@@ -104,7 +104,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected created(): void {
public created(): void {
this.afterCreated();
}
......@@ -113,7 +113,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -135,7 +135,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -144,7 +144,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -156,12 +156,12 @@
/**
* 获取关系项
*
* @private
* @public
* @param {*} [arg={}]
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private getDRTabItem(arg: any = {}): any {
public getDRTabItem(arg: any = {}): any {
let expmode = arg.nodetype.toUpperCase();
if (!expmode) {
expmode = '';
......@@ -186,7 +186,7 @@
* @param {boolean} state
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected setItemDisabled(state: boolean): void {
public setItemDisabled(state: boolean): void {
this.items.forEach((item: any) => {
if (Object.is(item.name, 'form')) {
item.disabled = false;
......@@ -199,12 +199,12 @@
/**
* 获取数据项
*
* @private
* @public
* @param {string} id
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
private getItem(id: string): any {
public getItem(id: string): any {
const arr: any[] = this.items.filter((_item: any) => Object.is(_item.id, id));
if (arr) {
return arr[0];
......@@ -218,7 +218,7 @@
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected tabPanelClick($event: any): void {
public tabPanelClick($event: any): void {
const item = this.getItem($event);
if (Object.is(item.id, this.selection.id)) {
return;
......
@CONTROL/数据关系栏/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -104,11 +104,11 @@
/**
* 父数据
*
* @private
* @public
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private parentData: any = {};
public parentData: any = {};
/**
* 宽度
......@@ -158,12 +158,12 @@
/**
* 获取关系项
*
* @private
* @public
* @param {*} [arg={}]
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private getDRBarItem(arg: any = {}): any {
public getDRBarItem(arg: any = {}): any {
let expmode = arg.nodetype;
if (!expmode) {
expmode = '';
......@@ -185,11 +185,11 @@
/**
* 处理数据
*
* @private
* @public
* @param {any[]} items
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private dataProcess(items: any[]): void {
public dataProcess(items: any[]): void {
items.forEach((_item: any) => {
if (_item.expanded) {
this.defaultOpeneds.push(_item.id);
......
@CONTROL/数据图表 (新)/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -45,7 +45,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator!: boolean;
@Prop({ default: true }) public showBusyIndicator!: boolean;
/**
* 部件行为--fetch
......@@ -53,7 +53,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected fetchAction!: string;
@Prop() public fetchAction!: string;
/**
* Vue声明周期(组件初始化完毕)
......@@ -87,7 +87,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -96,7 +96,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -248,7 +248,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
* @param {*} [opt={}]
* @memberof ${srfclassname('${ctrl.name}')}Base
*/
protected refresh(opt: any = {}) {
public refresh(opt: any = {}) {
this.load(opt);
}
......@@ -594,7 +594,7 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
let curCodeList:Map<number,any> = allCodeList.get(groupField[0].codelist.tag);
curCodeList.forEach((codelist:any) =>{
arr.forEach((item:any) =>{
if(Object.is(item.planetype,codelist)){
if(Object.is(item[groupField[0].name],codelist)){
returnArray.push(item);
item.hasused = true;
}
......@@ -640,8 +640,8 @@ import { ChartDataSetField,ChartLineSeries,ChartFunnelSeries,ChartPieSeries,Char
public handleSortGroupData(arr:Array<any>,groupField:any,label:string){
arr.forEach((item:any) =>{
let sortFieldValue:Array<any> = item[groupField[0].name].split("-");
Object.assign(item,{sortField:Number(sortFieldValue[0]+sortFieldValue[1])});
item[groupField[0].name] = sortFieldValue[0]+"年第"+sortFieldValue[1]+label;
Object.assign(item,{sortField:Number(sortFieldValue[0])*10000+Number(sortFieldValue[1])});
item[groupField[0].name] = sortFieldValue[0]+"年"+sortFieldValue[1]+label;
})
arr.sort((a:any, b:any) => {
return Number(a.sortField) - Number(b.sortField);
......
@CONTROL/数据图表/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -42,7 +42,7 @@ import echarts from 'echarts';
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator!: boolean;
@Prop({ default: true }) public showBusyIndicator!: boolean;
/**
* 部件行为--fetch
......@@ -50,7 +50,7 @@ import echarts from 'echarts';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected fetchAction!: string;
@Prop() public fetchAction!: string;
/**
* Vue声明周期(组件初始化完毕)
......@@ -84,7 +84,7 @@ import echarts from 'echarts';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -93,7 +93,7 @@ import echarts from 'echarts';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -241,7 +241,7 @@ import echarts from 'echarts';
* @param {*} [opt={}]
* @memberof ${srfclassname('${ctrl.name}')}
*/
protected refresh(opt: any = {}) {
public refresh(opt: any = {}) {
this.load(opt);
}
......
@CONTROL/数据看板/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -18,7 +18,7 @@
</#if>
<#if layout == 'TABLE_24COL' && LayoutPos??><#t>
<i-col<#if LayoutPos.getColXS() != -1> :xs="{ span: ${LayoutPos.getColXS()}, offset: <#if LayoutPos.getColXSOffset() != -1>${LayoutPos.getColXSOffset()}<#else>0</#if>}"</#if><#if LayoutPos.getColSM() != -1> :sm="{ span: ${LayoutPos.getColSM()}, offset: <#if LayoutPos.getColSMOffset() != -1>${LayoutPos.getColSMOffset()}<#else>0</#if>}"</#if><#if LayoutPos.getColMD() != -1> :md="{ span: ${LayoutPos.getColMD()}, offset: <#if LayoutPos.getColMDOffset() != -1>${LayoutPos.getColMDOffset()}<#else>0</#if> }"</#if><#if LayoutPos.getColLG() != -1> :lg="{ span: ${LayoutPos.getColLG()}, offset: <#if LayoutPos.getColLGOffset() != -1>${LayoutPos.getColLGOffset()}<#else>0</#if> }"</#if>>
<card :bordered="false" dis-hover :padding="0">
<card class="portlet-card" :bordered="false" dis-hover :padding="0">
<#if portlet.isShowTitleBar() && portlet.getTitle()?has_content>
<p slot='title'>
${portlet.getTitle()}
......@@ -34,7 +34,7 @@ ${P.getCtrlCode(portlet, 'CONTROL.html').code}
</card>
</i-col>
<#else>
<card :bordered="false" dis-hover :padding="0">
<card class="portlet-card" :bordered="false" dis-hover :padding="0">
<#if portlet.isShowTitleBar() && portlet.getTitle()?has_content><#t>
<p slot='title'>
${portlet.getTitle()}
......@@ -49,7 +49,7 @@ ${P.getCtrlCode(portlet, 'CONTROL.html').code}
</card>
</#if>
<#if layout == 'FLEX'>
<card :bordered="false" dis-hover :padding="0">
<card class="portlet-card" :bordered="false" dis-hover :padding="0">
<#if portlet.isShowTitleBar() && portlet.getTitle()?has_content><#t>
<p slot='title'>
${portlet.getTitle()}
......
@CONTROL/数据视图/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -86,7 +86,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: false }) protected isSelectFirstDefault!: boolean;
@Prop({ default: false }) public isSelectFirstDefault!: boolean;
/**
* 显示处理提示
......@@ -94,7 +94,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
@Prop({ default: true }) public showBusyIndicator?: boolean;
/**
* 部件行为--create
......@@ -102,7 +102,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected createAction!: string;
@Prop() public createAction!: string;
/**
* 部件行为--remove
......@@ -110,7 +110,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected removeAction!: string;
@Prop() public removeAction!: string;
/**
* 部件行为--update
......@@ -118,7 +118,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected updateAction!: string;
@Prop() public updateAction!: string;
/**
* 部件行为--fetch
......@@ -126,7 +126,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected fetchAction!: string;
@Prop() public fetchAction!: string;
/**
* 是否单选
......@@ -134,7 +134,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected isSingleSelect?: boolean;
@Prop() public isSingleSelect?: boolean;
/**
* 数据
......@@ -142,7 +142,7 @@
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected items: any[] = [];
public items: any[] = [];
/**
* 是否支持分页
......@@ -150,7 +150,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected isEnablePagingBar: boolean = ${ctrl.isEnablePagingBar()?c};;
public isEnablePagingBar: boolean = ${ctrl.isEnablePagingBar()?c};;
/**
* 总条数
......@@ -158,14 +158,14 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected totalRecord: number = 0;
public totalRecord: number = 0;
/**
* 选中数组
* @type {Array<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected selections: Array<any> = [];
public selections: Array<any> = [];
/**
* 当前页
......@@ -173,7 +173,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected curPage: number = 1;
public curPage: number = 1;
/**
* 分页条数
......@@ -181,7 +181,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected limit: number = ${ctrl.getPagingSize()?c};
public limit: number = ${ctrl.getPagingSize()?c};
/**
* 排序方向
......@@ -189,7 +189,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected sortDir:string = '';
public sortDir:string = '';
/**
* 排序字段
......@@ -197,7 +197,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected sortField: string = '';
public sortField: string = '';
/**
* 排序点击事件
......@@ -205,7 +205,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected sortClick(field:string) {
public sortClick(field:string) {
if(this.sortField !== field){
this.sortField = field;
this.sortDir = 'asc';
......@@ -225,7 +225,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getsortClass(field:string) {
public getsortClass(field:string) {
if(this.sortField !== field || this.sortDir === ''){
return '';
}else if(this.sortDir === 'asc'){
......@@ -240,7 +240,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected mounted () {
public mounted () {
this.afterMounted();
}
......@@ -249,7 +249,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterMounted(){
public afterMounted(){
<#if !ctrl.isEnablePagingBar()>
this.$el.addEventListener('scroll', ()=> {
if( this.$el.scrollTop + this.$el.clientHeight >= this.$el.scrollHeight) {
......@@ -264,7 +264,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created() {
public created() {
this.afterCreated();
}
......@@ -273,7 +273,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(this.name, tag)) {
......@@ -294,7 +294,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected loadMore(){
public loadMore(){
if(this.totalRecord>this.items.length)
{
this.curPage = ++this.curPage;
......@@ -308,7 +308,7 @@
* @param {*} [opt={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected refresh(opt: any = {}) {
public refresh(opt: any = {}) {
this.curPage = 1;
this.load(opt, true);
}
......@@ -318,7 +318,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -327,7 +327,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -339,12 +339,12 @@
/**
* 表格数据加载
*
* @private
* @public
* @param {*} [arg={}]
* @param {boolean} [isReset=false] 是否重置items
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private load(opt: any = {}, isReset: boolean = false): void {
public load(opt: any = {}, isReset: boolean = false): void {
if(!this.fetchAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图列表fetchAction参数未配置' });
return;
......@@ -405,7 +405,7 @@
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected async remove(datas: any[]): Promise<any> {
public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表格removeAction参数未配置' });
return;
......@@ -504,7 +504,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')}
*
*/
protected handleClick(args: any) {
public handleClick(args: any) {
args.isselected = !args.isselected;
if(this.isSingleSelect) {
this.items.forEach((item:any) =>{
......@@ -521,7 +521,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')}
*
*/
protected handleDblClick(args: any) {
public handleDblClick(args: any) {
this.$emit('rowdblclick', args);
}
......@@ -530,7 +530,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')}
*
*/
protected selectchange() {
public selectchange() {
this.selections = [];
this.items.map((item: any) => {
if (item.isselected) {
......
@CONTROL/日历导航/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -62,25 +62,25 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected viewUID!:string;
@Prop() public viewUID!:string;
/**
* 是否单选
*
* @protected
* @public
* @type {(boolean)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected isSingleSelect:boolean = true;
public isSingleSelect:boolean = true;
/**
* 呈现模式，可选值：horizontal或者vertical
*
* @protected
* @public
* @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
public showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
/**
* 控件宽度
......@@ -88,7 +88,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
public ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
/**
* 控件高度
......@@ -96,16 +96,16 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
public ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
/**
* 搜素值
*
* @protected
* @public
* @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected searchText:string = "";
public searchText:string = "";
/**
* 分割宽度
......@@ -113,7 +113,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected split: number = 0.5;
public split: number = 0.5;
<#if ctrl.getXDataPSControl()??>
<#assign xDataControl = ctrl.getXDataPSControl() />
......@@ -124,7 +124,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navViewName: any = {
public navViewName: any = {
<#if xDataControl.getPSSysCalendarItems()??>
<#list xDataControl.getPSSysCalendarItems() as calendarItem>
${calendarItem.getItemType()}: "<#if calendarItem.getNavPSAppView?? && calendarItem.getNavPSAppView()??><#assign navPSAppView = calendarItem.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>",
......@@ -138,7 +138,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navViewParam: any = {
public navViewParam: any = {
<#if xDataControl.getPSSysCalendarItems()??>
<#list xDataControl.getPSSysCalendarItems() as calendarItem>
${calendarItem.getItemType()}: '<#if calendarItem.getNavViewParamJO?? && calendarItem.getNavViewParamJO()??>${calendarItem.getNavViewParamJO()}</#if>',
......@@ -153,7 +153,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
</#if>
protected navFilter: any = {
public navFilter: any = {
<#if xDataControl.getPSSysCalendarItems()??>
<#list xDataControl.getPSSysCalendarItems() as calendarItem>
${calendarItem.getItemType()}: "<#if calendarItem.getNavFilter?? && calendarItem.getNavFilter()??>${calendarItem.getNavFilter()}</#if>",
......@@ -167,7 +167,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop({ default: true }) protected showBusyIndicator!: boolean;
@Prop({ default: true }) public showBusyIndicator!: boolean;
<#if ctrl.getPSControls()??>
<#assign controls = ctrl.getPSControls()/>
......@@ -205,7 +205,7 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected selection: any = {};
public selection: any = {};
/**
* split值变化事件
......@@ -295,7 +295,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -304,7 +304,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -318,7 +318,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
let data:any = {};
if (args.length === 0) {
return ;
......@@ -351,7 +351,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
public ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
this.$emit('load',args);
}
......@@ -360,7 +360,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onSearch($event:any) {
public onSearch($event:any) {
<#if ctrl.getXDataPSControl()??>
<#assign xDataControl = ctrl.getXDataPSControl()/>
let calendar:any = this.$refs.${xDataControl.getName()};
......
@CONTROL/日历部件/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -64,7 +64,7 @@ FullCalendar,
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: false }) protected isSelectFirstDefault!: boolean;
@Prop({ default: false }) public isSelectFirstDefault!: boolean;
/**
* 显示处理提示
......@@ -72,7 +72,7 @@ FullCalendar,
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
@Prop({ default: true }) public showBusyIndicator?: boolean;
/**
* 部件行为--load
......@@ -80,34 +80,34 @@ FullCalendar,
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected loadAction!: string;
@Prop() public loadAction!: string;
/**
* 日历部件样式名
*
* @protected
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected calendarClass: string = "calendar";
public calendarClass: string = "calendar";
/**
* 选中事件element元素
*
* @protected
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected selectedEventElement:any;
public selectedEventElement:any;
/**
* 引用插件集合
*
* @protected
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected calendarPlugins: any[] = [
public calendarPlugins: any[] = [
dayGridPlugin,
timeGridPlugin,
listPlugin,
......@@ -117,11 +117,11 @@ FullCalendar,
/**
* 设置头部显示
*
* @protected
* @public
* @type {}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected header: any = {
public header: any = {
left: 'prev,next today gotoDate',
center: 'title',
right: 'dayGridMonth,timeGridWeek,timeGridDay,listWeek'
......@@ -130,11 +130,11 @@ FullCalendar,
/**
* 按钮文本集合
*
* @protected
* @public
* @type {}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected buttonText: any = {
public buttonText: any = {
today: '今天',
month: '月',
week: '周',
......@@ -145,11 +145,11 @@ FullCalendar,
/**
* 自定义按钮集合
*
* @protected
* @public
* @type {}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected customButtons: any = {
public customButtons: any = {
gotoDate: {
text: "跳转",
click: this.openDateSelect
......@@ -159,38 +159,38 @@ FullCalendar,
/**
* 模态显示控制变量
*
* @protected
* @public
* @type boolean
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected modalVisible: boolean = false;
public modalVisible: boolean = false;
/**
* 跳转日期
*
* @protected
* @public
* @type Date
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected selectedGotoDate: Date = new Date();
public selectedGotoDate: Date = new Date();
/**
* 打开时间选择模态
*
* @protected
* @public
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected openDateSelect(){
public openDateSelect(){
this.modalVisible = true;
}
/**
* 跳转到指定时间
*
* @protected
* @public
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected gotoDate(){
public gotoDate(){
let appCalendar: any = this.$refs.calendar;
let api = appCalendar.getApi();
api.gotoDate(this.selectedGotoDate);
......@@ -199,11 +199,11 @@ FullCalendar,
/**
* 有效日期范围
*
* @protected
* @public
* @type {}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected validRange: any = {
public validRange: any = {
start:"0000-01-01",
end:"9999-12-31"
};
......@@ -211,19 +211,19 @@ FullCalendar,
/**
* 默认加载日期
*
* @protected
* @public
* @type {}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected defaultDate: any = this.$util.dateFormat(new Date());
public defaultDate: any = this.$util.dateFormat(new Date());
/**
* 设置按钮文本
*
* @protected
* @public
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected setButtonText(){
public setButtonText(){
this.buttonText.today = this.$t('app.calendar.today'),
this.buttonText.month = this.$t('app.calendar.month'),
this.buttonText.week = this.$t('app.calendar.week'),
......@@ -235,31 +235,31 @@ FullCalendar,
/**
* 监听语言变化
*
* @protected
* @public
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Watch('$i18n.locale')
protected onLocaleChange(newval: any, val: any) {
public onLocaleChange(newval: any, val: any) {
this.setButtonText();
}
/**
* 日程事件集合
*
* @protected
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected events: any[] = [];
public events: any[] = [];
/**
* 日历样式类型
*
* @protected
* @public
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected calendarType: string = "${ctrl.getCalendarStyle()}";
public calendarType: string = "${ctrl.getCalendarStyle()}";
/**
* 搜索获取日程事件
......@@ -267,7 +267,7 @@ FullCalendar,
* @param {*} $event 日期信息
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected searchEvents(fetchInfo?:any, successCallback?:any, failureCallback?:any ) {
public searchEvents(fetchInfo?:any, successCallback?:any, failureCallback?:any ) {
let start = (fetchInfo && fetchInfo.start) ? this.$util.dateFormat(fetchInfo.start) : null;
let end = (fetchInfo && fetchInfo.end) ? this.$util.dateFormat(fetchInfo.end) : null;
let arg = { start: start, end: end };
......@@ -315,7 +315,7 @@ FullCalendar,
* @param {*} $event 日期信息
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onDateClick($event: any) {
public onDateClick($event: any) {
let date = $event.date;
let datestr = $event.dateStr;
}
......@@ -326,7 +326,7 @@ FullCalendar,
* @param {*} $event 事件信息
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getEditView(deName: string) {
public getEditView(deName: string) {
let view: any = {};
switch(deName){
<#if view.getAllRelatedPSAppViews?? && view.getAllRelatedPSAppViews()??>
......@@ -377,7 +377,7 @@ FullCalendar,
* @param {*} $event timeline事件对象
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onEventClick($event: any, isOriginData:boolean = false, $event2?: any) {
public onEventClick($event: any, isOriginData:boolean = false, $event2?: any) {
// 处理event数据
let event: any = {};
if(isOriginData){
......@@ -453,7 +453,7 @@ FullCalendar,
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected refresh() {
public refresh() {
if(Object.is(this.calendarType,"TIMELINE")){
this.searchEvents();
} else {
......@@ -468,7 +468,7 @@ FullCalendar,
* @param {*} $event 事件信息
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onEventDrop($event: any) {
public onEventDrop($event: any) {
if(this.isSelectFirstDefault){
return;
}
......@@ -541,7 +541,7 @@ FullCalendar,
* @returns
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created() {
public created() {
<#if ctrl.getCalendarStyle?? && ctrl.getCalendarStyle() == 'TIMELINE'>
this.searchEvents();
<#else>
......@@ -555,7 +555,7 @@ FullCalendar,
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -570,7 +570,7 @@ FullCalendar,
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -579,7 +579,7 @@ FullCalendar,
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......
@CONTROL/日历部件/SERVICE.ts.ftl
浏览文件 @ d597b5ee
......@@ -38,11 +38,11 @@ import ${srfclassname('${_appde.getCodeName()}')}Service from '@/service/${srffi
/**
* 事件配置集合
*
* @protected
* @public
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected eventsConfig: any[] = [
public eventsConfig: any[] = [
<#if ctrl.getPSSysCalendarItems()??>
<#list ctrl.getPSSysCalendarItems() as calendarItem>
{
......
@CONTROL/树视图/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -77,7 +77,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected isSingleSelect!: boolean;
@Prop({ default: true }) public isSingleSelect!: boolean;
/**
* 是否默认选中第一条数据
......@@ -85,7 +85,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: false }) protected isSelectFirstDefault!: boolean;
@Prop({ default: false }) public isSelectFirstDefault!: boolean;
/**
* 枝干节点是否可用（具有数据能力，可抛出）
......@@ -93,7 +93,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({default:true}) protected isBranchAvailable!: boolean;
@Prop({default:true}) public isBranchAvailable!: boolean;
/**
* 显示处理提示
......@@ -101,7 +101,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
@Prop({ default: true }) public showBusyIndicator?: boolean;
/**
* 初始化完成
......@@ -109,7 +109,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected inited: boolean = false;
public inited: boolean = false;
/**
* 已选中数据集合
......@@ -117,7 +117,7 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected selectedNodes: any = [];
public selectedNodes: any = [];
/**
* 当前选中数据项
......@@ -125,7 +125,7 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected currentselectedNode: any = {};
public currentselectedNode: any = {};
/**
* 选中数据字符串
......@@ -133,7 +133,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected selectedData?: string;
@Prop() public selectedData?: string;
/**
* 选中值变化
......@@ -164,7 +164,7 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected echoselectedNodes:any[] = this.selectedData ? ( this.isSingleSelect ? [JSON.parse(this.selectedData)[0]] : JSON.parse(this.selectedData)) : [];
public echoselectedNodes:any[] = this.selectedData ? ( this.isSingleSelect ? [JSON.parse(this.selectedData)[0]] : JSON.parse(this.selectedData)) : [];
/**
* 部件行为--update
......@@ -172,7 +172,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected updateAction!: string;
@Prop() public updateAction!: string;
/**
* 部件行为--fetch
......@@ -180,7 +180,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected fetchAction!: string;
@Prop() public fetchAction!: string;
/**
* 部件行为--remove
......@@ -188,7 +188,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected removeAction!: string;
@Prop() public removeAction!: string;
/**
* 部件行为--load
......@@ -196,7 +196,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected loadAction!: string;
@Prop() public loadAction!: string;
/**
* 部件行为--create
......@@ -204,7 +204,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected createAction!: string;
@Prop() public createAction!: string;
/**
* 过滤属性
......@@ -212,7 +212,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected srfnodefilter: string = '';
public srfnodefilter: string = '';
/**
* 默认输出图标
......@@ -220,7 +220,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected isOutputIconDefault: boolean = ${ctrl.isOutputIconDefault()?c};
public isOutputIconDefault: boolean = ${ctrl.isOutputIconDefault()?c};
<#-- /**
* 树数据
......@@ -229,7 +229,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Provide()
protected nodes: any[] = []; -->
public nodes: any[] = []; -->
/**
* 数据展开主键
......@@ -238,18 +238,18 @@
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Provide()
protected expandedKeys: string[] = [];
public expandedKeys: string[] = [];
/**
* 选中数据变更事件
*
* @private
* @public
* @param {*} data
* @param {*} data 当前节点对应传入对象
* @param {*} checkedState 树目前选中状态对象
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private onCheck(data: any, checkedState: any) {
public onCheck(data: any, checkedState: any) {
// 处理多选数据
if(!this.isSingleSelect){
let leafNodes = checkedState.checkedNodes.filter((item:any) => item.leaf);
......@@ -261,12 +261,12 @@
/**
* 选中数据变更事件
*
* @private
* @public
* @param {*} data 节点对应传入对象
* @param {*} node 节点对应node对象
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private selectionChange(data: any, node: any) {
public selectionChange(data: any, node: any) {
// 禁用项处理
if (data.disabled){
node.isCurrent = false;
......@@ -289,7 +289,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created() {
public created() {
this.afterCreated();
}
......@@ -298,7 +298,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -325,7 +325,7 @@
* 对树节点进行筛选操作
* @memberof OrderTree
*/
protected filterNode(value:any, data:any) {
public filterNode(value:any, data:any) {
if (!value) return true;
return data.text.indexOf(value) !== -1;
}
......@@ -336,7 +336,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -345,7 +345,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -359,7 +359,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected refresh_all(): void {
public refresh_all(): void {
this.inited = false;
this.$nextTick(() => {
this.inited = true;
......@@ -371,7 +371,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected refresh_parent(): void {
public refresh_parent(): void {
if (Object.keys(this.currentselectedNode).length === 0) {
return;
}
......@@ -400,7 +400,7 @@
* @param {*} node
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected load(node: any = {}, resolve?: any) {
public load(node: any = {}, resolve?: any) {
if (node.data && node.data.children) {
resolve(node.data.children);
return;
......@@ -409,10 +409,19 @@
srfnodeid: node.data && node.data.id ? node.data.id : "#",
srfnodefilter: this.srfnodefilter
};
Object.assign(params,{viewparams:this.viewparams});
let tempViewParams:any = JSON.parse(JSON.stringify(this.viewparams));
let curNode:any = {};
curNode = Util.deepObjectMerge(curNode,node);
let tempContext:any = this.computecurNodeContext(curNode);
if(curNode.data && curNode.data.srfparentdename){
Object.assign(tempContext,{srfparentdename:curNode.data.srfparentdename});
Object.assign(tempViewParams,{srfparentdename:curNode.data.srfparentdename});
}
if(curNode.data && curNode.data.srfparentkey){
Object.assign(tempContext,{srfparentkey:curNode.data.srfparentkey});
Object.assign(tempViewParams,{srfparentkey:curNode.data.srfparentkey});
}
Object.assign(params,{viewparams:tempViewParams});
this.service.getNodes(tempContext,params).then((response: any) => {
if (!response || response.status !== 200) {
this.$Notice.error({ title: "错误", desc: response.info });
......@@ -445,29 +454,12 @@
* @param {*} curNode 当前节点
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected computecurNodeContext(curNode:any){
let tempContext:any = JSON.parse(JSON.stringify(this.context));
while(curNode){
if(curNode.data && curNode.data.id){
let strTreeNodeId:string = curNode.data.id;
let strNodeType:string = strTreeNodeId.substring(0, strTreeNodeId.indexOf(";")).toLowerCase();
let strRealNodeValue:string = curNode.data.srfkey;
let strNodeKey:string = curNode.data.srfappctxkey?curNode.data.srfappctxkey:strNodeType;
if(!tempContext[strNodeKey]){
Object.defineProperty(tempContext, strNodeKey, {
value: strRealNodeValue,
writable: true,
enumerable: true,
configurable: true
});
}
if(tempContext[strNodeKey]){
curNode = null;
}
}
if(curNode){
curNode = curNode.parent;
}
public computecurNodeContext(curNode:any){
let tempContext:any = {};
if(curNode && curNode.data && curNode.data.srfappctx){
tempContext = JSON.parse(JSON.stringify(curNode.data.srfappctx));
}else{
tempContext = JSON.parse(JSON.stringify(this.context));
}
return tempContext;
}
......@@ -478,7 +470,7 @@
* @param {any[]} args
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected refresh(args: any[]): void {
public refresh(args: any[]): void {
if (Object.keys(this.currentselectedNode).length === 0) {
return;
}
......@@ -503,13 +495,13 @@
/**
* 刷新节点
*
* @protected
* @public
* @param {*} [curContext] 当前节点上下文
* @param {*} [arg={}] 当前节点附加参数
* @param {boolean} parentnode 是否是刷新父节点
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected refresh_node(curContext:any,arg: any = {}, parentnode: boolean): void {
public refresh_node(curContext:any,arg: any = {}, parentnode: boolean): void {
const { srfnodeid: id } = arg;
Object.assign(arg,{viewparams:this.viewparams});
const get: Promise<any> = this.service.getNodes(JSON.parse(JSON.stringify(this.context)),arg);
......@@ -537,12 +529,12 @@
/**
* 默认展开节点
*
* @private
* @public
* @param {any[]} items
* @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected formatExpanded(items: any[]): any[] {
public formatExpanded(items: any[]): any[] {
const data: any[] = [];
items.forEach((item) => {
if (item.expanded || (item.children && item.children.length > 0)) {
......@@ -560,7 +552,7 @@
* @param {boolean} isSelectedAll 是否选中所有子节点
* @memberof MainTree
*/
protected setDefaultSelection(items: any[], isRoot: boolean = false, isSelectedAll: boolean = false): void {
public setDefaultSelection(items: any[], isRoot: boolean = false, isSelectedAll: boolean = false): void {
if(items.length == 0){
return;
}
......@@ -626,7 +618,7 @@
* @returns
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected renderContextMenu(node: any) {
public renderContextMenu(node: any) {
let content;
if (node && node.data) {
const data: any = JSON.parse(JSON.stringify(node.data));
......@@ -655,7 +647,7 @@
* @returns
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected renderContextMenu${srfclassname(childCtrl.getOwner().getNodeType()?lower_case)}() {
public renderContextMenu${srfclassname(childCtrl.getOwner().getNodeType()?lower_case)}() {
return (
<@ibizindent blank=12>
${P.getCtrlCode(childCtrl, 'CONTROL.html').code}
......@@ -672,7 +664,7 @@ ${P.getCtrlCode(childCtrl, 'CONTROL.html').code}
* @param {*} data
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected setTreeNodeHighLight(data: any): void {
public setTreeNodeHighLight(data: any): void {
const tree: any = this.$refs.${ctrl.name};
tree.setCurrentKey(data.id);
}
......@@ -683,7 +675,7 @@ ${P.getCtrlCode(childCtrl, 'CONTROL.html').code}
* @param {*} node
* @memberof AppView
*/
protected doDefaultAction(node: any) {
public doDefaultAction(node: any) {
if (node && node.data) {
const data: any = node.data;
const tags: string[] = data.id.split(';');
......
@CONTROL/树视图/SERVICE.ts.ftl
浏览文件 @ d597b5ee
......@@ -17,9 +17,37 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
../@MACRO/SERVICE/SERVICE_HEADER.ts.ftl
</#ibizinclude>
<#-- 设置UI必须参数 -->
<#macro setUIParam node>
<#-- 获取树节点关系导航上下文 -->
<#macro getNavContext nodeRs>
<#compress>
<#if nodeRs.getPSDETreeNodeRSNavContexts()??>
<#list nodeRs.getPSDETreeNodeRSNavContexts() as rsNavContext>
"${rsNavContext.getKey()}":{"isRawValue":${rsNavContext.isRawValue()?c},"value":"${rsNavContext.getValue()}"}<#if rsNavContext_has_next>,</#if>
</#list>
</#if>
</#compress>
</#macro>
<#-- 获取树节点关系导航参数 -->
<#macro getNavParams nodeRs>
<#compress>
<#if nodeRs.getPSDETreeNodeRSNavParams()??>
<#list nodeRs.getPSDETreeNodeRSNavParams() as rsNavParam>
"${rsNavParam.getKey()}":{"isRawValue":${rsNavParam.isRawValue()?c},"value":"${rsNavParam.getValue()}"}<#if rsNavParam_has_next>,</#if>
</#list>
</#if>
</#compress>
</#macro>
<#-- 获取树节点关系参数 -->
<#macro getParams nodeRs>
<#compress>
<#if nodeRs.getPSDETreeNodeRSParams()??>
<#list nodeRs.getPSDETreeNodeRSParams() as rsParam>
"${rsParam.getKey()}":{"value":"${rsParam.getValue()}"}<#if rsParam_has_next>,</#if>
</#list>
</#if>
</#compress>
</#macro>
/**
......@@ -52,22 +80,22 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
/**
* 节点分隔符号
*
* @private
* @public
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
private TREENODE_SEPARATOR: string = ';';
public TREENODE_SEPARATOR: string = ';';
<#if ctrl.getPSDETreeNodes()??>
<#list ctrl.getPSDETreeNodes() as node>
/**
* ${node.getName()}节点分隔符号
*
* @private
* @public
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
private TREENODE_${node.getNodeType()?upper_case}: string = '${node.getNodeType()?j_string}';
public TREENODE_${node.getNodeType()?upper_case}: string = '${node.getNodeType()?j_string}';
</#list>
</#if>
......@@ -125,7 +153,8 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
srfnodefilter: srfnodefilter,
strRealNodeId: strRealNodeId,
srfnodeid: srfnodeid,
strNodeType: strNodeType
strNodeType: strNodeType,
viewparams: JSON.parse(JSON.stringify(data)).viewparams
}
);
......@@ -170,15 +199,20 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
/**
* 填充 树视图节点[${node.getName()}]
*
* @private
* @public
* @param {any{}} context
* @param {*} filter
* @param {any[]} list
* @param {*} rsNavContext
* @param {*} rsNavParams
* @param {*} rsParams
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
@Errorlog
private fill${srfclassname(node.getNodeType()?lower_case)}Nodes(context:any={},filter: any, list: any[]): Promise<any> {
public fill${srfclassname(node.getNodeType()?lower_case)}Nodes(context:any={},filter: any, list: any[],rsNavContext?:any,rsNavParams?:any,rsParams?:any): Promise<any> {
context = this.handleResNavContext(context,filter,rsNavContext);
filter = this.handleResNavParams(context,filter,rsNavParams,rsParams);
return new Promise((resolve:any,reject:any) =>{
<#if node.getTreeNodeType() == 'STATIC'>
let treeNode: any = {};
......@@ -432,15 +466,20 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
records.forEach((entity: any) => {
let treeNode: any = {};
// 整理context
<#if node.getIdPSDEField()??>
let strId: string = entity.${node.getIdPSDEField().codeName?lower_case};
<#else>
let strId: string = entity.${node.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case};
</#if>
<#if node.getTextPSDEField()??>
let strText: string = entity.${node.getTextPSDEField().codeName?lower_case};
<#else>
let strText: string = entity.${node.getPSAppDataEntity().getMajorPSAppDEField().codeName?lower_case};
</#if>
Object.assign(treeNode,{srfparentdename:'${node.getPSAppDataEntity().getCodeName()}',srfparentkey:entity.${node.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}});
Object.assign(treeNode,{srfappctxkey:'${node.getPSAppDataEntity().getCodeName()?lower_case}'});
Object.assign(treeNode,{srfappctx:{'${node.getPSAppDataEntity().getCodeName()?lower_case}':strId}});
Object.assign(treeNode,{srfparentdename:'${node.getPSAppDataEntity().getCodeName()}',srfparentkey:<#if node.getIdPSDEField()??>entity.${node.getIdPSDEField().codeName?lower_case}<#else>entity.${node.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>});
let tempContext:any = JSON.parse(JSON.stringify(context));
Object.assign(tempContext,{srfparentdename:'${node.getPSAppDataEntity().getCodeName()}',srfparentkey:<#if node.getIdPSDEField()??>entity.${node.getIdPSDEField().codeName?lower_case}<#else>entity.${node.getPSAppDataEntity().getKeyPSAppDEField().codeName?lower_case}</#if>,${node.getPSAppDataEntity().getCodeName()?lower_case}:strId})
Object.assign(treeNode,{srfappctx:tempContext});
Object.assign(treeNode,{'${node.getPSAppDataEntity().getCodeName()?lower_case}':strId});
Object.assign(treeNode, { srfkey: strId });
Object.assign(treeNode, { text: strText, srfmajortext: strText });
......@@ -527,7 +566,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
/**
* 获取查询集合
*
* @private
* @public
* @param {any{}} context
* @param {*} searchFilter
* @param {*} filter
......@@ -535,14 +574,23 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
* @memberof TestEnetityDatasService
*/
@Errorlog
private search${srfclassname(node.getNodeType()?lower_case)}(context:any={}, searchFilter: any, filter: any): Promise<any> {
public search${srfclassname(node.getNodeType()?lower_case)}(context:any={}, searchFilter: any, filter: any): Promise<any> {
return new Promise((resolve:any,reject:any) =>{
if(filter.viewparams){
Object.assign(searchFilter,filter.viewparams);
}
if(!searchFilter.page){
Object.assign(searchFilter,{page:0});
}
if(!searchFilter.size){
Object.assign(searchFilter,{size:1000});
}
if(context && context.srfparentdename){
Object.assign(searchFilter,{srfparentdename:JSON.parse(JSON.stringify(context)).srfparentdename});
}
if(context && context.srfparentkey){
Object.assign(searchFilter,{srfparentkey:JSON.parse(JSON.stringify(context)).srfparentkey});
}
<#if node.getSortField?? && node.getSortField()?? && node.getSortField() != "" && node.getSortDir?? && node.getSortDir()?? && node.getSortDir() != "">
Object.assign(searchFilter,{sort: '${node.getSortField()?lower_case},${node.getSortDir()?lower_case}'})
</#if>
......@@ -556,7 +604,9 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
const response: Promise<any> = _appEntityService['${node.getPSAppDEDataSet().getCodeName()}'](context, searchFilter, false);
response.then((response: any) => {
if (!response.status || response.status !== 200) {
reject("数据集异常!");
resolve([]);
console.log(JSON.stringify(context));
console.error('查询${node.getPSAppDEDataSet().getCodeName()}数据集异常!');
}
const data: any = response.data;
if (Object.keys(data).length > 0) {
......@@ -566,7 +616,9 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
resolve([]);
}
}).catch((response: any) => {
reject("数据集异常!");
resolve([]);
console.log(JSON.stringify(context));
console.error('查询${node.getPSAppDEDataSet().getCodeName()}数据集异常!');
});
}
})
......@@ -576,7 +628,7 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
/**
* 填充 树视图节点[${node.getName()}]子节点
*
* @private
* @public
* @param {any{}} context
* @param {*} filter
* @param {any[]} list
......@@ -584,14 +636,17 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
@Errorlog
private async fill${srfclassname(node.getNodeType()?lower_case)}NodeChilds(context:any={}, filter: any, list: any[]): Promise<any> {
public async fill${srfclassname(node.getNodeType()?lower_case)}NodeChilds(context:any={}, filter: any, list: any[]): Promise<any> {
<#if ctrl.getPSDETreeNodeRSs()??>
if (filter.srfnodefilter && !Object.is(filter.srfnodefilter,"")) {
<#list ctrl.getPSDETreeNodeRSs() as noders>
<#if noders.getParentPSDETreeNode().id == node.id>
<#if noders.getSearchMode() == 1 || noders.getSearchMode() == 3>
// 填充${noders.getChildPSDETreeNode().getName()}
await this.fill${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}Nodes(context, filter, list);
let ${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsNavContext:any = {<@getNavContext nodeRs=noders />};
let ${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsNavParams:any = {<@getNavParams nodeRs=noders />};
let ${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsParams:any = {<@getParams nodeRs=noders />};
await this.fill${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}Nodes(context, filter, list ,${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsNavContext,${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsNavParams,${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsParams);
</#if>
</#if>
</#list>
......@@ -600,7 +655,10 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
<#if noders.getParentPSDETreeNode().id == node.id>
<#if noders.getSearchMode() == 2 || noders.getSearchMode() == 3>
// 填充${noders.getChildPSDETreeNode().getName()}
await this.fill${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}Nodes(context, filter, list);
let ${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsNavContext:any = {<@getNavContext nodeRs=noders />};
let ${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsNavParams:any = {<@getNavParams nodeRs=noders />};
let ${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsParams:any = {<@getParams nodeRs=noders />};
await this.fill${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}Nodes(context, filter, list ,${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsNavContext,${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsNavParams,${srfclassname(noders.getChildPSDETreeNode().getNodeType()?lower_case)}RsParams);
</#if>
</#if>
</#list>
......@@ -676,6 +734,127 @@ import ${srfclassname('${node.getPSAppDataEntity().codeName}')}Service from '@se
})
}
/**
* 处理节点关系导航上下文
*
* @param context 应用上下文
* @param filter 参数
* @param resNavContext 节点关系导航上下文
*
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
public handleResNavContext(context:any,filter:any,resNavContext:any){
if(resNavContext && Object.keys(resNavContext).length > 0){
let tempContextData:any = JSON.parse(JSON.stringify(context));
let tempViewParams:any = {};
if(filter && filter.viewparams){
tempViewParams = filter.viewparams;
}
Object.keys(resNavContext).forEach((item:any) =>{
let curDataObj:any = resNavContext[item];
this.handleCustomDataLogic(context,tempViewParams,curDataObj,tempContextData,item);
})
return tempContextData;
}else{
return context;
}
}
/**
* 处理关系导航参数
*
* @param context 应用上下文
* @param filter 参数
* @param resNavParams 节点关系导航参数
* @param resParams 节点关系参数
*
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
public handleResNavParams(context:any,filter:any,resNavParams:any,resParams:any){
if((resNavParams && Object.keys(resNavParams).length >0) || (resParams && Object.keys(resParams).length >0)){
let tempViewParamData:any = {};
let tempViewParams:any = {};
if(filter && filter.viewparams){
tempViewParams = filter.viewparams;
tempViewParamData = JSON.parse(JSON.stringify(filter.viewparams));
}
if( Object.keys(resNavParams).length > 0){
Object.keys(resNavParams).forEach((item:any) =>{
let curDataObj:any = resNavParams[item];
this.handleCustomDataLogic(context,tempViewParams,curDataObj,tempViewParamData,item);
})
}
if( Object.keys(resParams).length > 0){
Object.keys(resParams).forEach((item:any) =>{
let curDataObj:any = resParams[item];
tempViewParamData[item.toLowerCase()] = curDataObj.value;
})
}
Object.assign(filter,{viewparams:tempViewParamData});
return filter;
}else{
return filter;
}
}
/**
* 处理自定义节点关系导航数据
*
* @param context 应用上下文
* @param viewparams 参数
* @param curNavData 节点关系导航参数对象
* @param tempData 返回数据
* @param item 节点关系导航参数键值
*
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
public handleCustomDataLogic(context:any,viewparams:any,curNavData:any,tempData:any,item:string){
// 直接值直接赋值
if(curNavData.isRawValue){
if(Object.is(curNavData.value,"null") || Object.is(curNavData.value,"")){
Object.defineProperty(tempData, item.toLowerCase(), {
value: null,
writable : true,
enumerable : true,
configurable : true
});
}else{
Object.defineProperty(tempData, item.toLowerCase(), {
value: curNavData.value,
writable : true,
enumerable : true,
configurable : true
});
}
}else{
// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
if(context[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item.toLowerCase(), {
value: context[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
if(viewparams[(curNavData.value).toLowerCase()]){
Object.defineProperty(tempData, item.toLowerCase(), {
value: viewparams[(curNavData.value).toLowerCase()],
writable : true,
enumerable : true,
configurable : true
});
}else{
Object.defineProperty(tempData, item.toLowerCase(), {
value: null,
writable : true,
enumerable : true,
configurable : true
});
}
}
}
}
<#ibizinclude>
../@MACRO/SERVICE/SERVICE_BOTTOM.ts.ftl
</#ibizinclude>
\ No newline at end of file
@CONTROL/树视图导航栏/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -52,7 +52,7 @@
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected viewUID!:string;
@Prop() public viewUID!:string;
/**
* 获取多项数据
......@@ -80,7 +80,7 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected selection: any = {};
public selection: any = {};
/**
* 控件宽度
......@@ -88,7 +88,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
public ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
/**
* 过滤值
......@@ -96,25 +96,25 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected srfnodefilter: string = '';
public srfnodefilter: string = '';
/**
* 刷新标识
*
* @protected
* @public
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected counter:number = 0;
public counter:number = 0;
/**
* 是否加载默认关联视图
*
* @protected
* @public
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected istLoadDefaultRefView: boolean = false;
public istLoadDefaultRefView: boolean = false;
/**
* 分割宽度
......@@ -122,7 +122,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected split: number = 0.2;
public split: number = 0.2;
/**
* split值变化事件
......@@ -142,7 +142,7 @@
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected getExpItemView(arg: any = {}): any {
public getExpItemView(arg: any = {}): any {
let expmode = arg.nodetype.toUpperCase();
if (!expmode) {
expmode = '';
......@@ -173,7 +173,7 @@
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
if (args.length === 0) {
return ;
}
......@@ -230,7 +230,6 @@
if(arg.srfparentkey){
Object.assign(tempContext,{srfparentkey:arg.srfparentkey});
}
Object.assign(tempContext,this.context);
this.selection = {};
Object.assign(this.selection, { view: { viewname: refview.viewname } });
Object.assign(this.selection,{'viewparam':tempViewparam,'context':tempContext});
......@@ -247,7 +246,7 @@
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
public ${ctrl.name}_load(args: any[], tag?: string, $event2?: any): void {
this.$emit('load',args);
}
......@@ -256,7 +255,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onSearch(): void {
public onSearch(): void {
if (!this.viewState) {
return;
}
......@@ -272,7 +271,7 @@
*
* @memberof @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected created() {
public created() {
this.afterCreated();
}
......@@ -281,7 +280,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -328,7 +327,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -337,7 +336,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -352,7 +351,7 @@
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onViewDatasChange($event: any): void {
public onViewDatasChange($event: any): void {
this.$emit('selectionchange', $event);
}
......@@ -362,7 +361,7 @@
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected viewDatasActivated($event: any): void {
public viewDatasActivated($event: any): void {
this.$emit('activated', $event);
}
......@@ -372,7 +371,7 @@
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onViewLoad($event: any): void {
public onViewLoad($event: any): void {
this.$emit('load', $event);
}
......
@CONTROL/流程导航栏/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -76,7 +76,7 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected selection: any = {};
public selection: any = {};
/**
......@@ -85,16 +85,16 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected srffilter: string = '';
public srffilter: string = '';
/**
* 关联视图信息集合
*
* @private
* @public
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private refViews: any = [
public refViews: any = [
<#list view.getAllRelatedPSAppViews() as refview>
<#if refview.getWFStepValue??>
{
......@@ -112,8 +112,8 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
<#-- protected split: string = '<#if ctrl.getWidth() gt 0>${ctrl.getWidth()?c}<#else>200</#if>px'; -->
protected split: number = 0.2;
<#-- public split: string = '<#if ctrl.getWidth() gt 0>${ctrl.getWidth()?c}<#else>200</#if>px'; -->
public split: number = 0.2;
/**
* 获取关系项视图
......@@ -122,7 +122,7 @@
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected select(index: any, indexs: any[]) {
public select(index: any, indexs: any[]) {
this.refViews.some((item:any) =>{
if(Object.is("wfstep-"+item.wfstepValue, index)){
this.selection = { viewName: item.viewName };
......@@ -136,7 +136,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created() {
public created() {
this.afterCreated();
}
......@@ -145,7 +145,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -160,7 +160,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -169,7 +169,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -184,7 +184,7 @@
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onViewDatasChange($event: any): void {
public onViewDatasChange($event: any): void {
this.$emit('selectionchange', $event);
}
......@@ -194,7 +194,7 @@
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected viewDatasActivated($event: any): void {
public viewDatasActivated($event: any): void {
this.$emit('activated', $event);
}
......@@ -204,7 +204,7 @@
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onViewLoad($event: any): void {
public onViewLoad($event: any): void {
this.$emit('load', $event);
}
......
@CONTROL/表单/CONTROL-BASE.vue#DETAIL_DRUIPART.ftl
浏览文件 @ d597b5ee
......@@ -7,6 +7,7 @@ ${item.render.code}
<app-form-druipart
<#if item.getPSSysCss?? && item.getPSSysCss()??>class="${item.getPSSysCss().getCssName()}"</#if>
:formState="formState"
:isForbidLoad="this.data.srfuf === '0'"
paramItem='<#if item.getParamItem()??>${item.getParamItem()}<#else>${appde.getCodeName()?lower_case}</#if>'
:parentdata='<#if dritem.getParentDataJO?? && dritem.getParentDataJO()??>${dritem.getParentDataJO()}<#else>{}</#if>'
:parameters="[
......
@CONTROL/表单/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -40,7 +40,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: false }) protected autosave?: boolean;
@Prop({ default: false }) public autosave?: boolean;
/**
* 显示处理提示
......@@ -48,7 +48,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
@Prop({ default: true }) public showBusyIndicator?: boolean;
/**
* 部件行为--submit
......@@ -56,7 +56,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected WFSubmitAction!: string;
@Prop() public WFSubmitAction!: string;
/**
* 部件行为--start
......@@ -64,7 +64,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected WFStartAction!: string;
@Prop() public WFStartAction!: string;
/**
* 部件行为--update
......@@ -72,7 +72,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected updateAction!: string;
@Prop() public updateAction!: string;
/**
* 部件行为--remove
......@@ -80,7 +80,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected removeAction!: string;
@Prop() public removeAction!: string;
/**
* 部件行为--loaddraft
......@@ -88,7 +88,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected loaddraftAction!: string;
@Prop() public loaddraftAction!: string;
/**
* 部件行为--load
......@@ -96,7 +96,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected loadAction!: string;
@Prop() public loadAction!: string;
/**
* 部件行为--create
......@@ -104,7 +104,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected createAction!: string;
@Prop() public createAction!: string;
/**
* 部件行为--create
......@@ -112,7 +112,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected searchAction!: string;
@Prop() public searchAction!: string;
/**
* 视图标识
......@@ -120,7 +120,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected viewtag!: string;
@Prop() public viewtag!: string;
/**
* 表单状态
......@@ -128,7 +128,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {Subject<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected formState: Subject<any> = new Subject();
public formState: Subject<any> = new Subject();
/**
* 忽略表单项值变化
......@@ -136,34 +136,34 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected ignorefieldvaluechange: boolean = false;
public ignorefieldvaluechange: boolean = false;
/**
* 数据变化
*
* @private
* @public
* @type {Subject<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private dataChang: Subject<any> = new Subject();
public dataChang: Subject<any> = new Subject();
/**
* 视图状态事件
*
* @private
* @public
* @type {(Subscription | undefined)}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private dataChangEvent: Subscription | undefined;
public dataChangEvent: Subscription | undefined;
/**
* 原始数据
*
* @private
* @public
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private oldData: any = {};
public oldData: any = {};
/**
* 表单数据对象
......@@ -171,7 +171,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected data: any = {
public data: any = {
<#list ctrl.getPSDEFormItems() as item>
${item.getName()}: null,
</#list>
......@@ -184,7 +184,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected currentAction: string = "";
public currentAction: string = "";
/**
* 关系界面计数器
......@@ -192,7 +192,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected drcounter: number = 0;
public drcounter: number = 0;
/**
* 需要等待关系界面保存时，第一次调用save参数的备份
......@@ -200,7 +200,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected drsaveopt: any = {};
public drsaveopt: any = {};
/**
* 表单保存回调存储对象
......@@ -208,7 +208,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {any}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected saveState:any ;
public saveState:any ;
/**
* 属性值规则
......@@ -216,7 +216,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected rules: any = {
public rules: any = {
<#list ctrl.getAllPSDEFormDetails() as formdetail>
<#if formdetail.getDetailType?? && formdetail.getDetailType() == 'FORMITEM'>
${formdetail.getName()}: [
......@@ -262,7 +262,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected detailsModel: any = {
public detailsModel: any = {
<#list ctrl.getAllPSDEFormDetails() as formdetail>
${formdetail.name}: ${P.getPartCode(formdetail, 'DETAIL_MODEL').code},
</#list>
......@@ -298,11 +298,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 重置表单项值
*
* @private
* @public
* @param {{ name: string, newVal: any, oldVal: any }} { name, newVal, oldVal }
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private resetFormData({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
public resetFormData({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
<#list ctrl.getPSDEFormItems() as item>
<#if item.getResetItemName?? && item.getResetItemName()??>
if (Object.is(name, '${item.getResetItemName()}')) {
......@@ -321,7 +321,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {any[]} args
* @memberof EditForm
*/
protected ResetData(_datas:any){
public ResetData(_datas:any){
if(Object.keys(_datas).length >0){
Object.keys(_datas).forEach((name: string) => {
if (this.data.hasOwnProperty(name)) {
......@@ -334,11 +334,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 表单逻辑
*
* @private
* @public
* @param {{ name: string, newVal: any, oldVal: any }} { name, newVal, oldVal }
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
public formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
<#if P.getPartCode(item,'FORM_LOGIC').code?length gt 0>
${P.getPartCode(item,'FORM_LOGIC').code}
</#if>
......@@ -359,12 +359,12 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 表单值变化
*
* @private
* @public
* @param {{ name: string, newVal: any, oldVal: any }} { name, newVal, oldVal }
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private formDataChange({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
public formDataChange({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
if (this.ignorefieldvaluechange) {
return;
}
......@@ -376,14 +376,14 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 表单加载完成
*
* @private
* @public
* @param {*} [data={}]
* @param {string} [action]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private onFormLoad(data: any = {},action:string): void {
public onFormLoad(data: any = {},action:string): void {
<#if de??>
if(Object.is(action,"save") || Object.is(action,"autoSave"))
if(Object.is(action,"save") || Object.is(action,"autoSave") || Object.is(action,"submit"))
// 更新context的实体主键
if(data.${appde.getCodeName()?lower_case}){
Object.assign(this.context,{${appde.getCodeName()?lower_case}:data.${appde.getCodeName()?lower_case}})
......@@ -406,7 +406,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {string} [action]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected fillForm(_datas: any = {},action:string): void {
public fillForm(_datas: any = {},action:string): void {
this.ignorefieldvaluechange = true;
Object.keys(_datas).forEach((name: string) => {
if (this.data.hasOwnProperty(name)) {
......@@ -427,11 +427,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 设置表单项是否启用
*
* @protected
* @public
* @param {*} data
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected setFormEnableCond(data: any): void {
public setFormEnableCond(data: any): void {
Object.values(this.detailsModel).forEach((detail: any) => {
if (!Object.is(detail.detailType, 'FORMITEM')) {
return;
......@@ -444,10 +444,10 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 重置草稿表单状态
*
* @private
* @public
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private resetDraftFormStates(): void {
public resetDraftFormStates(): void {
const form: any = this.$refs.form;
if (form) {
form.resetFields();
......@@ -459,7 +459,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected resetValidates(): void {
public resetValidates(): void {
Object.values(this.detailsModel).forEach((detail: any) => {
if (!Object.is(detail.detailType, 'FORMITEM')) {
return;
......@@ -475,7 +475,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {any[]} fieldErrors
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected fillValidates(fieldErrors: any[]): void {
public fillValidates(fieldErrors: any[]): void {
fieldErrors.forEach((error: any) => {
const formItem: FormItemModel = this.detailsModel[error.field];
if (!formItem) {
......@@ -493,7 +493,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected formValidateStatus(): boolean {
public formValidateStatus(): boolean {
const form: any = this.$refs.${ctrl.name};
let validatestate: boolean = true;
form.validate((valid: boolean) => {
......@@ -508,7 +508,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getValues(): any {
public getValues(): any {
return this.data;
}
......@@ -519,7 +519,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onFormItemValueChange($event: { name: string, value: any }): void {
public onFormItemValueChange($event: { name: string, value: any }): void {
if (!$event) {
return;
}
......@@ -537,7 +537,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected setDataItemValue(name: string, value: any): void {
public setDataItemValue(name: string, value: any): void {
if (!name || Object.is(name, '') || !this.data.hasOwnProperty(name)) {
return;
}
......@@ -557,7 +557,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected ${formdetail.getName()}_click($event: any): void {
public ${formdetail.getName()}_click($event: any): void {
<#if formdetail.getPSUIAction?? && formdetail.getPSUIAction()??>
<#assign uiaction = formdetail.getPSUIAction()>
this.${ctrl.name}_${formdetail.getName()}_click(null, null, $event);
......@@ -572,7 +572,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected ${formdetail.getName()}_click($event: any): void {
public ${formdetail.getName()}_click($event: any): void {
<#assign itemUpdate=formdetail.getPSDEFormItemUpdate()/>
<#if formdetail.getParamPickupPSAppView()??>
<#assign dataview = formdetail.getParamPickupPSAppView()>
......@@ -656,7 +656,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected groupUIActionClick($event: any): void {
public groupUIActionClick($event: any): void {
if (!$event) {
return;
}
......@@ -679,7 +679,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created(): void {
public created(): void {
this.afterCreated();
}
......@@ -688,7 +688,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -746,7 +746,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -755,7 +755,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -773,7 +773,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {*} [arg={}]
* @memberof @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected copy(arg: any = {}): void {
public copy(arg: any = {}): void {
this.loadDraft(arg);
}
......@@ -781,7 +781,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*打印
*@memberof @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected print(){
public print(){
let _this:any = this;
_this.$print({id:'${ctrl.name}',popTitle:'${ctrl.getLogicName()}'});
}
......@@ -792,7 +792,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {any[]} args
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected refresh(args: any[]): void {
public refresh(args: any[]): void {
let arg: any = {};
Object.assign(arg,args[0]);
if (this.data.srfkey && !Object.is(this.data.srfkey, '')) {
......@@ -814,7 +814,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected autoLoad(arg: any = {}): void {
public autoLoad(arg: any = {}): void {
if (arg.srfkey && !Object.is(arg.srfkey, '')) {
Object.assign(arg, { srfkey: arg.srfkey });
this.load(arg);
......@@ -831,11 +831,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 加载
*
* @private
* @public
* @param {*} [opt={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private load(opt: any = {}): void {
public load(opt: any = {}): void {
if(!this.loadAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表单loadAction参数未配置' });
return;
......@@ -870,7 +870,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {*} [opt={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected loadDraft(opt: any = {}): void {
public loadDraft(opt: any = {}): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表单loaddraftAction参数未配置' });
return;
......@@ -926,7 +926,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {*} [opt={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected autoSave(opt: any = {}): void {
public autoSave(opt: any = {}): void {
if (!this.formValidateStatus()) {
return;
}
......@@ -979,7 +979,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected async save(opt: any = {}, showResultInfo?: boolean, ifStateNext: boolean = true): Promise<any> {
public async save(opt: any = {}, showResultInfo?: boolean, ifStateNext: boolean = true): Promise<any> {
return new Promise((resolve: any, reject: any) => {
showResultInfo = showResultInfo === undefined ? true : false;
if (!this.formValidateStatus()) {
......@@ -1055,11 +1055,11 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
/**
* 删除
*
* @private
* @public
* @param {*} [opt={}]
* @memberof ${srfclassname('${ctrl.name}')}
*/
private remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
public remove(opt:Array<any> = [],showResultInfo?: boolean): Promise<any> {
return new Promise((resolve: any, reject: any) => {
if(!this.removeAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表单removeAction参数未配置' });
......@@ -1094,16 +1094,14 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected async wfstart(data: any,localdata?:any): Promise<any> {
public async wfstart(data: any,localdata?:any): Promise<any> {
return new Promise((resolve: any, reject: any) => {
<#-- if(!this.WFStartAction){
this.$Notice.error({ title: '错误', desc: 'WFCIDEditView视图表单WFStartAction参数未配置' });
return;
} -->
const _this: any = this;
const arg: any = data[0];
Object.assign(arg,{viewparams:this.viewparams});
const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
const post: Promise<any> = _this.save({},false);
post.then((response:any) =>{
const arg:any = response.data;
if(this.viewparams){
......@@ -1156,7 +1154,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected async wfsubmit(data: any,localdata?:any): Promise<any> {
public async wfsubmit(data: any,localdata?:any): Promise<any> {
return new Promise((resolve: any, reject: any) => {
<#-- if(!this.WFSubmitAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表单WFSubmitAction参数未配置' });
......@@ -1171,6 +1169,13 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
const post: Promise<any> = Object.is(arg.srfuf, '1')?this.service.update(this.updateAction, JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator):this.service.add(this.createAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
post.then((response:any) =>{
const arg:any = response.data;
// 保存完成UI处理
this.onFormLoad(arg,'save');
this.$emit('save', arg);
this.$nextTick(() => {
this.formState.next({ type: 'save', data: arg });
});
// 准备提交参数
if(this.viewparams){
Object.assign(arg,{viewparams:this.viewparams});
}
......@@ -1182,6 +1187,8 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
}
return;
}
this.onFormLoad(arg,'submit');
this.$store.dispatch('viewaction/datasaved', { viewtag: this.viewtag });
this.$Notice.info({ title: '', desc: '工作流提交成功' });
resolve(response);
}).catch((response: any) => {
......@@ -1224,7 +1231,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected updateFormItems(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
public updateFormItems(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
if (!mode || (mode && Object.is(mode, ''))) {
return;
}
......@@ -1269,7 +1276,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onEnter($event: any): void {
public onEnter($event: any): void {
<#if ctrl.getControlType() == 'SEARCHFORM' && !ctrl.isEnableAutoSearch()>
this.$emit('load', this.data);
</#if>
......@@ -1281,7 +1288,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {any[]} args
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected saveAndExit(data:any[]):Promise<any>{
public saveAndExit(data:any[]):Promise<any>{
let _this = this;
return new Promise((resolve: any, reject: any) =>{
let arg: any = {};
......@@ -1306,7 +1313,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {any[]} args
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected saveAndNew(data:any[]):Promise<any>{
public saveAndNew(data:any[]):Promise<any>{
let _this = this;
return new Promise((resolve: any, reject: any) =>{
let arg: any = {};
......@@ -1329,7 +1336,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {any[]} args
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected removeAndExit(data:any[]):Promise<any>{
public removeAndExit(data:any[]):Promise<any>{
let _this = this;
return new Promise((resolve: any, reject: any) =>{
let arg: any = {};
......@@ -1353,7 +1360,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
* @param {any} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected drdatasaved($event:any){
public drdatasaved($event:any){
let _this = this;
this.drcounter--;
if(this.drcounter > 0){
......@@ -1399,7 +1406,8 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
this.data['${formdetail.getCodeName()?lower_case}'] = this.context['srfuserid'];
<#else>
<#-- 默认值 -->
this.data['${formdetail.getCodeName()?lower_case}'] = '${formdetail.getCreateDV()}';
<#assign datatype=srfjavatype(formdetail.getStdDataType())>
this.data['${formdetail.getCodeName()?lower_case}'] = <#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>${formdetail.getCreateDV()}<#else>'${formdetail.getCreateDV()}'</#if>;
</#if>
}
</#if>
......@@ -1433,7 +1441,8 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
this.data['${formdetail.getCodeName()?lower_case}'] = this.context['srfuserid'];
<#else>
<#-- 默认值 -->
this.data['${formdetail.getCodeName()?lower_case}'] = '${formdetail.getUpdateDV()}';
<#assign datatype=srfjavatype(formdetail.getStdDataType())>
this.data['${formdetail.getCodeName()?lower_case}'] = <#if datatype=='BigInteger' || datatype=='Integer' || datatype=='Double' || datatype=='Decimal' || datatype=='Float' || datatype=='BigDecimal'>${formdetail.getUpdateDV()}<#else>'${formdetail.getUpdateDV()}'</#if>;
</#if>
}
</#if>
......@@ -1450,7 +1459,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onSearch() {
public onSearch() {
this.$emit('load', this.data);
}
......@@ -1459,7 +1468,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onReset() {
public onReset() {
this.loadDraft();
}
</#if>
......@@ -1470,7 +1479,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onSearch() {
public onSearch() {
this.$emit('load', this.data);
}
......
@CONTROL/表格/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -26,6 +26,17 @@
@row-class-name="onRowClassName($event)"
@row-dblclick="rowDBLClick($event)"
ref='multipleTable' :data="items" :show-header="!isHideHeader">
<template slot="empty">
无数据
<span class="quick-toolbar">
<#if ctrl.getQuickPSDEToolbar?? && ctrl.getQuickPSDEToolbar()??>
<#assign quickToolbar = ctrl.getQuickPSDEToolbar()/>
<@ibizindent blank=12>
${P.getCtrlCode(quickToolbar, 'CONTROL.html').code}
</@ibizindent>
</#if>
</span>
</template>
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
......@@ -57,6 +68,14 @@
</div>
</poptip>
</span>
<span v-if="selections.length > 0" class="batch-toolbar">
<#if ctrl.getBatchPSDEToolbar?? && ctrl.getBatchPSDEToolbar()??>
<#assign batchToolbar = ctrl.getBatchPSDEToolbar()/>
<@ibizindent blank=12>
${P.getCtrlCode(batchToolbar, 'CONTROL.html').code}
</@ibizindent>
</#if>
</span>
<span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
<span>
{{$t('app.gridpage.show')}}&nbsp;
......@@ -121,7 +140,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {any}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected newdata: any;
@Prop() public newdata: any;
</#if>
<#if logic.getPFLogicCodeType() == 'APP_OPENDATA'>
/**
......@@ -130,7 +149,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {any}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected opendata: any;
@Prop() public opendata: any;
</#if>
</#list>
</#if>
......@@ -141,7 +160,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: true }) protected showBusyIndicator?: boolean;
@Prop({ default: true }) public showBusyIndicator?: boolean;
/**
* 部件行为--update
......@@ -149,7 +168,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected updateAction!: string;
@Prop() public updateAction!: string;
/**
* 部件行为--fetch
......@@ -157,7 +176,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected fetchAction!: string;
@Prop() public fetchAction!: string;
/**
* 部件行为--remove
......@@ -165,7 +184,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected removeAction!: string;
@Prop() public removeAction!: string;
/**
* 部件行为--load
......@@ -173,7 +192,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected loadAction!: string;
@Prop() public loadAction!: string;
/**
* 部件行为--loaddraft
......@@ -181,7 +200,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected loaddraftAction!: string;
@Prop() public loaddraftAction!: string;
/**
* 部件行为--create
......@@ -189,7 +208,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected createAction!: string;
@Prop() public createAction!: string;
/**
* 当前页
......@@ -197,7 +216,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected curPage: number = 1;
public curPage: number = 1;
/**
* 数据
......@@ -205,7 +224,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected items: any[] = [];
public items: any[] = [];
/**
* 是否支持分页
......@@ -213,7 +232,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected isEnablePagingBar: boolean = ${ctrl.isEnablePagingBar()?c};
public isEnablePagingBar: boolean = ${ctrl.isEnablePagingBar()?c};
/**
* 是否禁用排序
......@@ -221,7 +240,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected isNoSort: boolean = ${ctrl.isNoSort()?c};
public isNoSort: boolean = ${ctrl.isNoSort()?c};
/**
* 排序方向
......@@ -229,7 +248,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected minorSortDir: string = '<#if ctrl.getMinorSortDir()??>${ctrl.getMinorSortDir()}</#if>';
public minorSortDir: string = '<#if ctrl.getMinorSortDir()??>${ctrl.getMinorSortDir()}</#if>';
/**
* 排序字段
......@@ -237,7 +256,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected minorSortPSDEF: string = '<#if ctrl.getMinorSortPSDEF()??>${ctrl.getMinorSortPSDEF().getCodeName()?lower_case}</#if>';
public minorSortPSDEF: string = '<#if ctrl.getMinorSortPSDEF()??>${ctrl.getMinorSortPSDEF().getCodeName()?lower_case}</#if>';
/**
* 分页条数
......@@ -245,7 +264,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected limit: number = ${ctrl.getPagingSize()?c};
public limit: number = ${ctrl.getPagingSize()?c};
/**
* 是否显示标题
......@@ -253,7 +272,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected isHideHeader: boolean = ${ctrl.isHideHeader()?c};
public isHideHeader: boolean = ${ctrl.isHideHeader()?c};
/**
* 是否默认选中第一条数据
......@@ -261,7 +280,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: false }) protected isSelectFirstDefault!: boolean;
@Prop({ default: false }) public isSelectFirstDefault!: boolean;
/**
* 是否单选
......@@ -269,7 +288,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected isSingleSelect?: boolean;
@Prop() public isSingleSelect?: boolean;
/**
* 选中数据字符串
......@@ -277,7 +296,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected selectedData?: string;
@Prop() public selectedData?: string;
/**
* 选中值变化
......@@ -314,7 +333,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {(number | 0 | 1 | 2)}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({default: 2}) protected gridRowActiveMode!: number;
@Prop({default: 2}) public gridRowActiveMode!: number;
/**
* 是否开启行编辑
......@@ -322,7 +341,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({default: false}) protected isOpenEdit!: boolean;
@Prop({default: false}) public isOpenEdit!: boolean;
/**
* 实际是否开启行编辑
......@@ -330,7 +349,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected actualIsOpenEdit: boolean = this.isOpenEdit;
public actualIsOpenEdit: boolean = this.isOpenEdit;
/**
* 总条数
......@@ -338,7 +357,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected totalrow: number = 0;
public totalrow: number = 0;
/**
* 选中行数据
......@@ -346,7 +365,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {any[]}
* @memberof Main
*/
protected selections: any[] = [];
public selections: any[] = [];
/**
* 拦截行选中
......@@ -354,7 +373,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof Main
*/
protected stopRowClick: boolean = false;
public stopRowClick: boolean = false;
<#if ctrl.getAggMode() == "ALL">
/**
......@@ -363,7 +382,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected aggAction:string ='<#if ctrl.getAggPSDEAction()??>${ctrl.getAggPSDEAction().getCodeName()}</#if>';
public aggAction:string ='<#if ctrl.getAggPSDEAction()??>${ctrl.getAggPSDEAction().getCodeName()}</#if>';
/**
* 远程数据
......@@ -371,7 +390,17 @@ import CodeListService from "@service/app/codelist-service";
* @type {any}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected remoteData:any = {};
public remoteData:any = {};
</#if>
<#if ctrl.getQuickPSDEToolbar?? && ctrl.getQuickPSDEToolbar()??>
<#assign quickToolbar = ctrl.getQuickPSDEToolbar()/>
${P.getCtrlCode(quickToolbar, 'CONTROL.vue').code}
</#if>
<#if ctrl.getBatchPSDEToolbar?? && ctrl.getBatchPSDEToolbar()??>
<#assign batchToolbar = ctrl.getBatchPSDEToolbar()/>
${P.getCtrlCode(batchToolbar, 'CONTROL.vue').code}
</#if>
/**
......@@ -380,7 +409,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected isDisplay:boolean = <#if ctrl.getAggMode() == "ALL">false<#else>true</#if>;
public isDisplay:boolean = <#if ctrl.getAggMode() == "ALL">false<#else>true</#if>;
/**
* 部件刷新
......@@ -388,7 +417,7 @@ import CodeListService from "@service/app/codelist-service";
* @param {any[]} args
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected refresh(args: any[]): void {
public refresh(args: any[]): void {
this.load();
}
......@@ -406,8 +435,8 @@ import CodeListService from "@service/app/codelist-service";
* @type {boolean}
* @memberof AppEmbedPicker
*/
protected isDragendCol: boolean = <#if app.getPSApplicationUI()??>${app.getPSApplicationUI().getPFStyleParam('EL-TABLE.ISDRAGENDCOL',false)?c}<#else>false</#if>;
<#-- protected isDragendCol: boolean = true; -->
public isDragendCol: boolean = <#if app.getPSApplicationUI()??>${app.getPSApplicationUI().getPFStyleParam('EL-TABLE.ISDRAGENDCOL',false)?c}<#else>false</#if>;
<#-- public isDragendCol: boolean = true; -->
/**
* 所有列成员
......@@ -415,7 +444,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected allColumns: any[] = [
public allColumns: any[] = [
<#if ctrl.getAllPSDEGridColumns()??>
<#list ctrl.getAllPSDEGridColumns() as column>
{
......@@ -435,7 +464,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected rules: any = {
public rules: any = {
<#list ctrl.getPSDEGridEditItems() as edititem>
${edititem.getName()}: [
{ required: <#if edititem.isAllowEmpty()>false<#else>true</#if>, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: <#if edititem.getCaption?? && edititem.getCaption()??>'${edititem.getCaption()} 值不能为空'<#else>'值不能为空'</#if>, trigger: 'change' },
......@@ -464,7 +493,7 @@ import CodeListService from "@service/app/codelist-service";
* @param {*} [arg={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected load(opt: any = {}, pageReset: boolean = false): void {
public load(opt: any = {}, pageReset: boolean = false): void {
if(!this.fetchAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表格fetchAction参数未配置' });
return;
......@@ -486,7 +515,9 @@ import CodeListService from "@service/app/codelist-service";
const parentdata: any = {};
this.$emit('beforeload', parentdata);
Object.assign(arg, parentdata);
Object.assign(arg,{viewparams:this.viewparams});
let tempViewParams:any = parentdata.viewparams?parentdata.viewparams:{};
Object.assign(tempViewParams,JSON.parse(JSON.stringify(this.viewparams)));
Object.assign(arg,{viewparams:tempViewParams});
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
post.then((response: any) => {
if (!response.status || response.status !== 200) {
......@@ -540,7 +571,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected async remove(datas: any[]): Promise<any> {
public async remove(datas: any[]): Promise<any> {
if(!this.removeAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表格removeAction参数未配置' });
return;
......@@ -643,7 +674,7 @@ import CodeListService from "@service/app/codelist-service";
* @param {*} [arg={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected addBatch(arg: any = {}): void {
public addBatch(arg: any = {}): void {
if(!this.fetchAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表格fetchAction参数未配置' });
return;
......@@ -718,7 +749,7 @@ import CodeListService from "@service/app/codelist-service";
* @type {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected allExportColumns: any[] = [
public allExportColumns: any[] = [
<#if ctrl.getPSDEDataExport().getPSDEDataExportItems()??>
<#list ctrl.getPSDEDataExport().getPSDEDataExportItems() as column>
{
......@@ -739,7 +770,7 @@ import CodeListService from "@service/app/codelist-service";
* @param {*} data
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected exportExcel(data: any = {}): void {
public exportExcel(data: any = {}): void {
// 导出Excel
const doExport = async (_data:any) => {
const tHeader: Array<any> = [];
......@@ -845,11 +876,11 @@ import CodeListService from "@service/app/codelist-service";
<#elseif codelist.getOrMode() == 'NUM'>
renderMode: 'number',
textSeparator: '${codelist.textSeparator}',
valueSeparator: ';',
valueSeparator: ',',
<#else>
renderMode: 'other',
textSeparator: '、',
valueSeparator: ';',
valueSeparator: ',',
</#if>
},
</#if>
......@@ -880,13 +911,13 @@ import CodeListService from "@service/app/codelist-service";
/**
* 解析代码表和vlaue，设置items
*
* @private
* @public
* @param {any[]} items 代码表数据
* @param {*} value
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private getCodelistValue(items: any[], value: any, codelist: any,){
public getCodelistValue(items: any[], value: any, codelist: any,){
if(!value){
return this.$t('codelist.'+codelist.srfkey+'.empty');
}
......@@ -933,13 +964,13 @@ import CodeListService from "@service/app/codelist-service";
/**
* 获取代码项
*
* @private
* @public
* @param {any[]} items
* @param {*} value
* @returns {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
private getItem(items: any[], value: any, codelist: any): any {
public getItem(items: any[], value: any, codelist: any): any {
const arr: Array<any> = items.filter(item => {return item.value == value});
if (arr.length !== 1) {
return undefined;
......@@ -956,7 +987,7 @@ import CodeListService from "@service/app/codelist-service";
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created(): void {
public created(): void {
this.afterCreated();
}
......@@ -965,7 +996,7 @@ import CodeListService from "@service/app/codelist-service";
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
this.setColState();
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
......@@ -990,7 +1021,7 @@ import CodeListService from "@service/app/codelist-service";
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -999,7 +1030,7 @@ import CodeListService from "@service/app/codelist-service";
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -1014,7 +1045,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getSelection(): any[] {
public getSelection(): any[] {
return this.selections;
}
......@@ -1025,7 +1056,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected rowDBLClick($event: any): void {
public rowDBLClick($event: any): void {
if (!$event || this.actualIsOpenEdit || Object.is(this.gridRowActiveMode,0)) {
return;
}
......@@ -1049,7 +1080,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected select($event: any): void {
public select($event: any): void {
if (!$event) {
return;
}
......@@ -1064,7 +1095,7 @@ import CodeListService from "@service/app/codelist-service";
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected selectAll($event: any): void {
public selectAll($event: any): void {
if (!$event) {
return;
}
......@@ -1081,7 +1112,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected rowClick($event: any, ifAlways: boolean = false): void {
public rowClick($event: any, ifAlways: boolean = false): void {
if (!ifAlways && (!$event || this.actualIsOpenEdit)) {
return;
}
......@@ -1123,7 +1154,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected pageOnChange($event: any): void {
public pageOnChange($event: any): void {
if (!$event) {
return;
}
......@@ -1141,7 +1172,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onPageSizeChange($event: any): void {
public onPageSizeChange($event: any): void {
if (!$event) {
return;
}
......@@ -1159,7 +1190,7 @@ import CodeListService from "@service/app/codelist-service";
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected pageRefresh(): void {
public pageRefresh(): void {
this.load({});
}
......@@ -1169,7 +1200,7 @@ import CodeListService from "@service/app/codelist-service";
* @param {{ column: any, prop: any, order: any }} { column, prop, order }
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onSortChange({ column, prop, order }: { column: any, prop: any, order: any }): void {
public onSortChange({ column, prop, order }: { column: any, prop: any, order: any }): void {
const dir = Object.is(order, 'ascending') ? 'asc' : Object.is(order, 'descending') ? 'desc' : '';
if (Object.is(dir, this.minorSortDir) && Object.is(this.minorSortPSDEF, prop)) {
return;
......@@ -1186,7 +1217,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onRowClassName({ row, rowIndex }: { row: any, rowIndex: any }): string {
public onRowClassName({ row, rowIndex }: { row: any, rowIndex: any }): string {
const index = this.selections.findIndex((select: any) => Object.is(select.srfkey, row.srfkey));
return index !== -1 ? 'grid-row-select' : '';
}
......@@ -1198,7 +1229,7 @@ import CodeListService from "@service/app/codelist-service";
* @param {any} param
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getSummaries(param:any){
public getSummaries(param:any){
<#if ctrl.getAggMode() == "PAGE">
const { columns, data } = param;
const sums:Array<any> = [];
......@@ -1324,7 +1355,7 @@ import CodeListService from "@service/app/codelist-service";
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getAggData(){
public getAggData(){
this.service.getAggData(this.aggAction,JSON.parse(JSON.stringify(this.context)),this.showBusyIndicator).then((response:any) =>{
if (!response.status || response.status !== 200) {
if (response.errorMessage) {
......@@ -1353,7 +1384,7 @@ import CodeListService from "@service/app/codelist-service";
* @param {*} $event
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected uiAction(row: any, tag: any, $event: any) {
public uiAction(row: any, tag: any, $event: any) {
this.rowClick(row, true);
<#if ctrl.getPSAppViewLogics()??>
<#list ctrl.getPSAppViewLogics() as logic>
......@@ -1372,7 +1403,7 @@ import CodeListService from "@service/app/codelist-service";
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected setColState() {
public setColState() {
const _data: any = localStorage.getItem('${ctrl.getPSDataEntity().getName()?lower_case}_${ctrl.getCodeName()?lower_case}_${ctrl.name}');
if (_data) {
let columns = JSON.parse(_data);
......@@ -1390,7 +1421,7 @@ import CodeListService from "@service/app/codelist-service";
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onColChange() {
public onColChange() {
localStorage.setItem('${ctrl.getPSDataEntity().getName()?lower_case}_${ctrl.getCodeName()?lower_case}_${ctrl.name}', JSON.stringify(this.allColumns));
}
......@@ -1401,7 +1432,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {boolean}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getColumnState(name: string): boolean {
public getColumnState(name: string): boolean {
let column = this.allColumns.find((col: any) =>
Object.is(name, col.name)
);
......@@ -1426,7 +1457,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected save(args: any[], params?: any, $event?: any, xData?: any): void {
public save(args: any[], params?: any, $event?: any, xData?: any): void {
let _this = this;
let promises:any = [];
_this.items.forEach((item:any)=>{
......@@ -1470,7 +1501,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected newRow(args: any[], params?: any, $event?: any, xData?: any): void {
public newRow(args: any[], params?: any, $event?: any, xData?: any): void {
if(!this.loaddraftAction){
this.$Notice.error({ title: '错误', desc: '${view.getName()}视图表格loaddraftAction参数未配置' });
return;
......@@ -1507,7 +1538,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected onGridItemValueChange(row: any,$event: { name: string, value: any }): void {
public onGridItemValueChange(row: any,$event: { name: string, value: any }): void {
if (!$event) {
return;
}
......@@ -1521,14 +1552,14 @@ import CodeListService from "@service/app/codelist-service";
/**
* 表格编辑项值变化
*
* @private
* @public
* @param row 行数据
* @param property 列编辑项名
* @param row 列编辑项值
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected gridEditItemChange(row: any, property: string, value: any){
public gridEditItemChange(row: any, property: string, value: any){
row.rowDataState = row.rowDataState ? row.rowDataState : "update" ;
<#if ctrl.getPSDEGridEditItems()??>
<#list ctrl.getPSDEGridEditItems() as editItem>
......@@ -1553,7 +1584,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected updateGridEditItem(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
public updateGridEditItem(mode: string, data: any = {}, updateDetails: string[], showloading?: boolean): void {
if (!mode || (mode && Object.is(mode, ''))) {
return;
}
......@@ -1594,7 +1625,7 @@ import CodeListService from "@service/app/codelist-service";
* @returns {void}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected getRowClassName(args:{row: any,rowIndex: number}){
public getRowClassName(args:{row: any,rowIndex: number}){
let isSelected = this.selections.some((item:any)=>{
return Object.is(item.${appde.getCodeName()?lower_case},args.row.${appde.getCodeName()?lower_case});
});
......
@CONTROL/表格/CONTROL.less.ftl
浏览文件 @ d597b5ee
......@@ -29,18 +29,14 @@
display: inline;
}
.el-table {
th{
padding: 0px;
.cell{
font-size: 14px;
.quick-toolbar{
display: inline-block;
button{
background: #ebf3fb;
color: #2575ca;
border: 0;
}
}
td{
padding: 3px 0;
}
tr .el-table-column--selection .cell{
padding: 0;
}
.el-tooltip{
.ivu-form-item{
margin-bottom: unset !important;
......@@ -69,12 +65,23 @@
position: absolute;
left: 0;
}
.batch-toolbar{
position: absolute;
left: 105px;
>.toolbar-container{
button {
font-size: 16px;
min-width: 32px;
height: 32px;
margin-right: 4px;
margin-top: 0;
margin-bottom: 0;
}
}
}
}
.el-table__body-wrapper{
height: calc(100% - 36px) !important;
}
.el-table__empty-block{
height: auto !important;
height: calc(100% - 45px) !important;
}
}
.ivu-modal-content{
......@@ -86,6 +93,7 @@
}
<#ibizinclude>
../@MACRO/CSS/DEFAULT.less.ftl
</#ibizinclude>
\ No newline at end of file
@CONTROL/表格/SERVICE.ts.ftl
浏览文件 @ d597b5ee
......@@ -39,12 +39,12 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
/**
* 处理数据
*
* @private
* @public
* @param {Promise<any>} promise
* @returns {Promise<any>}
* @memberof ${srfclassname('${ctrl.codeName}')}Service
*/
private doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
public doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
return new Promise((resolve, reject) => {
promise.then((response: any) => {
if (response && response.status === 200) {
......@@ -309,7 +309,7 @@ import ${srfclassname('${aggAppDataEntity.getCodeName()}')}Service from '@/servi
if(response.data){
Object.assign(response.data,{srfuf:'0'});
//仿真主键数据
response.data.${appde.getCodeName()?lower_case} = Util.createUUID();
response.data.${appde.getKeyPSAppDEField().getCodeName()?lower_case} = Util.createUUID();
}
this.handleResponse(action, response, true);
this.mergeDefaults(response);
......
@CONTROL/表格导航/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -65,7 +65,7 @@
* @type {any}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected newdata: any;
@Prop() public newdata: any;
</#if>
<#if logic.getPFLogicCodeType() == 'APP_OPENDATA'>
/**
......@@ -74,7 +74,7 @@
* @type {any}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected opendata: any;
@Prop() public opendata: any;
</#if>
</#list>
</#if>
......@@ -85,25 +85,25 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
@Prop() protected viewUID!:string;
@Prop() public viewUID!:string;
/**
* 是否单选
*
* @protected
* @public
* @type {(boolean)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected isSingleSelect:boolean = true;
public isSingleSelect:boolean = true;
/**
* 呈现模式，可选值：horizontal或者vertical
*
* @protected
* @public
* @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
public showMode:string ="<#if view.getSideBarLayout()?? && view.getSideBarLayout() == "LEFT">horizontal<#else>vertical</#if>";
/**
* 控件宽度
......@@ -111,7 +111,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
public ctrlWidth:number = <#if ctrl.getWidth()??>${ctrl.getWidth()}<#else>0</#if>;
/**
* 控件高度
......@@ -119,7 +119,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
public ctrlHeight: number = <#if ctrl.getHeight()??>${ctrl.getHeight()}<#else>0</#if>;
/**
* 选中数据
......@@ -127,16 +127,16 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected selection: any = {};
public selection: any = {};
/**
* 搜素值
*
* @protected
* @public
* @type {(string)}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected searchText:string = "";
public searchText:string = "";
/**
* 分割宽度
......@@ -144,7 +144,7 @@
* @type {number}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected split: number = 0.5;
public split: number = 0.5;
<#if ctrl.getXDataPSControl()??>
<#assign xDataControl = ctrl.getXDataPSControl() />
......@@ -154,7 +154,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
public navViewName: string = "<#if xDataControl.getNavPSAppView()??><#assign navPSAppView = xDataControl.getNavPSAppView() />${srffilepath2(navPSAppView.getCodeName())}</#if>";
/**
* 导航视图参数
......@@ -162,7 +162,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
public navViewParam: string = '<#if xDataControl.getNavViewParamJO()??>${xDataControl.getNavViewParamJO()}</#if>';
/**
* 导航过滤项
......@@ -170,7 +170,7 @@
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
public navFilter: string = "<#if xDataControl.getNavFilter()??>${xDataControl.getNavFilter()}</#if>";
</#if>
/**
......@@ -179,7 +179,7 @@
* @type {boolean}
* @memberof MOBILEENTITY3Canlen
*/
@Prop({ default: true }) protected showBusyIndicator!: boolean;
@Prop({ default: true }) public showBusyIndicator!: boolean;
<#if ctrl.getPSControls()??>
<#assign controls = ctrl.getPSControls()/>
......@@ -288,7 +288,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -297,7 +297,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......@@ -311,7 +311,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected onSearch($event:any) {
public onSearch($event:any) {
<#if ctrl.getXDataPSControl()??>
<#assign xDataControl = ctrl.getXDataPSControl()/>
let grid:any = this.$refs.${xDataControl.getName()};
......@@ -325,7 +325,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
public ${ctrl.name}_selectionchange(args: any [], tag?: string, $event2?: any): void {
let data:any = {};
if (args.length === 0) {
return ;
......@@ -353,7 +353,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}Base
*/
protected ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
public ${ctrl.name}_load(args:any, tag?: string, $event2?: any){
this.$emit('load',args);
}
<#ibizinclude>
......
@CONTROL/视图布局面板/实体工作流代理应用启动视图/VIEW.vue.ftl
浏览文件 @ d597b5ee
<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>' :disHover="true" :padding="0" :bordered="false">
<card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<div class="content-container">
<iframe :src="iframeUrl" height="100%" width="100%" seamless="seamless" frameborder="0" scrolling="auto"></iframe>
</div>
......
@CONTROL/视图布局面板/实体工作流代理数据视图/VIEW.vue.ftl
浏览文件 @ d597b5ee
<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>' :disHover="true" :padding="0" :bordered="false">
<card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<div class="content-container">
<iframe :src="iframeUrl" height="100%" width="100%" seamless="seamless" frameborder="0" scrolling="auto"></iframe>
</div>
......
@CONTROL/视图布局面板/实体工作流动态导航表格视图/VIEW.vue.ftl
浏览文件 @ d597b5ee
<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>' :disHover="true" :padding="0" :bordered="false">
<card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<#ibizinclude>
../@MACRO/VIEW_CAPTION.vue.ftl
</#ibizinclude>
......
@CONTROL/视图布局面板/实体工作流动态编辑视图/VIEW.vue.ftl
浏览文件 @ d597b5ee
<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>' :disHover="true" :padding="0" :bordered="false">
<card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<#ibizinclude>
../@MACRO/VIEW_CAPTION.vue.ftl
</#ibizinclude>
......
@CONTROL/视图布局面板/实体工作流动态编辑视图（分页关系）/VIEW.vue.ftl
浏览文件 @ d597b5ee
<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>' :disHover="true" :padding="0" :bordered="false">
<card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<#ibizinclude>
../@MACRO/VIEW_CAPTION.vue.ftl
</#ibizinclude>
......
@CONTROL/视图布局面板/实体工作流操作视图/VIEW.vue.ftl
浏览文件 @ d597b5ee
<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>' dis-hover :padding="0" :bordered="false">
<card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' dis-hover :padding="0" :bordered="false">
<@ibizindent blank=8>
<#ibizinclude>
../@MACRO/VIEW_CAPTION.vue.ftl
......
@CONTROL/视图布局面板/实体数据选择视图（分页关系）/VIEW.vue.ftl
浏览文件 @ d597b5ee
<#ibizinclude>
../@MACRO/DEFAULT.vue.ftl
</#ibizinclude>
\ No newline at end of file
<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 view-no-caption <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<#if view.hasPSControl('toolbar')>
<#assign toolbarCtrl = view.getPSControl('toolbar')>
<@ibizindent blank=8>
${P.getCtrlCode(toolbarCtrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
<div class="content-container">
<#if view.getAllPSControls()??>
<#list view.getAllPSControls() as ctrl>
<#if ctrl.getControlType() != "TOOLBAR">
<#if P.getCtrlCode(ctrl, 'CONTROL.html')??>
<@ibizindent blank=12>
${P.getCtrlCode(ctrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
</#if>
</#list>
</#if>
</div>
</card>
</div>
\ No newline at end of file
@CONTROL/视图布局面板/实体索引关系选择数据视图（部件视图）/VIEW.vue.ftl
浏览文件 @ d597b5ee
<#ibizinclude>
../@MACRO/DEFAULT.vue.ftl
</#ibizinclude>
\ No newline at end of file
<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 view-no-caption <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<#if view.hasPSControl('toolbar')>
<#assign toolbarCtrl = view.getPSControl('toolbar')>
<@ibizindent blank=8>
${P.getCtrlCode(toolbarCtrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
<div class="content-container">
<#if view.getAllPSControls()??>
<#list view.getAllPSControls() as ctrl>
<#if ctrl.getControlType() != "TOOLBAR">
<#if P.getCtrlCode(ctrl, 'CONTROL.html')??>
<@ibizindent blank=12>
${P.getCtrlCode(ctrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
</#if>
</#list>
</#if>
</div>
</card>
</div>
\ No newline at end of file
@CONTROL/视图布局面板/实体表单选择数据视图（部件视图）/VIEW.vue.ftl
浏览文件 @ d597b5ee
<#ibizinclude>
../@MACRO/DEFAULT.vue.ftl
</#ibizinclude>
\ No newline at end of file
<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 view-no-caption <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' :disHover="true" :padding="0" :bordered="false">
<#if view.hasPSControl('toolbar')>
<#assign toolbarCtrl = view.getPSControl('toolbar')>
<@ibizindent blank=8>
${P.getCtrlCode(toolbarCtrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
<div class="content-container">
<#if view.getAllPSControls()??>
<#list view.getAllPSControls() as ctrl>
<#if ctrl.getControlType() != "TOOLBAR">
<#if P.getCtrlCode(ctrl, 'CONTROL.html')??>
<@ibizindent blank=12>
${P.getCtrlCode(ctrl, 'CONTROL.html').code}
</@ibizindent>
</#if>
</#if>
</#list>
</#if>
</div>
</card>
</div>
\ No newline at end of file
@CONTROL/视图布局面板/应用流程跟踪视图/VIEW.vue.ftl
浏览文件 @ d597b5ee
<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' dis-hover :bordered="false">
<card class='view-card <#if !view.isShowCaptionBar()> view-no-caption</#if> <#if !view.hasPSControl('toolbar')> view-no-toolbar</#if>' dis-hover :bordered="false">
<#ibizinclude>
../@MACRO/VIEW_CAPTION.vue.ftl
</#ibizinclude>
......
@CONTROL/选择视图面板/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -4,6 +4,7 @@
v-if="inited && view.viewname && !Object.is(view.viewname, '')"
:is="view.viewname"
class="viewcontainer3"
:openMode="openMode"
:viewdata="viewdata"
:viewparam="viewparam"
:viewDefaultUsage="false"
......@@ -23,6 +24,16 @@ import ${srfclassname('${ctrl.codeName}')}Model from './${srffilepath2(ctrl.code
<#ibizinclude>
../@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
</#ibizinclude>
/**
* 视图打开模式
*
* @protected
* @type {('DEFAULT' | 'MODAL')}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop({ default: 'DEFAULT' })
protected openMode!: 'DEFAULT' | 'MODAL';
/**
* 选中数据字符串
*
......
@CONTROL/选择视图面板/CONTROL.html.ftl
浏览文件 @ d597b5ee
......@@ -3,6 +3,7 @@
:isSingleSelect="isSingleSelect"
:selectedData="selectedData"
:isShowButton="isShowButton"
:openMode="openMode"
</#assign>
<#ibizinclude>
../@MACRO/HTML/DEFAULT.html.ftl
......
@CONTROL/门户部件/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -137,7 +137,7 @@
* @returns {any[]}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected actionBarModelData:any[] =[
public actionBarModelData:any[] =[
<#if ctrl.getPSAppViewLogics?? && ctrl.getPSAppViewLogics()??>
<#list ctrl.getPSAppViewLogics() as appViewLogic>
{ viewlogicname:"${appViewLogic.name}",
......@@ -163,7 +163,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected handleItemClick($event:any){
public handleItemClick($event:any){
<#if ctrl.getPSAppViewLogics?? && ctrl.getPSAppViewLogics()??>
<#list ctrl.getPSAppViewLogics() as appViewLogic>
if(Object.is($event,'${appViewLogic.name}')){
......@@ -207,7 +207,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected created() {
public created() {
this.afterCreated();
}
......@@ -216,7 +216,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterCreated(){
public afterCreated(){
if (this.viewState) {
this.viewStateEvent = this.viewState.subscribe(({ tag, action, data }) => {
if (!Object.is(tag, this.name)) {
......@@ -235,7 +235,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected destroyed() {
public destroyed() {
this.afterDestroy();
}
......@@ -244,7 +244,7 @@
*
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected afterDestroy() {
public afterDestroy() {
if (this.viewStateEvent) {
this.viewStateEvent.unsubscribe();
}
......
@CONTROL/面板/CONTROL-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -27,7 +27,7 @@
* @type {*}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected data?: any;
@Prop() public data?: any;
<#if ctrl.getAllPSPanelItems()??>
<#list ctrl.getAllPSPanelItems() as panelItem>
......@@ -37,7 +37,7 @@
*
* @memberof @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected ${panelItem.getName()}_click($event: any): void {
public ${panelItem.getName()}_click($event: any): void {
<#if panelItem.getPSUIAction?? && panelItem.getPSUIAction()??>
<#assign uiaction = panelItem.getPSUIAction()>
this.${ctrl.name}_${panelItem.getName()}_click(null, null, $event);
......
@EDITOR/地址框（支持选择、AC）/GRIDEIDTOR.vue.ftl
浏览文件 @ d597b5ee
......@@ -4,7 +4,7 @@
:activeData="row"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"
:curvalue="row[column.property]"
name="column.property"
:name="column.property"
:context="context"
:viewparams="viewparams"
:service="service"
......
@EDITOR/地址框（选择）/GRIDEIDTOR.vue.ftl
浏览文件 @ d597b5ee
......@@ -4,7 +4,7 @@
:activeData="row"
:disabled="row.srfuf === 1 ? (${item.getEnableCond()?c} & 2) !== 2 : (${item.getEnableCond()?c} & 1) !== 1"
:curvalue="row[column.property]"
name="column.property"
:name="column.property"
:context="context"
:viewparams="viewparams"
:service="service"
......
@LOGIC/@APPFUNC/打开HTML页面/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -4,7 +4,7 @@
* @param {*} [item={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected click${item.codeName}(item: any = {}){
public click${item.codeName}(item: any = {}){
const localdata: any = this.$store.getters.getLocalData();
const url = `${item.getHtmlPageUrl()}`;
window.open(url, '_blank');
......
@LOGIC/@APPFUNC/打开应用视图/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -10,7 +10,7 @@
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
<#assign dataview = item.getPSAppView()/>
protected click${item.codeName}(item: any = {}) {
public click${item.codeName}(item: any = {}) {
<#if dataview.isRedirectView()>
this.$Notice.warning({ title: '警告', desc: '重定向视图暂不支持应用功能打开' });
<#else>
......
@LOGIC/@APPFUNC/执行JavaScript/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -4,6 +4,6 @@
* @param {*} [item={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected click${item.codeName}(item: any = {}){
public click${item.codeName}(item: any = {}){
${item.getJSCode()}
}
\ No newline at end of file
@LOGIC/@APPFUNC/自定义/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -4,6 +4,6 @@
* @param {*} [item={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected click${item.codeName}(item: any = {}){
public click${item.codeName}(item: any = {}){
this.$Notice.error({ title: '错误', desc: '暂不支持此项操作' });
}
\ No newline at end of file
@LOGIC/@APPFUNC/预置应用功能/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -4,6 +4,6 @@
* @param {*} [item={}]
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
protected click${item.codeName}(item: any = {}){
public click${item.codeName}(item: any = {}){
this.$Notice.error({ title: '错误', desc: '暂不支持此项操作' });
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof appUIService
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/上一个记录/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '暂不支持此项操作' });
}
@LOGIC/@UIACTION/系统预置/sys/下一个记录/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '暂不支持此项操作' });
}
@LOGIC/@UIACTION/系统预置/sys/保存/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
// 界面行为容器对象 _this
const _this: any = this;
if (xData && xData.save instanceof Function) {
......
@LOGIC/@UIACTION/系统预置/sys/保存并关闭/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.saveAndExit instanceof Function) {
xData.saveAndExit().then((response: any) => {
......
@LOGIC/@UIACTION/系统预置/sys/保存并新建/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.saveAndNew instanceof Function)) {
return;
......
@LOGIC/@UIACTION/系统预置/sys/保存行/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
// 界面行为容器对象 _this
const _this: any = this;
if (xData && xData.save instanceof Function) {
......
@LOGIC/@UIACTION/系统预置/sys/关闭/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.closeView(args);
if(window.parent){
window.parent.postMessage([{ ...args }],'*');
......
@LOGIC/@UIACTION/系统预置/sys/删除/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.remove instanceof Function)) {
return ;
......
@LOGIC/@UIACTION/系统预置/sys/删除并关闭/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.removeAndExit instanceof Function) {
xData.removeAndExit().then((response: any) => {
......
@LOGIC/@UIACTION/系统预置/sys/刷新/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (xData && xData.refresh && xData.refresh instanceof Function) {
xData.refresh(args);
......
@LOGIC/@UIACTION/系统预置/sys/导出/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.exportExcel instanceof Function) || !$event) {
return ;
......
@LOGIC/@UIACTION/系统预置/sys/导出数据模型/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '导出数据模型未支持' });
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/帮助/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '帮助未支持' });
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/开始流程/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.wfstart instanceof Function)) {
return;
......
@LOGIC/@UIACTION/系统预置/sys/当前流程步骤/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
let _this:any = this;
if (!xData || !(xData.wfsubmit instanceof Function)) {
return;
......
@LOGIC/@UIACTION/系统预置/sys/打印/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
let _this:any = this;
if (!xData || !(xData.print instanceof Function) || !$event) {
return ;
......
@LOGIC/@UIACTION/系统预置/sys/拷贝/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) {
return;
}
......@@ -19,7 +19,7 @@
if (args.length > 0) {
Object.assign(data, { srfsourcekey: args[0].srfkey })
}
_this.newdata([{ ...data }], params, $event, xData);
_this.newdata([{ ...data }],[{ ...data }],params, $event, xData);
} else if (xData && xData.copy instanceof Function) {
const data2: any = {};
if (args.length > 0) {
......
@LOGIC/@UIACTION/系统预置/sys/数据导入/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (!xData || !(xData.importExcel instanceof Function) || !$event) {
return ;
......
@LOGIC/@UIACTION/系统预置/sys/新建/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,11 +9,11 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (_this.newdata && _this.newdata instanceof Function) {
const data: any = {};
_this.newdata([{ ...data }], params, $event, xData);
_this.newdata([{ ...data }],[{ ...data }], params, $event, xData);
} else {
_this.$Notice.error({ title: '错误', desc: 'newdata 视图处理逻辑不存在，请添加!' });
}
......
@LOGIC/@UIACTION/系统预置/sys/新建行/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
const data: any = {};
if (_this.newRow && _this.newRow instanceof Function) {
......
@LOGIC/@UIACTION/系统预置/sys/最后一个记录/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '暂不支持此项操作' });
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/查看/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -10,7 +10,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) {
return;
}
......
@LOGIC/@UIACTION/系统预置/sys/树刷新全部节点/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (xData && xData.refresh_all && xData.refresh_all instanceof Function) {
xData.refresh_all();
return;
......
@LOGIC/@UIACTION/系统预置/sys/树刷新父数据/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (xData && xData.refresh_parent && xData.refresh_parent instanceof Function) {
xData.refresh_parent();
return;
......
@LOGIC/@UIACTION/系统预置/sys/流程回退/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/界面分割栏/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '暂不支持此项操作' });
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/第一个记录/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '暂不支持此项操作' });
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/编辑/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -10,7 +10,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
if (args.length === 0) {
return;
}
......
@LOGIC/@UIACTION/系统预置/sys/编辑界面_数据导航功能/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '编辑界面_数据导航功能未支持' });
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/自定义/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '暂不支持此项操作' });
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/行编辑/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
xData.actualIsOpenEdit = !xData.actualIsOpenEdit;
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/视图向导/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,6 +9,6 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
this.$Notice.error({ title: '错误', desc: '暂不支持此项操作' });
}
\ No newline at end of file
@LOGIC/@UIACTION/系统预置/sys/过滤/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -9,7 +9,7 @@
* @param {*} [actionContext] 执行行为上下文
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
public ${item.getFullCodeName()}(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
const _this: any = this;
if (_this.hasOwnProperty('isExpandSearchForm')) {
_this.isExpandSearchForm = !_this.isExpandSearchForm;
......
@LOGIC/@VIEWLOGIC/新建/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -11,6 +11,17 @@
</#if>
</#compress>
</#macro>
<#macro getreskey appEntity curEntity>
<#compress>
<#if appEntity.getMajorPSAppDERSs()??>
<#list appEntity.getMajorPSAppDERSs() as appDeRs>
<#if appDeRs.getMinorPSAppDataEntity().getCodeName() == curEntity.getCodeName()>
${appDeRs.getPSDER1N().getPSPickupDEField().getCodeName()?lower_case}
</#if>
</#list>
</#if>
</#compress>
</#macro>
<#if item.getPSViewLogic?? && item.getPSViewLogic()??>
<#assign viewlogic = item.getPSViewLogic()/>
/**
......@@ -23,7 +34,7 @@
* @param {*} [xData]
* @memberof ${srfclassname('${view.name}')}
*/
protected newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
public newdata(args: any[],fullargs?:any[], params?: any, $event?: any, xData?: any) {
<#if viewlogic.isEnableWizardAdd()>
this.$Notice.warning({ title: '错误', desc: '向导添加未实现' });
<#elseif viewlogic.isEnableBatchAdd()>
......@@ -33,7 +44,8 @@
const batchAddPSAppViews=[
<#list batchAddPSAppViews as batchAddPSAppView>
{view:{viewname:'${srffilepath2(batchAddPSAppView.getCodeName())}',height: ${batchAddPSAppView.getHeight()?c},width: ${batchAddPSAppView.getWidth()?c},title: '${batchAddPSAppView.title}'},
res:<@getres tempView=batchAddPSAppView />}<#if batchAddPSAppView_has_next>,</#if>
res:<@getres tempView=batchAddPSAppView /><#if batchAddPSAppView.getPSAppDataEntity()??><#assign appDataEntity= batchAddPSAppView.getPSAppDataEntity()/>,
'resAppKey':'<@getreskey appEntity=appDataEntity curEntity=view.getPSAppDataEntity() />'</#if>}<#if batchAddPSAppView_has_next>,</#if>
</#list>
];
</#if>
......@@ -44,6 +56,9 @@
let openViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] !== this.context.srfparentdename));
})
let otherViewModel:any = batchAddPSAppViews.find((item:any) =>{
return (item.res && (item.res[0] == this.context.srfparentdename));
})
let container: Subject<any> = this.$appmodal.openModal(openViewModel.view, JSON.parse(JSON.stringify(this.context)), args[0]);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
......@@ -54,8 +69,10 @@
}
let requestParam:Array<any> = [];
result.datas.forEach((record:any) => {
record[this.appEntityService.APPDEKEY] = this.context['srfparentkey'];
requestParam.push(record);
let tempParam:any = {};
tempParam[otherViewModel.resAppKey] = this.context['srfparentkey'];
tempParam[openViewModel.resAppKey] = record.srfkey;
requestParam.push(tempParam);
});
this.appEntityService.createBatch(JSON.parse(JSON.stringify(this.context)),requestParam,true).then((response:any) =>{
if (!response || response.status !== 200) {
......
@LOGIC/@VIEWLOGIC/编辑/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -13,7 +13,7 @@
* @param {*} [xData]
* @memberof ${srfclassname('${view.name}')}
*/
protected ${item.name}(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
public ${item.name}(args: any[],fullargs?:any[],params?: any, $event?: any, xData?: any) {
<#if viewlogic.getOpenDataPSAppView()??>
<#assign dataview = viewlogic.getOpenDataPSAppView()/>
const data: any = {};
......
@LOGIC/@VIEWLOGIC/部件事件/LOGIC.vue.ftl
浏览文件 @ d597b5ee
......@@ -7,7 +7,7 @@
* @param {*} [$event]
* @memberof
*/
protected ${item.name}(params: any = {}, tag?: any, $event?: any) {
public ${item.name}(params: any = {}, tag?: any, $event?: any) {
<#-- 事件参数（未支持） -->
<#if item.getEventArg()?? && item.getEventArg()?length gt 0>
// 参数
......
@VIEW/@MACRO/GRID_VIEW-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -2,6 +2,14 @@
./LAYOUTPANEL_VIEW.template.ftl
</#ibizinclude>
<#assign import_block>
import CodeListService from "@service/app/codelist-service";
<#if view.getPSSysCounterRef() ?? && view.getPSSysCounterRef().getPSAppCounter()??>
<#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() />
import ${srfclassname('${appCounter.getCodeName()}')}CounterService from '@/counter/${srffilepath2(appCounter.getCodeName())}/${srffilepath2(appCounter.getCodeName())}-counter';
</#if>
</#assign>
<#ibizinclude>
./VIEW_HEADER-BASE.vue.ftl
</#ibizinclude>
......@@ -18,6 +26,10 @@ if(this.formDruipart){
}
</#assign>
<#assign mounted_block>
<#if view.isEnableQuickGroup()>_this.loadQuickGroupModel();</#if>
</#assign>
<#ibizinclude>
./VIEW_CONTENT-BASE.vue.ftl
</#ibizinclude>
......@@ -36,6 +48,17 @@ if(this.formDruipart){
public isSingleSelect: boolean = ${grid.isSingleSelect()?c};
</#if>
<#if view.getPSSysCounterRef() ?? && view.getPSSysCounterRef().getPSAppCounter()??>
<#assign appCounter = view.getPSSysCounterRef().getPSAppCounter() />
/**
* ${srfclassname('${appCounter.getCodeName()}')}CounterService计数器服务对象
*
* @type {${srfclassname('${appCounter.getCodeName()}')}CounterService}
* @memberof ${srfclassname('${view.name}')}Base
*/
public ${srfclassname('${appCounter.getCodeName()}')}counterservice: ${srfclassname('${appCounter.getCodeName()}')}CounterService = new ${srfclassname('${appCounter.getCodeName()}')}CounterService({ $store: this.$store });
</#if>
/**
* Vue声明周期
*
......@@ -152,6 +175,97 @@ if(this.formDruipart){
}
</#if>
<#if view.isEnableQuickGroup()>
/**
* 代码表服务对象
*
* @type {CodeListService}
* @memberof ${srfclassname('${view.name}')}Base
*/
public codeListService:CodeListService = new CodeListService({ $store: this.$store });
/**
* 快速分组数据对象
*
* @memberof ${srfclassname('${view.name}')}Base
*/
public qucikGroupData:any;
/**
* 快速分组是否有抛值
*
* @memberof ${srfclassname('${view.name}')}Base
*/
public isEmitQuickGroupValue:boolean = false;
/**
* 快速分组模型
*
* @memberof ${srfclassname('${view.name}')}Base
*/
public quickGroupModel:Array<any> = [];
/**
* 加载快速分组模型
*
* @memberof ${srfclassname('${view.name}')}Base
*/
public loadQuickGroupModel(){
<#if view.getQuickGroupPSCodeList()??>
<#assign codelist=view.getQuickGroupPSCodeList() />
let quickGroupCodeList:any = {tag:'${codelist.codeName}',codelistType:'${codelist.getCodeListType()}'};
if(quickGroupCodeList.tag && Object.is(quickGroupCodeList.codelistType,"STATIC")){
const codelist = this.$store.getters.getCodeList(quickGroupCodeList.tag);
if (codelist) {
this.quickGroupModel = [...JSON.parse(JSON.stringify(codelist.items))];
} else {
<#noparse>console.log(`----${quickGroupCodeList.tag}----代码表不存在`);</#noparse>
}
}else if(quickGroupCodeList.tag && Object.is(quickGroupCodeList.codelistType,"DYNAMIC")){
this.codeListService.getItems(quickGroupCodeList.tag,{},{}).then((res:any) => {
this.quickGroupModel = res;
}).catch((error:any) => {
<#noparse>console.log(`----${quickGroupCodeList.tag}----代码表不存在`);</#noparse>
});
}
</#if>
}
/**
* 快速分组值变化
*
* @memberof ${srfclassname('${view.name}')}Base
*/
public qucikGroupValueChange($event:any){
if($event && $event.data){
this.qucikGroupData = $event.data;
if(this.isEmitQuickGroupValue){
this.onSearch($event);
}
}
this.isEmitQuickGroupValue = true;
}
</#if>
<#if view.getQuickPSDESearchForm()??>
/**
* 快速搜索栏数据对象
*
* @memberof ${srfclassname('${view.name}')}Base
*/
public qucikFormData:any;
/**
* 快速搜索栏值变化
*
* @memberof ${srfclassname('${view.name}')}Base
*/
public qucikFormValueChange($event:any){
this.qucikFormData = $event;
this.onSearch($event);
}
</#if>
<#ibizinclude>
./VIEW_BOTTOM-BASE.vue.ftl
</#ibizinclude>
......
@VIEW/@MACRO/LIST_VIEW.vue.ftl
浏览文件 @ d597b5ee
......@@ -16,7 +16,7 @@
* @type {string}
* @memberof ${srfclassname('${view.name}')}
*/
protected query: string = '';
public query: string = '';
/**
* 是否展开搜索表单
......@@ -24,7 +24,7 @@
* @type {boolean}
* @memberof ${srfclassname('${view.name}')}
*/
protected isExpandSearchForm: boolean = ${view.isExpandSearchForm()?c};
public isExpandSearchForm: boolean = ${view.isExpandSearchForm()?c};
/**
* 快速搜索
......@@ -32,7 +32,7 @@
* @param {*} $event
* @memberof ${srfclassname('${view.name}')}
*/
protected onSearch($event: any): void {
public onSearch($event: any): void {
const refs: any = this.$refs;
if (refs.list) {
refs.list.load({});
......
@VIEW/@MACRO/PICKUPGRID_VIEW-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -15,7 +15,7 @@
* @type {string}
* @memberof ${srfclassname('${view.name}')}
*/
@Prop() protected selectedData?: string;
@Prop() public selectedData?: string;
/**
* 是否单选
......@@ -23,7 +23,7 @@
* @type {boolean}
* @memberof ${srfclassname('${view.name}')}
*/
@Prop() protected isSingleSelect?: boolean;
@Prop() public isSingleSelect?: boolean;
/**
* 搜索值
......@@ -31,7 +31,7 @@
* @type {string}
* @memberof ${srfclassname('${view.name}')}
*/
protected query: string = '';
public query: string = '';
/**
* 是否展开搜索表单
......@@ -39,7 +39,7 @@
* @type {boolean}
* @memberof ${srfclassname('${view.name}')}
*/
protected isExpandSearchForm: boolean = ${view.isExpandSearchForm()?c};
public isExpandSearchForm: boolean = ${view.isExpandSearchForm()?c};
/**
* 表格行数据默认激活模式
......@@ -50,7 +50,7 @@
* @type {(number | 0 | 1 | 2)}
* @memberof ${srfclassname('${view.name}')}
*/
protected gridRowActiveMode: number | 0 | 1 | 2 = ${view.getGridRowActiveMode()?c};
public gridRowActiveMode: number | 0 | 1 | 2 = ${view.getGridRowActiveMode()?c};
/**
* 快速搜索
......@@ -58,7 +58,7 @@
* @param {*} $event
* @memberof ${srfclassname('${view.name}')}
*/
protected onSearch($event: any): void {
public onSearch($event: any): void {
const refs: any = this.$refs;
if (refs.grid) {
refs.grid.load({});
......
@VIEW/@MACRO/VIEW_CONTENT-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -7,11 +7,11 @@
/**
* 视图引擎
*
* @protected
* @public
* @type {Engine}
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${engine.getName()?lower_case}: ${engine.getEngineType()}Engine = new ${engine.getEngineType()}Engine();
public ${engine.getName()?lower_case}: ${engine.getEngineType()}Engine = new ${engine.getEngineType()}Engine();
</#list>
</#if>
......@@ -35,10 +35,10 @@
/**
* 引擎初始化
*
* @protected
* @public
* @memberof ${srfclassname('${view.name}')}Base
*/
protected engineInit(): void {
public engineInit(): void {
<#if view.getPSAppViewEngines()??>
<#list view.getPSAppViewEngines() as engine>
this.${engine.getName()?lower_case}.init({
......
@VIEW/@MACRO/VIEW_DEINDEXPICKUPDATAVIEW_CONTENT-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -7,21 +7,21 @@
/**
* 视图引擎
*
* @private
* @public
* @type {Engine}
* @memberof ${srfclassname('${view.name}')}Base
*/
private ${engine.getName()?lower_case}: ${engine.getEngineType()}Engine = new ${engine.getEngineType()}Engine();
public ${engine.getName()?lower_case}: ${engine.getEngineType()}Engine = new ${engine.getEngineType()}Engine();
</#list>
</#if>
/**
* 引擎初始化
*
* @private
* @public
* @memberof ${srfclassname('${view.name}')}Base
*/
private engineInit(): void {
public engineInit(): void {
<#if view.getPSAppViewEngines()??>
<#list view.getPSAppViewEngines() as engine>
this.${engine.getName()?lower_case}.init({
......@@ -59,7 +59,7 @@
* @type {*}
* @memberof ${srfclassname('${view.name}')}Base
*/
protected context:any = {};
public context:any = {};
/**
* 视图参数
......@@ -67,15 +67,15 @@
* @type {*}
* @memberof ${srfclassname('${view.name}')}Base
*/
protected viewparams:any = {};
public viewparams:any = {};
/**
* 解析视图参数
*
* @private
* @public
* @memberof ${srfclassname('${view.name}')}Base
*/
private parseViewParam(): void {
public parseViewParam(): void {
if (!this.viewDefaultUsage && this.viewdata && !Object.is(this.viewdata, '')) {
Object.assign(this.context, JSON.parse(this.viewdata));
<#if self_viewparam??>
......@@ -106,7 +106,7 @@
*
* @memberof ${srfclassname('${view.name}')}Base
*/
protected created() {
public created() {
this.afterCreated();
}
......@@ -115,7 +115,7 @@
*
* @memberof ${srfclassname('${view.name}')}Base
*/
protected afterCreated(){
public afterCreated(){
const secondtag = this.$util.createUUID();
this.$store.commit('viewaction/createdView', { viewtag: this.viewtag, secondtag: secondtag });
this.viewtag = secondtag;
......@@ -128,7 +128,7 @@
*
* @memberof ${srfclassname('${view.name}')}Base
*/
protected beforeDestroy() {
public beforeDestroy() {
this.$store.commit('viewaction/removeView', this.viewtag);
}
......@@ -137,7 +137,7 @@
*
* @memberof ${srfclassname('${view.name}')}Base
*/
protected mounted() {
public mounted() {
this.afterMounted();
}
......@@ -146,7 +146,7 @@
*
* @memberof ${srfclassname('${view.name}')}Base
*/
protected afterMounted(){
public afterMounted(){
<#if view.getPSControls()??>
<#list view.getPSControls() as ctrl>
......@@ -169,7 +169,7 @@
* @param {*} $event
* @memberof ${srfclassname('${view.name}')}Base
*/
protected ${ctrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
public ${ctrl.name}_${eventName?lower_case}($event: any, $event2?: any) {
<#if ctrl.getPSControlLogics(eventName)??>
<#list ctrl.getPSControlLogics(eventName) as ctrlLogic>
<#if ctrlLogic.getLogicType() == "APPVIEWENGINE" && ctrlLogic.getPSAppViewEngine()??>
......@@ -218,7 +218,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
* @param {any[]} args
* @memberof ${srfclassname('${view.name}')}Base
*/
protected closeView(args: any[]): void {
public closeView(args: any[]): void {
let _view: any = this;
if (_view.viewdata) {
_view.$emit('viewdataschange', [args]);
......@@ -237,7 +237,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
*
* @memberof ${srfclassname('${view.name}')}Base
*/
protected destroyed(){
public destroyed(){
this.afterDestroyed();
}
......@@ -246,7 +246,7 @@ ${P.getLogicCode(uiAction, "LOGIC.vue").code}
*
* @memberof ${srfclassname('${view.name}')}Base
*/
protected afterDestroyed(){
public afterDestroyed(){
if(this.viewDefaultUsage){
let localStoreLength = Object.keys(localStorage);
if(localStoreLength.length > 0){
......
@VIEW/@MACRO/VIEW_HEADER-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -37,7 +37,7 @@ ${import_block}
*/
@Component({})
@VueLifeCycleProcessing
export default class ${srfclassname(view.name)}Base extends <#if view_base_name??>${view_base_name}<#else>Vue</#if> {
export default class ${srfclassname(view.name)}Base extends <#if view_base_name??>${view_base_name}<#else>ViewBase</#if> {
<#if view.getPSAppDataEntity?? && view.getPSAppDataEntity()??>
<#assign appde = view.getPSAppDataEntity()/>
......@@ -88,7 +88,7 @@ export default class ${srfclassname(view.name)}Base extends <#if view_base_name?
protected customViewNavContexts:any ={
<#if view.getPSAppViewNavContexts()??>
<#list view.getPSAppViewNavContexts() as viewNavContext>
"${viewNavContext.getKey()?lower_case}":{"isRawValue":${viewNavContext.isRawValue()?c},"value":"${viewNavContext.getValue()?lower_case}"}<#if viewNavContext_has_next>,</#if>
"${viewNavContext.getKey()}":{"isRawValue":${viewNavContext.isRawValue()?c},"value":"${viewNavContext.getValue()}"}<#if viewNavContext_has_next>,</#if>
</#list>
</#if>
};
......@@ -102,7 +102,7 @@ export default class ${srfclassname(view.name)}Base extends <#if view_base_name?
protected customViewParams:any ={
<#if view.getPSAppViewNavParams()??>
<#list view.getPSAppViewNavParams() as viewNavParam>
"${viewNavParam.getKey()?lower_case}":{"isRawValue":${viewNavParam.isRawValue()?c},"value":"${viewNavParam.getValue()?lower_case}"}<#if viewNavParam_has_next>,</#if>
"${viewNavParam.getKey()}":{"isRawValue":${viewNavParam.isRawValue()?c},"value":"${viewNavParam.getValue()}"}<#if viewNavParam_has_next>,</#if>
</#list>
</#if>
};
......
@VIEW/@MACRO/WF_VIEW_CONTENT.vue.ftl
浏览文件 @ d597b5ee
......@@ -7,7 +7,7 @@
*
* @memberof ${srfclassname('${view.name}')}
*/
protected loadWFLinks(): void {
public loadWFLinks(): void {
const url = '${app.getPKGCodeName()?lower_case}/${de.getPSSystemModule().codeName?lower_case}/${de.codeName?lower_case}/wflinks';
const arg: any = {};
if (this.engine && this.engine.viewdata && this.engine.viewdata.srfkey) {
......@@ -35,7 +35,7 @@
* @param {*} $event
* @memberof ${srfclassname('${view.name}')}
*/
protected wflink_click(item: any, $event: any): void {
public wflink_click(item: any, $event: any): void {
if (Object.is(item.type, 'FRONT')) {
this.wflink_front(item, $event);
} else if (Object.is(item.type, 'BACKEND')) {
......@@ -50,7 +50,7 @@
* @param {*} $event
* @memberof ${srfclassname('${view.name}')}
*/
protected wflink_front(item: any, $event: any): void {
public wflink_front(item: any, $event: any): void {
if (!item.page || Object.is(item.page, '')) {
return;
}
......@@ -100,7 +100,7 @@
* @param {*} [data]
* @memberof ${srfclassname('${view.name}')}
*/
protected wflink_backend(item: any, $event: any, data?: any): void {
public wflink_backend(item: any, $event: any, data?: any): void {
const _this: any = this;
this.wf_Step(item, $event, data).then((response: any) => {
if (!response.status || response.status !== 200) {
......@@ -129,14 +129,14 @@
/**
* 工作流步骤
*
* @private
* @public
* @param {*} item
* @param {*} $event
* @param {*} [data]
* @returns {Promise<any>}
* @memberof ${srfclassname('${view.name}')}
*/
private async wf_Step(item: any, $event: any, data?: any): Promise<any> {
public async wf_Step(item: any, $event: any, data?: any): Promise<any> {
const arg: any = { args: {} };
if (data) {
Object.assign(arg, data);
......
@VIEW/实体工作流代理应用启动视图/VIEW-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -5,7 +5,7 @@
*
* @memberof @memberof ${srfclassname('${view.name}')}Base
*/
protected iframeUrl:string ="";
public iframeUrl:string ="";
/**
* 获取iframe路径
......
@VIEW/实体工作流代理数据视图/VIEW-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -5,7 +5,7 @@
*
* @memberof @memberof ${srfclassname('${view.name}')}Base
*/
protected iframeUrl:string ="";
public iframeUrl:string ="";
/**
* 获取iframe路径
......
@VIEW/实体工作流动态导航表格视图/VIEW-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -5,7 +5,7 @@
* @type {number}
* @memberof ${srfclassname('${view.codeName}')}Base
*/
protected split: number = 0.2;
public split: number = 0.2;
/**
* 树导航栏数据
......@@ -13,7 +13,7 @@
* @type {any}
* @memberof ${srfclassname('${view.codeName}')}Base
*/
protected wfStepModel: Array<any> = [];
public wfStepModel: Array<any> = [];
/**
* 是否展开搜索表单
......@@ -21,7 +21,7 @@
* @type {any}
* @memberof ${srfclassname('${view.codeName}')}Base
*/
protected isExpandSearchForm:boolean = true;
public isExpandSearchForm:boolean = true;
/**
* 是否单选
......@@ -29,7 +29,7 @@
* @type {any}
* @memberof ${srfclassname('${view.codeName}')}Base
*/
protected isSingleSelect:boolean = true;
public isSingleSelect:boolean = true;
/**
* 左侧树的默认配置
......@@ -37,7 +37,7 @@
* @type {any}
* @memberof ${srfclassname('${view.codeName}')}Base
*/
protected defaultProps:any ={
public defaultProps:any ={
children: 'children',
label: 'userTaskName'
};
......@@ -48,14 +48,14 @@
* @type {any}
* @memberof ${srfclassname('${view.codeName}')}Base
*/
protected curSelectedNode:any;
public curSelectedNode:any;
/**
* 获取树导航栏数据
*
* @memberof ${srfclassname('${view.codeName}')}Base
*/
protected getWFStepModel():Promise<any>{
public getWFStepModel():Promise<any>{
return new Promise((resolve:any, reject:any) =>{
this.appEntityService.WFGetWFStep().then((response:any) =>{
if (response && response.status === 200) {
......@@ -86,7 +86,7 @@
* @type {any}
* @memberof ${srfclassname('${view.codeName}')}Base
*/
protected handleNodeClick(data:any) {
public handleNodeClick(data:any) {
this.curSelectedNode = data;
this.setTreeNodeHighLight(this.curSelectedNode);
Object.assign(this.viewparams,{'userTaskId':data['userTaskId'],'processDefinitionKey':data['processDefinitionKey']});
......@@ -99,13 +99,48 @@
* @param {*} data
* @memberof ${srfclassname('${view.codeName}')}Base
*/
protected setTreeNodeHighLight(data: any): void {
public setTreeNodeHighLight(data: any): void {
this.$nextTick(() =>{
const tree: any = this.$refs.tree;
tree.setCurrentKey(data.userTaskId);
})
}
<#if view.hasPSControl('grid')>
<#assign grid = view.getPSControl('grid')>
/**
* 刷新数据
*
* @readonly
* @type {(number | null)}
* @memberof ${srfclassname('${view.name}')}Base
*/
get refreshdata(): number | null {
return this.$store.getters['viewaction/getRefreshData'](this.viewtag);
}
/**
* 监控数据变化
*
* @param {*} newVal
* @param {*} oldVal
* @returns
* @memberof ${srfclassname('${view.name}')}Base
*/
@Watch('refreshdata')
onRefreshData(newVal: any, oldVal: any) {
if (newVal === null || newVal === undefined) {
return;
}
if (newVal === 0) {
return;
}
const grid: any = this.$refs.${grid.name};
if (grid) {
grid.load({});
}
}
</#if>
</#assign>
<#ibizinclude>
../@MACRO/VIEW-BASE.vue.ftl
......
@VIEW/实体数据多项选择视图/VIEW-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -33,7 +33,7 @@
* @type {string}
* @memberof ${srfclassname('${view.name}')}
*/
protected selectedData: string = "";
public selectedData: string = "";
/**
* 是否初始化已选中项
......@@ -41,8 +41,8 @@
* @type {any[]}
* @memberof ${srfclassname('${view.name}')}
*/
public isInitSelected: boolean = false;
public isInitSelected:boolean = false;
/**
* 是否单选
*
......@@ -103,6 +103,7 @@
}
const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
this.containerModel.view_leftbtn.disabled = !removeSelect;
this.selectedData = JSON.stringify(this.viewSelections);
}
/**
......@@ -123,6 +124,7 @@
});
const removeSelect: boolean = this.viewSelections.some((selection: any) => selection._select);
this.containerModel.view_leftbtn.disabled = !removeSelect;
this.selectedData = JSON.stringify(this.viewSelections);
}
/**
......@@ -135,14 +137,18 @@
if (!Object.is(model.type, 'PICKUPVIEWPANEL')) {
return;
}
let newSelections:any[] = [];
model.selections.forEach((item: any) => {
const index: number = this.viewSelections.findIndex((selection: any) => Object.is(item.srfkey, selection.srfkey));
if (index === -1) {
let _item: any = { ...JSON.parse(JSON.stringify(item)) };
Object.assign(_item, { _select: false })
this.viewSelections.push(_item);
newSelections.push(_item);
}else{
newSelections.push(this.viewSelections[index]);
}
});
this.viewSelections = newSelections;
});
}
......@@ -154,6 +160,7 @@
public onCLickAllLeft():void {
this.viewSelections = [];
this.containerModel.view_leftbtn.disabled = true;
this.selectedData = JSON.stringify(this.viewSelections);
}
/**
......
@VIEW/实体数据选择视图/VIEW-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -16,7 +16,7 @@
* @type {string}
* @memberof ${srfclassname('${view.name}')}
*/
protected selectedData: string = "";
public selectedData: string = "";
/**
* 视图选中数据
......
@VIEW/实体选择树视图（部件视图）/VIEW-BASE.vue.ftl
浏览文件 @ d597b5ee
......@@ -16,7 +16,7 @@
* @type {string}
* @memberof ${srfclassname('${view.name}')}
*/
@Prop() protected selectedData?: string;
@Prop() public selectedData?: string;
/**
* 是否单选
......@@ -24,7 +24,7 @@
* @type {boolean}
* @memberof ${srfclassname('${view.name}')}
*/
@Prop() protected isSingleSelect?: boolean;
@Prop() public isSingleSelect?: boolean;
/**
* 是否显示按钮
......
APP/public/assets/json/data-dictionary.json.ftl
浏览文件 @ d597b5ee
......@@ -15,6 +15,18 @@ TARGET=PSSYSAPP
"id": "${codeitem.getValue()?j_string}",
"label": "${codeitem.getText()?j_string}",
"text": "${codeitem.getText()?j_string}",
<#if codeitem.getPSSysImage()??>
<#assign sysimage = codeitem.getPSSysImage()/>
<#if sysimage.getImagePath() == "">
"iconcls":"${sysimage.getCssClass()}",
<#else>
"icon":"${sysimage.getImagePath()}",
</#if>
</#if>
"data":<#if codeitem.getData() !="">${codeitem.getData()}<#else>""</#if>,
<#if codeitem.getCodeName()??>
"codename":"${codeitem.getCodeName()}",
</#if>
<#if codeitem.getColor?? && codeitem.getColor()??>
"color": "${codeitem.getColor()?j_string}",
</#if>
......
APP/src/codelist/%APP_CODELIST%.ts.ftl
浏览文件 @ d597b5ee
......@@ -90,12 +90,12 @@ export default class ${srfclassname('${item.getCodeName()}')} {
/**
* 处理数据
*
* @private
* @public
* @param {any[]} items
* @returns {any[]}
* @memberof ${srfclassname('${item.getCodeName()}')}
*/
private doItems(items: any[]): any[] {
public doItems(items: any[]): any[] {
let _items: any[] = [];
items.forEach((item: any) => {
let itemdata:any = {};
......@@ -181,12 +181,12 @@ export default class ${srfclassname('${item.getCodeName()}')} {
/**
* 处理数据
*
* @private
* @public
* @param {any[]} items
* @returns {any[]}
* @memberof ${srfclassname('${item.getCodeName()}')}
*/
private doItems(items: any[]): any[] {
public doItems(items: any[]): any[] {
let _items: any[] = [];
items.forEach((item: any) => {
let itemdata:any = {};
......
APP/src/counter/%APP_COUNTER%/%APP_COUNTER%-counter-base.ts.ftl
浏览文件 @ d597b5ee
......@@ -16,7 +16,7 @@ export default class ${srfclassname('${item.getCodeName()}')}CounterServiceBase
* @param {*} [opts={}]
* @memberof ${srfclassname('${item.getCodeName()}')}CounterServiceBase
*/
protected counterData:any ={};
public counterData:any ={};
/**
* Creates an instance of ${srfclassname('${item.getCodeName()}')}CounterServiceBase.
......@@ -38,7 +38,7 @@ export default class ${srfclassname('${item.getCodeName()}')}CounterServiceBase
* @param {*} [opts={}]
* @memberof ${srfclassname('${item.getCodeName()}')}CounterServiceBase
*/
protected initCounterData(){
public initCounterData(){
this.fetchCounterData();
}
......@@ -48,7 +48,7 @@ export default class ${srfclassname('${item.getCodeName()}')}CounterServiceBase
* @param {*} [opts={}]
* @memberof ${srfclassname('${item.getCodeName()}')}CounterServiceBase
*/
protected async fetchCounterData(){
public async fetchCounterData(){
this.counterData = {
item1:parseInt((Math.random()*10)+''),
item2:parseInt((Math.random()*100)+''),
......@@ -68,7 +68,7 @@ export default class ${srfclassname('${item.getCodeName()}')}CounterServiceBase
*
* @memberof ${srfclassname('${item.getCodeName()}')}CounterServiceBase
*/
protected async refreshData(){
public async refreshData(){
const res = await this.fetchCounterData();
return res;
}
......
APP/src/environments/environment.ts.ftl
浏览文件 @ d597b5ee
......@@ -24,8 +24,8 @@ export const Environment = {
uniteAddress: "http://172.16.100.202:8114",
// 是否为开发模式
devMode: true,
// 项目地址
ProjectUrl: "http://172.16.180.229/wangxiang1/VUE_R7_FTL",
// 项目模板地址
ProjectUrl: "http://demo.ibizlab.cn/ibizr7pfstdtempl/ibizvuer7plus",
// 配置平台地址
StudioUrl: "http://neko.org.cn:3333/",
// 方案标识
......
APP/src/mock/codelist/codelist.ts.ftl
浏览文件 @ d597b5ee
......@@ -24,6 +24,18 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
id: '${codeitem.getValue()?j_string}',
label: '${codeitem.getText()?j_string}',
text: '${codeitem.getText()?j_string}',
<#if codeitem.getPSSysImage()??>
<#assign sysimage = codeitem.getPSSysImage()/>
<#if sysimage.getImagePath() == "">
"iconcls":"${sysimage.getCssClass()}",
<#else>
"icon":"${sysimage.getImagePath()}",
</#if>
</#if>
"data":<#if codeitem.getData() != "">${codeitem.getData()}<#else>""</#if>,
<#if codeitem.getCodeName()??>
"codename":"${codeitem.getCodeName()}",
</#if>
<#if codeitem.getColor?? && codeitem.getColor()??>
"color": "${codeitem.getColor()?j_string}",
</#if>
......
APP/src/uiservice/%DE_PKGPATH%/%DE_PKGPATH%-ui-service-base.ts.ftl
浏览文件 @ d597b5ee
......@@ -41,49 +41,49 @@ export default class ${srfclassname('${item.getCodeName()}')}UIServiceBase exten
*
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected isEnableWorkflow:boolean = false;
public isEnableWorkflow:boolean = false;
/**
* 当前UI服务对应的数据服务对象
*
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected dataService:${srfclassname('${item.getCodeName()}')}Service = new ${srfclassname('${item.getCodeName()}')}Service();
public dataService:${srfclassname('${item.getCodeName()}')}Service = new ${srfclassname('${item.getCodeName()}')}Service();
/**
* 所有关联视图
*
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected allViewMap: Map<string, Object> = new Map();
public allViewMap: Map<string, Object> = new Map();
/**
* 状态值
*
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected stateValue: number = <#if curWorkFlow?? && curWorkFlow.getEntityWFState()??>${curWorkFlow.getEntityWFState()}<#else>0</#if>;
public stateValue: number = <#if curWorkFlow?? && curWorkFlow.getEntityWFState()??>${curWorkFlow.getEntityWFState()}<#else>0</#if>;
/**
* 状态属性
*
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected stateField: string = "<#if curWorkFlow?? && curWorkFlow.getWFStatePSDEField()??>${curWorkFlow.getWFStatePSDEField().getCodeName()?lower_case}</#if>";
public stateField: string = "<#if curWorkFlow?? && curWorkFlow.getWFStatePSDEField()??>${curWorkFlow.getWFStatePSDEField().getCodeName()?lower_case}</#if>";
/**
* 主状态属性集合
*
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected mainStateFields:Array<any> = [<#if item.getPSDataEntity?? && item.getPSDataEntity()?? && item.getPSDataEntity().getDEMainStateDEFields()??><#list item.getPSDataEntity().getDEMainStateDEFields() as demsField>'${demsField.getCodeName()?lower_case}'<#if demsField_has_next>,</#if></#list></#if>];
public mainStateFields:Array<any> = [<#if item.getPSDataEntity?? && item.getPSDataEntity()?? && item.getPSDataEntity().getDEMainStateDEFields()??><#list item.getPSDataEntity().getDEMainStateDEFields() as demsField>'${demsField.getCodeName()?lower_case}'<#if demsField_has_next>,</#if></#list></#if>];
/**
* 主状态集合Map
*
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected allDeMainStateMap:Map<string,string> = new Map();
public allDeMainStateMap:Map<string,string> = new Map();
/**
* Creates an instance of ${srfclassname('${item.getCodeName()}')}UIServiceBase.
......@@ -173,7 +173,7 @@ ${P.getLogicCode(appdeUIAction, "LOGIC.vue").code}
*
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected getRealDEType(entity:any){
public getRealDEType(entity:any){
}
......@@ -185,7 +185,7 @@ ${P.getLogicCode(appdeUIAction, "LOGIC.vue").code}
* @param bWFMode 是否工作流模式
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
public async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
let strPDTParam:string = '';
if (bDataInWF) {
// 判断数据是否在流程中
......@@ -302,7 +302,7 @@ ${P.getLogicCode(appdeUIAction, "LOGIC.vue").code}
* @param curData 当前数据
* @memberof ${srfclassname('${item.getCodeName()}')}UIServiceBase
*/
protected async getDEMainStateTag(curData:any){
public async getDEMainStateTag(curData:any){
if(this.mainStateFields.length === 0) return null;
this.mainStateFields.forEach((singleMainField:any) =>{
......
APP/src/utilservice/%APP_UTIL%/%APP_UTIL%-util-service-base.ts.ftl
浏览文件 @ d597b5ee
......@@ -22,7 +22,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UtilServiceBase ext
*
* @memberof ${srfclassname('${item.getCodeName()}')}UtilServiceBase
*/
protected stoageDataService: ${srfclassname('${stoageDataEntity.getCodeName()}')}Service = new ${srfclassname('${stoageDataEntity.getCodeName()}')}Service();
public stoageDataService: ${srfclassname('${stoageDataEntity.getCodeName()}')}Service = new ${srfclassname('${stoageDataEntity.getCodeName()}')}Service();
</#if>
/**
......@@ -30,28 +30,28 @@ export default class ${srfclassname('${item.getCodeName()}')}UtilServiceBase ext
*
* @memberof ${srfclassname('${item.getCodeName()}')}UtilServiceBase
*/
protected loadAction: string = "${item.getGetPSAppDEAction().getCodeName()}";
public loadAction: string = "${item.getGetPSAppDEAction().getCodeName()}";
/**
* 建立数据行为
*
* @memberof ${srfclassname('${item.getCodeName()}')}UtilServiceBase
*/
protected createAction: string = "${item.getCreatePSAppDEAction().getCodeName()}";
public createAction: string = "${item.getCreatePSAppDEAction().getCodeName()}";
/**
* 更新数据行为
*
* @memberof ${srfclassname('${item.getCodeName()}')}UtilServiceBase
*/
protected updateAction: string = "${item.getUpdatePSAppDEAction().getCodeName()}";
public updateAction: string = "${item.getUpdatePSAppDEAction().getCodeName()}";
/**
* 删除数据行为
*
* @memberof ${srfclassname('${item.getCodeName()}')}UtilServiceBase
*/
protected removeAction: string = "${item.getRemovePSAppDEAction().getCodeName()}";
public removeAction: string = "${item.getRemovePSAppDEAction().getCodeName()}";
/**
* Creates an instance of ${srfclassname('${item.getCodeName()}')}UtilServiceBase.
......@@ -88,7 +88,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UtilServiceBase ext
* @param isloading 是否加载
* @memberof ${srfclassname('${item.getCodeName()}')}UtilServiceBase
*/
protected loadModelData(context: any = {},data: any = {}, isloading?: boolean): Promise<any>{
public loadModelData(context: any = {},data: any = {}, isloading?: boolean): Promise<any>{
<#-- const {context:contextResult,data:dataResult} = this.handlePreParam(context,data); -->
return new Promise((resolve: any, reject: any) => {
let dataStr = window.localStorage.getItem(data.modelid);
......@@ -122,7 +122,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UtilServiceBase ext
* @param isloading 是否加载
* @memberof ${srfclassname('${item.getCodeName()}')}UtilServiceBase
*/
protected saveModelData(context: any = {},action:string,data: any = {}, isloading?: boolean):Promise<any>{
public saveModelData(context: any = {},action:string,data: any = {}, isloading?: boolean):Promise<any>{
<#-- const {context:contextResult,data:dataResult} = this.handlePreParam(context,data); -->
return new Promise((resolve: any, reject: any) => {
window.localStorage.setItem(data.modelid, JSON.stringify(data));
......@@ -144,7 +144,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UtilServiceBase ext
* @param isloading 是否加载
* @memberof ${srfclassname('${item.getCodeName()}')}UtilServiceBase
*/
protected createdModelData(context: any = {},data: any = {}, isloading?: boolean):Promise<any>{
public createdModelData(context: any = {},data: any = {}, isloading?: boolean):Promise<any>{
const {context:contextResult,data:dataResult} = this.handlePreParam(context,data);
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
......@@ -166,7 +166,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UtilServiceBase ext
* @param isloading 是否加载
* @memberof ${srfclassname('${item.getCodeName()}')}UtilServiceBase
*/
protected updateModelData(context: any = {},data: any = {}, isloading?: boolean):Promise<any>{
public updateModelData(context: any = {},data: any = {}, isloading?: boolean):Promise<any>{
const {context:contextResult,data:dataResult} = this.handlePreParam(context,data);
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
......
CHANGELOG.md
浏览文件 @ d597b5ee
## v7.0.0-alpha.2 [2020-5-7]
## v7.0.0-alpha.3 [2020-5-14]
### Bug修复
分页导航栏添加图标配置
分页导航栏传递srfparentdename和srfparentkey问题
提交流程、启动流程刷新表格数据问题
修复视图自定义导航参数大小写问题
修复批添加功能
修复树部件查询数据集合异常处理
修复图表排序问题
修复富文本国际化切换失效
修复代码表代码项图标和数据
修复数据多项选择视图UI逻辑不匹配
修复列表高度异常
修复树节点上下文
工具栏按钮样式支持
修复表格（视图）高度，滚动条问题
修复表单loaddraft服务仿真主键丢失修复
修复user显示名称逻辑
修复issue地址为正式环境地址
模态边距样式调整
### 功能新增及优化
#### 模板
表格文件上传信息显示
搜索面板布局优化
批添加、批删除
表格checkbox宽度优化
富文本信息模式
选择类视图不显示标题
更新默认值
补充树节点关系导航上下文，导航参数上下文
模态时视图样式调整
看板视图默认卡片模式，支持无缝模式
增加菜单权限
树导航样式调整
增加快速分组搜索或快速搜索表单功能
表格样式调整
增加表格内置工具栏
拖拽样式修改
代码表多选控件分割符从分号转化为逗号
#### 基础文件
看板视图默认卡片模式，支持无缝模式
登录页面调整
增加数据选择类插件表格呈现插件
## v7.0.0-alpha.2 [2020-5-7]
### Bug修复
分页导航栏添加图标配置
### 功能新增及优化
#### 模板
表格文件上传信息显示
用户名识别
批添加、批删除
实体工作流动态视图
工具栏按钮样式支持
实体工作流动态导航表格视图
模态边距样式调整
富文本信息模式
更新默认值
## v7.0.0-alpha.1 [2020-4-29]
#### 基础文件
初始化文件
表格文件上传信息显示
实体工作流动态视图
实体工作流动态导航表格视图
## v7.0.0-alpha.1 [2020-4-29]
初始化文件
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或