zhouweidong 发布系统代码 [后台服务，演示应用]

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_BO_CN_base.ts

@@ -499,9 +499,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
-			tbitem9_saveandstart: {
-				caption: commonLogic.appcommonhandle("开始",null),
-				tip: commonLogic.appcommonhandle("开始",null),
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("开始流程",null),
+				tip: commonLogic.appcommonhandle("开始流程",null),
 			},
 		},
 		usr1114433946wfdynaeditviewtoolbar_toolbar: {

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_en_US_base.ts

@@ -499,9 +499,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
-			tbitem9_saveandstart: {
-				caption: commonLogic.appcommonhandle("开始",null),
-				tip: commonLogic.appcommonhandle("开始",null),
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("Start workflow",null),
+				tip: commonLogic.appcommonhandle("Start workflow",null),
 			},
 		},
 		usr1114433946wfdynaeditviewtoolbar_toolbar: {

app_Web/src/locale/lanres/entities/ibizsample0021/ibizsample0021_zh_CN_base.ts

@@ -499,9 +499,9 @@ function getLocaleResourceBase(){
 				caption: commonLogic.appcommonhandle("-",null),
 				tip: commonLogic.appcommonhandle("",null),
 			},
-			tbitem9_saveandstart: {
-				caption: commonLogic.appcommonhandle("开始",null),
-				tip: commonLogic.appcommonhandle("开始",null),
+			tbitem9: {
+				caption: commonLogic.appcommonhandle("开始流程",null),
+				tip: commonLogic.appcommonhandle("开始流程",null),
 			},
 		},
 		usr1114433946wfdynaeditviewtoolbar_toolbar: {

app_Web/src/pages/sample/ibizsample0021-edit-view/ibizsample0021-edit-view-base.vue

@@ -29,11 +29,11 @@
         </tooltip>
         <span class='seperator'>|</span>
         <tooltip :transfer="true" :max-width="600">
-                <i-button v-show="toolBarModels.tbitem9_saveandstart.visabled" :disabled="toolBarModels.tbitem9_saveandstart.disabled" class='' v-button-loading:i-button @click="toolbar_click({ tag: 'tbitem9_saveandstart' }, $event)">
-                    <i class=''></i>
-                    <span class='caption'>{{$t('entities.ibizsample0021.editviewtoolbar_toolbar.tbitem9_saveandstart.caption')}}</span>
+                <i-button v-show="toolBarModels.tbitem9.visabled" :disabled="toolBarModels.tbitem9.disabled" class='' v-button-loading:i-button @click="toolbar_click({ tag: 'tbitem9' }, $event)">
+                    <i class='fa fa-play'></i>
+                    <span class='caption'>{{$t('entities.ibizsample0021.editviewtoolbar_toolbar.tbitem9.caption')}}</span>
                 </i-button>
-            <div slot='content'>{{$t('entities.ibizsample0021.editviewtoolbar_toolbar.tbitem9_saveandstart.tip')}}</div>
+            <div slot='content'>{{$t('entities.ibizsample0021.editviewtoolbar_toolbar.tbitem9.tip')}}</div>
         </tooltip>
     </div>
 </div>
@@ -308,7 +308,7 @@ export default class IBIZSample0021EditViewBase extends Vue {
         tbitem5: { name: 'tbitem5', actiontarget: 'NONE', caption: '保存并关闭', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndExit', target: '' } },
 
         tbitem8: {  name: 'tbitem8', type: 'SEPERATOR', visabled: true, dataaccaction: '', uiaction: { } },
-        tbitem9_saveandstart: { name: 'tbitem9_saveandstart', actiontarget: 'NONE', caption: '开始', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndStart', target: '' } },
+        tbitem9: { name: 'tbitem9', actiontarget: 'NONE', caption: '开始流程', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'SaveAndStart', target: '' } },
 
     };
 
@@ -708,8 +708,8 @@ export default class IBIZSample0021EditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem5')) {
             this.toolbar_tbitem5_click(null, '', $event2);
         }
-        if (Object.is($event.tag, 'tbitem9_saveandstart')) {
-            this.toolbar_tbitem9_saveandstart_click(null, '', $event2);
+        if (Object.is($event.tag, 'tbitem9')) {
+            this.toolbar_tbitem9_click(null, '', $event2);
         }
         if (Object.is($event.tag, 'tbitem15')) {
             this.toolbar_tbitem15_click(null, '', $event2);
@@ -839,7 +839,7 @@ export default class IBIZSample0021EditViewBase extends Vue {
      * @param {*} [$event]
      * @memberof 
      */
-    public toolbar_tbitem9_saveandstart_click(params: any = {}, tag?: any, $event?: any) {
+    public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
         // 参数
         // 取数
         let datas: any[] = [];
@@ -967,7 +967,7 @@ export default class IBIZSample0021EditViewBase extends Vue {
         }
     }
     /**
-     * 开始
+     * 开始流程
      *
      * @param {any[]} args 当前数据
      * @param {any} contextJO 行为附加上下文

app_Web/src/pages/sample/ibizsample0021-wfdyna-edit-view/ibizsample0021-wfdyna-edit-view-base.vue

@@ -680,6 +680,9 @@ export default class IBIZSample0021WFDynaEditViewBase extends Vue {
         if (Object.is($event.tag, 'tbitem5')) {
             this.toolbar_tbitem5_click(null, '', $event2);
         }
+        if (Object.is($event.tag, 'tbitem9')) {
+            this.toolbar_tbitem9_click(null, '', $event2);
+        }
         if (Object.is($event.tag, 'tbitem15')) {
             this.toolbar_tbitem15_click(null, '', $event2);
         }
@@ -772,6 +775,34 @@ export default class IBIZSample0021WFDynaEditViewBase extends Vue {
         this.SaveAndExit(datas, contextJO,paramJO,  $event, xData,this,"IBIZSample0021");
     }
 
+    /**
+     * 逻辑事件
+     *
+     * @param {*} [params={}]
+     * @param {*} [tag]
+     * @param {*} [$event]
+     * @memberof 
+     */
+    public toolbar_tbitem9_click(params: any = {}, tag?: any, $event?: any) {
+        // 参数
+        // 取数
+        let datas: any[] = [];
+        let xData: any = null;
+        // _this 指向容器对象
+        const _this: any = this;
+        let paramJO:any = {};
+        let contextJO:any = {};
+        xData = this.$refs.form;
+        if (xData.getDatas && xData.getDatas instanceof Function) {
+            datas = [...xData.getDatas()];
+        }
+        if(params){
+          datas = [params];
+        }
+        // 界面行为
+        this.SaveAndStart(datas, contextJO,paramJO,  $event, xData,this,"IBIZSample0021");
+    }
+
     /**
      * 逻辑事件
      *
@@ -859,6 +890,125 @@ export default class IBIZSample0021WFDynaEditViewBase extends Vue {
             });
         }
     }
+    /**
+     * 开始流程
+     *
+     * @param {any[]} args 当前数据
+     * @param {any} contextJO 行为附加上下文
+     * @param {*} [params] 附加参数
+     * @param {*} [$event] 事件源
+     * @param {*} [xData]  执行行为所需当前部件
+     * @param {*} [actionContext]  执行行为上下文
+     * @memberof IBIZSample0021WFDynaEditViewBase
+     */
+    public SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
+        const that: any = this;
+        if (!xData || !(xData.wfstart instanceof Function)) {
+            return;
+        }
+        let validateStatus: boolean = true;
+        if (xData.formValidateStatus && xData.formValidateStatus instanceof Function) {
+            validateStatus = xData.formValidateStatus();
+        }
+        if (!validateStatus) {
+            return;
+        }
+        const startWorkFlow: Function = (param: any, localdata: any) => {
+            xData.wfstart(param,localdata).then((response: any) => {
+                if (!response || response.status !== 200) {
+                    return;
+                }
+                const { data: _data } = response;
+                that.closeView(_data);
+            });
+        }
+        const openStartView: Function = async (item: any, localdata: any) => {
+            if (item['modelversion']) {
+                const targetView: any = that.viewRefData ? that.viewRefData[`WFSTART@${item['modelversion']}`] : null;
+                if (targetView) {
+                    const tempContext = Util.deepCopy(that.context);
+                    const tempViewParams = { actionView: `WFSTART@${item['modelversion']}`, actionForm: item['process-form'] };
+                    const container: Subject<any> = that.$appmodal.openModal({viewname: targetView.viewname, title: (this.$t(targetView.title) as string), height: targetView.height, width: targetView.width}, tempContext, tempViewParams);
+                    container.subscribe((result: any) => {
+                        if (!result || !Object.is(result.ret, 'OK')) {
+                            return;
+                        }
+                        const tempSubmitData: any = Util.deepCopy(args[0]);
+                        if (result.datas && result.datas[0]) {
+                            const resultData: any = result.datas[0];
+                            if (Object.keys(resultData).length > 0) {
+                                let tempData: any = {};
+                                Object.keys(resultData).forEach((key: any) => {
+                                    if (resultData[key] || (resultData[key] === 0) || (resultData[key] === false)) {
+                                        tempData[key] = resultData[key];
+                                    }
+                                })
+                                Object.assign(tempSubmitData, tempData);
+                            }
+                        }
+                        startWorkFlow([tempSubmitData], localdata);
+                    })
+                } else {
+                    startWorkFlow(args, localdata);
+                }
+            } else {
+                startWorkFlow(args, localdata);
+            }
+        }
+        let localData: any;
+        const localContext = Util.deepCopy(that.context);
+        const requestResult: Promise<any> = that.appEntityService.getStandWorkflow(localContext);
+        requestResult.then((response: any) => {
+            const { data: targetData, status } = response;
+            if (status !== 200 || targetData.length === 0) {
+                return;
+            }
+            if (targetData && targetData.length > 1) {
+                const h = that.$createElement;
+                targetData.forEach((element: any) => {
+                    Object.assign(element, { value: element.definitionkey, label: element.definitionname });
+                })
+                that.$msgbox({
+                    title: '请选择流程版本',
+                    message: h('i-select', {
+                        key: Util.createUUID(),
+                        props: {
+                            value: localData,
+                            placeholder: "请选择流程版本...",
+                            transfer: true,
+                            transferClassName: "start-workflow-select-wraper"
+                        },
+                        on: {
+                            'on-change': ($event: any) => {
+                                localData = { processDefinitionKey: $event };
+                            }
+                        }
+                    }, targetData.map((item: any) => {
+                        return h('i-option', {
+                            key: item.value,
+                            props: {
+                                value: item.value,
+                                label: item.label
+                            }
+                        })
+                    })),
+                    showCancelButton: true,
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消'
+                }).then((action: string) => {
+                    if (Object.is(action, 'confirm') && localData && Object.keys(localData).length > 0) {
+                        let targetItem: any = targetData.find((item: any) => {
+                            return item.definitionkey === localData.processDefinitionKey;
+                        })
+                        openStartView(targetItem, localData);
+                    }
+                })
+            } else {
+                localData = { processDefinitionKey: targetData[0]['definitionkey'] };
+                openStartView(targetData[0], localData);
+            }
+        })
+    }
     /**
      * 打印
      *

app_Web/src/widgets/ibizbook/default-searchform/default-searchform-base.vue

@@ -712,7 +712,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -748,7 +748,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr9GridView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr5DataView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/lnternal-func-list-list/lnternal-func-list-list-base.vue

@@ -46,11 +46,11 @@
             <span class="quick-toolbar">
                             <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_quicktoolbarModels.deuiaction1.visabled" :disabled="listviewlist_quicktoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_quicktoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_quicktoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-file-text-o'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_quicktoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
             </div>
             </span>
@@ -61,18 +61,18 @@
         <span class="batch-toolbar">
                     <div class='toolbar-container'>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction1.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction1.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction1' }, $event)">
                             <i class='fa fa-edit'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction1.tip')}}</div>
                 </tooltip>
                 <tooltip :transfer="true" :max-width="600">
-                        <i-button v-show="listviewlist_batchtoolbarModels.deuiaction2.visabled" :disabled="listviewlist_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
+                        <i-button v-show="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.visabled" :disabled="usr4listview_layoutlist_batchtoolbarModels.deuiaction2.disabled" class='' v-button-loading:i-button @click="list_batchtoolbar_click({ tag: 'deuiaction2' }, $event)">
                             <i class='fa fa-remove'></i>
-                            <span class='caption'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
+                            <span class='caption'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.caption')}}</span>
                         </i-button>
-                    <div slot='content'>{{$t('entities.ibizbook.listviewlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
+                    <div slot='content'>{{$t('entities.ibizbook.usr4listview_layoutlist_batchtoolbar_toolbar.deuiaction2.tip')}}</div>
                 </tooltip>
             </div>
         </span>
@@ -382,7 +382,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public New(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
          const _this: any = this;
@@ -402,7 +402,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public Edit(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         if (args.length === 0) {
@@ -428,7 +428,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * @param {*} [$event] 事件源
      * @param {*} [xData]  执行行为所需当前部件
      * @param {*} [actionContext]  执行行为上下文
-     * @memberof IBIZBOOKListViewBase
+     * @memberof IBIZBOOKUsr4ListView_layoutBase
      */
     public Remove(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
         const _this: any = this;
@@ -624,9 +624,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKListView
+     * @memberof IBIZBOOKUsr4ListView_layout
      */
-    public listviewlist_quicktoolbarModels: any = {
+    public usr4listview_layoutlist_quicktoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '新建', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'New', target: '' } },
 
     };
@@ -636,9 +636,9 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      * 工具栏模型
      *
      * @type {*}
-     * @memberof IBIZBOOKListView
+     * @memberof IBIZBOOKUsr4ListView_layout
      */
-    public listviewlist_batchtoolbarModels: any = {
+    public usr4listview_layoutlist_batchtoolbarModels: any = {
         deuiaction1: { name: 'deuiaction1', actiontarget: 'NONE', caption: '编辑', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Edit', target: 'SINGLEKEY' } },
 
         deuiaction2: { name: 'deuiaction2', actiontarget: 'NONE', caption: '删除', disabled: false, type: 'DEUIACTION', visabled: true,noprivdisplaymode:2,dataaccaction: '', uiaction: { tag: 'Remove', target: 'MULTIKEY' } },
@@ -861,7 +861,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public async load(opt: any = {}): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }        
         const arg: any = {...opt};
@@ -991,7 +991,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.removeAction') as string) });
             return;
         }
         if (datas.length === 0) {
@@ -1096,7 +1096,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -1104,7 +1104,7 @@ export default class LnternalFuncListBase extends Vue implements ControlInterfac
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKListView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.warning') as string), desc: 'IBIZBOOKUsr4ListView_layout' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/quicksearchform-searchform/quicksearchform-searchform-base.vue

@@ -670,7 +670,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public load(opt: any = {}): void {
         if(!this.loadAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loadAction') as string) });
             return;
         }
         const arg: any = { ...opt };
@@ -706,7 +706,7 @@ export default class QUICKSEARCHFORMBase extends Vue implements ControlInterface
      */
     public async loadDraft(opt: any = {},mode?:string): Promise<any> {
         if(!this.loaddraftAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKListView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKCalendarView' + (this.$t('app.searchForm.notConfig.loaddraftAction') as string) });
             return;
         }
         const arg: any = { ...opt } ;

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-base.vue

@@ -698,7 +698,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async load(opt: any = {}, isReset: boolean = false): Promise<any> {
         if(!this.fetchAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.fetchAction') as string) });
             return;
         }      
         const arg: any = {...opt};
@@ -792,7 +792,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
      */
     public async remove(datas: any[]): Promise<any> {
         if(!this.removeAction){
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
+            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.gridpage.notConfig.removeAction') as string) });
             return;
         }
         let _datas:any[] = [];
@@ -908,7 +908,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
             try {
                 if(Object.is(item.rowDataState, 'create')){
                     if(!this.createAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.createAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.createAction') as string) });
                     }else{
                       Object.assign(item,{viewparams:this.viewparams});
                       let response = await this.service.add(this.createAction, JSON.parse(JSON.stringify(this.context)),item, this.showBusyIndicator);
@@ -916,7 +916,7 @@ export default class Usr4Base extends Vue implements ControlInterface {
                     }
                 }else if(Object.is(item.rowDataState, 'update')){
                     if(!this.updateAction){
-                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKUsr4DataView' + (this.$t('app.list.notConfig.updateAction') as string) });
+                        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: 'IBIZBOOKTestCLDataView' + (this.$t('app.list.notConfig.updateAction') as string) });
                     }else{
                         Object.assign(item,{viewparams:this.viewparams});
                         if(item.ibizbook){

app_Web/src/widgets/ibizbook/usr4-dataview/usr4-dataview-model.ts

@@ -70,11 +70,6 @@ export default class Usr4Model {
         prop: 'n_ibizbookname_like',
         dataType: 'QUERYPARAM'
       },
-      {
-        name: 'n_price_gtandeq',
-        prop: 'n_price_gtandeq',
-        dataType: 'QUERYPARAM'
-      },
 
 
       {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSGANTTS/Usr.json

@@ -11,26 +11,6 @@
     "path" : "PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK.json"
   },
   "getPSDETreeColumns" : [ {
-    "caption" : "作者",
-    "codeName" : "author",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "author",
-    "name" : "author",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
-    "caption" : "归还日期",
-    "codeName" : "returntime",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "returntime",
-    "name" : "returntime",
-    "width" : 200,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "出版社",
     "codeName" : "press",
     "columnType" : "DEFGRIDCOLUMN",
@@ -60,6 +40,26 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "归还日期",
+    "codeName" : "returntime",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "returntime",
+    "name" : "returntime",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
+  }, {
+    "caption" : "作者",
+    "codeName" : "author",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "author",
+    "name" : "author",
+    "width" : 200,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDATAENTITIES/IBIZBOOK/PSTREEGRIDICES/TreeTable.json

@@ -19,16 +19,6 @@
     }
   } ],
   "getPSDETreeColumns" : [ {
-    "caption" : "图书名称",
-    "codeName" : "ibizbookname",
-    "columnType" : "DEFGRIDCOLUMN",
-    "dataItemName" : "ibizbookname",
-    "name" : "ibizbookname",
-    "width" : 50,
-    "widthUnit" : "px",
-    "enableExpand" : false,
-    "enableSort" : false
-  }, {
     "caption" : "图书描述",
     "codeName" : "subtext",
     "columnType" : "DEFGRIDCOLUMN",
@@ -48,6 +38,16 @@
     "widthUnit" : "px",
     "enableExpand" : false,
     "enableSort" : false
+  }, {
+    "caption" : "图书名称",
+    "codeName" : "ibizbookname",
+    "columnType" : "DEFGRIDCOLUMN",
+    "dataItemName" : "ibizbookname",
+    "name" : "ibizbookname",
+    "width" : 50,
+    "widthUnit" : "px",
+    "enableExpand" : false,
+    "enableSort" : false
   } ],
   "getPSDETreeNodeRSs" : [ {
     "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKGanttView.json

@@ -34,26 +34,6 @@
       "id" : "GANTT"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "作者",
-      "codeName" : "author",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "author",
-      "name" : "author",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
-      "caption" : "归还日期",
-      "codeName" : "returntime",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "returntime",
-      "name" : "returntime",
-      "width" : 200,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "出版社",
       "codeName" : "press",
       "columnType" : "DEFGRIDCOLUMN",
@@ -83,6 +63,26 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "归还日期",
+      "codeName" : "returntime",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "returntime",
+      "name" : "returntime",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
+    }, {
+      "caption" : "作者",
+      "codeName" : "author",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "author",
+      "name" : "author",
+      "width" : 200,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZBOOKTreeGridExView.json

@@ -75,16 +75,6 @@
       "id" : "TREEGRIDEX"
     },
     "getPSDETreeColumns" : [ {
-      "caption" : "图书名称",
-      "codeName" : "ibizbookname",
-      "columnType" : "DEFGRIDCOLUMN",
-      "dataItemName" : "ibizbookname",
-      "name" : "ibizbookname",
-      "width" : 50,
-      "widthUnit" : "px",
-      "enableExpand" : false,
-      "enableSort" : false
-    }, {
       "caption" : "图书描述",
       "codeName" : "subtext",
       "columnType" : "DEFGRIDCOLUMN",
@@ -104,6 +94,16 @@
       "widthUnit" : "px",
       "enableExpand" : false,
       "enableSort" : false
+    }, {
+      "caption" : "图书名称",
+      "codeName" : "ibizbookname",
+      "columnType" : "DEFGRIDCOLUMN",
+      "dataItemName" : "ibizbookname",
+      "name" : "ibizbookname",
+      "width" : 50,
+      "widthUnit" : "px",
+      "enableExpand" : false,
+      "enableSort" : false
     } ],
     "getPSDETreeNodeRSs" : [ {
       "getChildPSDETreeNode" : {

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021EditView.json

@@ -60,14 +60,14 @@
     },
     "getPSViewCtrlName" : "toolbar"
   }, {
-    "eventArg" : "tbitem9_saveandstart",
+    "eventArg" : "tbitem9",
     "eventNames" : "CLICK",
     "logicTrigger" : "CTRLEVENT",
     "logicType" : "APPVIEWUIACTION",
-    "name" : "toolbar_tbitem9_saveandstart_click",
+    "name" : "toolbar_tbitem9_click",
     "getPSAppViewUIAction" : {
       "modelref" : true,
-      "id" : "toolbar_tbitem9_saveandstart"
+      "id" : "toolbar_tbitem9"
     },
     "getPSViewCtrlName" : "toolbar"
   }, {
@@ -113,7 +113,7 @@
     },
     "xDataControlName" : "form"
   }, {
-    "name" : "toolbar_tbitem9_saveandstart",
+    "name" : "toolbar_tbitem9",
     "getPSUIAction" : {
       "modelref" : true,
       "id" : "SaveAndStart"
@@ -169,14 +169,14 @@
         "id" : "toolbar_tbitem5_click"
       }
     }, {
-      "eventArg" : "tbitem9_saveandstart",
+      "eventArg" : "tbitem9",
       "eventNames" : "CLICK",
       "logicTag" : "toolbar",
       "logicType" : "APPVIEWLOGIC",
-      "name" : "toolbar_tbitem9_saveandstart_click",
+      "name" : "toolbar_tbitem9_click",
       "getPSAppViewLogic" : {
         "modelref" : true,
-        "id" : "toolbar_tbitem9_saveandstart_click"
+        "id" : "toolbar_tbitem9_click"
       }
     }, {
       "eventArg" : "tbitem15",
@@ -330,31 +330,47 @@
       "name" : "tbitem8",
       "spanMode" : false
     }, {
-      "caption" : "开始",
+      "getCapPSLanguageRes" : {
+        "lanResTag" : "TBB.TEXT.*.STARTWF"
+      },
+      "caption" : "开始流程",
       "groupExtractMode" : "ITEM",
       "itemType" : "DEUIACTION",
-      "name" : "tbitem9_saveandstart",
+      "name" : "tbitem9",
       "noPrivDisplayMode" : 2,
       "getPSAppViewUIAction" : {
         "modelref" : true,
-        "id" : "toolbar_tbitem9_saveandstart"
+        "id" : "toolbar_tbitem9"
+      },
+      "getPSSysImage" : {
+        "glyph" : "xf04b@FontAwesome",
+        "cssClass" : "fa fa-play"
       },
       "getPSUIAction" : {
-        "caption" : "开始",
+        "getCapPSLanguageRes" : {
+          "lanResTag" : "TBB.TEXT.*.STARTWF"
+        },
+        "caption" : "开始流程",
         "codeName" : "SaveAndStart",
         "fullCodeName" : "SaveAndStart",
-        "name" : "开始",
-        "getNextPSUIAction" : {
-          "modelref" : true,
-          "id" : "WFStartWizard@ACTv2"
+        "name" : "编辑界面_保存并开始流程操作",
+        "getPSSysImage" : {
+          "glyph" : "xf04b@FontAwesome",
+          "cssClass" : "fa fa-play"
         },
         "predefinedType" : "EDITVIEW_SAVEANDSTARTWFACTION",
         "timeout" : 60000,
+        "getTooltipPSLanguageRes" : {
+          "lanResTag" : "TBB.TOOLTIP.*.STARTWF"
+        },
         "uIActionMode" : "SYS",
         "uIActionTag" : "SaveAndStart",
         "uIActionType" : "DEUIACTION"
       },
-      "tooltip" : "开始",
+      "tooltip" : "开始流程",
+      "getTooltipPSLanguageRes" : {
+        "lanResTag" : "TBB.TOOLTIP.*.STARTWF"
+      },
       "showCaption" : true,
       "showIcon" : true
     } ],

demo-boot/src/main/resources/static/remotemodel/PSSYSAPPS/Web/PSAPPDEVIEWS/IBIZSample0021WFDynaEditView.json

@@ -47,6 +47,17 @@
       "id" : "toolbar_tbitem5"
     },
     "getPSViewCtrlName" : "toolbar"
+  }, {
+    "eventArg" : "tbitem9",
+    "eventNames" : "CLICK",
+    "logicTrigger" : "CTRLEVENT",
+    "logicType" : "APPVIEWUIACTION",
+    "name" : "toolbar_tbitem9_click",
+    "getPSAppViewUIAction" : {
+      "modelref" : true,
+      "id" : "toolbar_tbitem9"
+    },
+    "getPSViewCtrlName" : "toolbar"
   }, {
     "eventArg" : "tbitem15",
     "eventNames" : "CLICK",
@@ -119,6 +130,13 @@
       "id" : "SaveAndExit"
     },
     "xDataControlName" : "form"
+  }, {
+    "name" : "toolbar_tbitem9",
+    "getPSUIAction" : {
+      "modelref" : true,
+      "id" : "SaveAndStart"
+    },
+    "xDataControlName" : "form"
   }, {
     "name" : "toolbar_tbitem15",
     "getPSUIAction" : {
@@ -442,6 +460,16 @@
         "modelref" : true,
         "id" : "toolbar_tbitem5_click"
       }
+    }, {
+      "eventArg" : "tbitem9",
+      "eventNames" : "CLICK",
+      "logicTag" : "toolbar",
+      "logicType" : "APPVIEWLOGIC",
+      "name" : "toolbar_tbitem9_click",
+      "getPSAppViewLogic" : {
+        "modelref" : true,
+        "id" : "toolbar_tbitem9_click"
+      }
     }, {
       "eventArg" : "tbitem15",
       "eventNames" : "CLICK",