ibiz4j 发布系统代码 [ibz-disk，存储]

app_web/package.json

@@ -41,7 +41,7 @@
     "vue-amap": "^0.5.10",
     "vue-class-component": "^7.0.2",
     "vue-grid-layout": "^2.3.7",
-    "vue-i18n": "^8.15.3",
+    "vue-i18n": "^8.23.0",
     "vue-property-decorator": "^9.1.2",
     "vue-router": "^3.1.3",
     "vuex": "^3.1.2",

app_web/src/components/app-mpicker/app-mpicker.vue

@@ -159,7 +159,7 @@ export default class AppMpicker extends Vue {
                   }
               });
             } catch (error) {
-              if(error.name === 'SyntaxError'){
+              if((error as any).name === 'SyntaxError'){
                 let srfkeys:any = newVal.split(',');
                 let srfmajortexts:any = null;
                 if(this.valueitem && this.activeData[this.valueitem]){

app_web/src/components/app-span/app-span.vue

@@ -229,9 +229,9 @@ export default class AppSpan extends Vue {
     public dateFormat(){
         if(this.valueFormat){
             if(this.valueFormat.indexOf('%1$t') !== -1){
-                this.text= moment(this.data).format("YYYY-MM-DD HH:mm:ss");
+                this.text= moment(this.value).format("YYYY-MM-DD HH:mm:ss");
             }else if(this.valueFormat.indexOf('%1$s') == -1){
-                this.text= moment(this.data).format(this.valueFormat);
+                this.text= moment(this.value).format(this.valueFormat);
             }else{
                 this.text= this.value;
             }

app_web/src/engine/view/tab-exp-view-engine.ts

@@ -41,7 +41,7 @@ export default class TabExpViewEngine extends ViewEngine {
             if (!Object.is(_item.type, 'TABEXPPANEL')) {
                 return;
             }
-            if(this.view.context && this.view.context[(this.keyPSDEField as string)]){
+            if(this.view.context && !this.view.context[(this.keyPSDEField as string)]){
                 return;
             }
             this.setViewState2({ tag: _item.name, action: 'load', viewdata: this.view.context });

app_web/src/pages/disk/sdfile-edit-view/sdfile-edit-view-base.vue

@@ -1303,25 +1303,122 @@ export default class SDFileEditViewBase extends Vue {
      * @memberof SDFileEditViewBase
      */
     public SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
+        const that: any = this;
         if (!xData || !(xData.wfstart instanceof Function)) {
             return;
         }
-        xData.wfstart(args).then((response: any) => {
-            if (!response || response.status !== 200) {
-                return;
+        let validateStatus: boolean = true;
+        if (xData.formValidateStatus && xData.formValidateStatus instanceof Function) {
+            validateStatus = xData.formValidateStatus();
+        }
+        if (!validateStatus) {
+            if(xData.errorMessages && xData.errorMessages.length > 0) {
+                let descMessage: string = '';
+                xData.errorMessages.forEach((message: any) => {
+                    descMessage = descMessage + '<p>' + message.error + '<p>';
+                })
+                xData.$Notice.error({ title: (xData.$t('app.commonWords.wrong') as string), desc: descMessage });
+            } else {
+                xData.$Notice.error({ title: (xData.$t('app.commonWords.wrong') as string), desc: (xData.$t('app.formpage.valuecheckex') as string) });
             }
-            const { data: _data } = response;
-            if(window.parent){
-                window.parent.postMessage({ ..._data },'*');
+            return;
+        }
+        const startWorkFlow: Function = (param: any, localdata: any) => {
+            xData.wfstart(args).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['wfversion']) {
+                const targetView: any = that.viewRefData ? that.viewRefData[`WFSTART@${item['wfversion']}`] : null;
+                if (targetView) {
+                    const tempContext = Util.deepCopy(that.context);
+                    const tempViewParams = { actionView: `WFSTART@${item['wfversion']}`, actionForm: item['process-form'] };
+                    const container: Subject<any> = that.$appmodal.openModal(targetView, 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);
             }
-            if (_this.viewdata) {
-                _this.$emit('viewdataschange', [{ ..._data }]);
-                _this.$emit('close');
-            }else if (this.$tabPageExp) {
-                this.$tabPageExp.onClose(this.$route.fullPath);
+        }
+        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'] }
+                targetData[0]['process-view'] = "WFSTART@1";
+                openStartView(targetData[0], localData);
+            }
+        })
     }
     /**
      * 当前流程步骤

app_web/src/pages/lite/meta-dynamic-model-dyna-inst-edit-view/meta-dynamic-model-dyna-inst-edit-view-base.vue

@@ -1303,25 +1303,122 @@ export default class MetaDynamicModelDynaInstEditViewBase extends Vue {
      * @memberof MetaDynamicModelDynaInstEditViewBase
      */
     public SaveAndStart(args: any[],contextJO?:any, params?: any, $event?: any, xData?: any,actionContext?:any,srfParentDeName?:string) {
-        const _this: any = this;
+        const that: any = this;
         if (!xData || !(xData.wfstart instanceof Function)) {
             return;
         }
-        xData.wfstart(args).then((response: any) => {
-            if (!response || response.status !== 200) {
-                return;
+        let validateStatus: boolean = true;
+        if (xData.formValidateStatus && xData.formValidateStatus instanceof Function) {
+            validateStatus = xData.formValidateStatus();
+        }
+        if (!validateStatus) {
+            if(xData.errorMessages && xData.errorMessages.length > 0) {
+                let descMessage: string = '';
+                xData.errorMessages.forEach((message: any) => {
+                    descMessage = descMessage + '<p>' + message.error + '<p>';
+                })
+                xData.$Notice.error({ title: (xData.$t('app.commonWords.wrong') as string), desc: descMessage });
+            } else {
+                xData.$Notice.error({ title: (xData.$t('app.commonWords.wrong') as string), desc: (xData.$t('app.formpage.valuecheckex') as string) });
             }
-            const { data: _data } = response;
-            if(window.parent){
-                window.parent.postMessage({ ..._data },'*');
+            return;
+        }
+        const startWorkFlow: Function = (param: any, localdata: any) => {
+            xData.wfstart(args).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['wfversion']) {
+                const targetView: any = that.viewRefData ? that.viewRefData[`WFSTART@${item['wfversion']}`] : null;
+                if (targetView) {
+                    const tempContext = Util.deepCopy(that.context);
+                    const tempViewParams = { actionView: `WFSTART@${item['wfversion']}`, actionForm: item['process-form'] };
+                    const container: Subject<any> = that.$appmodal.openModal(targetView, 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);
             }
-            if (_this.viewdata) {
-                _this.$emit('viewdataschange', [{ ..._data }]);
-                _this.$emit('close');
-            }else if (this.$tabPageExp) {
-                this.$tabPageExp.onClose(this.$route.fullPath);
+        }
+        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'] }
+                targetData[0]['process-view'] = "WFSTART@1";
+                openStartView(targetData[0], localData);
+            }
+        })
     }
     /**
      * 当前流程步骤

app_web/src/pages/lite/meta-dynamic-model-dyna-inst-grid-view/meta-dynamic-model-dyna-inst-grid-view-base.vue

@@ -1359,6 +1359,18 @@ export default class MetaDynamicModelDynaInstGridViewBase extends Vue {
             { pathName: 'dynainsteditview', parameterName: 'dynainsteditview' },
         ];
         const _this: any = this;
+        if (fullargs && fullargs.length > 0) {
+            const _args = fullargs[0];
+            if (_args['srfprocessdefinitionkey'] && _args['srftaskdefinitionkey']) {
+                Object.assign(data, {
+                    processDefinitionKey: _args['srfprocessdefinitionkey'],
+                    taskDefinitionKey: _args['srftaskdefinitionkey']
+                });
+                if (_args['srftaskid']) {
+                    Object.assign(data, { 'srftaskid': _args['srftaskid'] });
+                }
+            }
+        }
         if(fullargs && fullargs.copymode){
             Object.assign(data,{copymode:true});
         }

app_web/src/pages/lite/meta-dynamic-model-grid-view/meta-dynamic-model-grid-view-base.vue

@@ -1371,6 +1371,18 @@ export default class MetaDynamicModelGridViewBase extends Vue {
             { pathName: 'editview', parameterName: 'editview' },
         ];
         const _this: any = this;
+        if (fullargs && fullargs.length > 0) {
+            const _args = fullargs[0];
+            if (_args['srfprocessdefinitionkey'] && _args['srftaskdefinitionkey']) {
+                Object.assign(data, {
+                    processDefinitionKey: _args['srfprocessdefinitionkey'],
+                    taskDefinitionKey: _args['srftaskdefinitionkey']
+                });
+                if (_args['srftaskid']) {
+                    Object.assign(data, { 'srftaskid': _args['srftaskid'] });
+                }
+            }
+        }
         if(fullargs && fullargs.copymode){
             Object.assign(data,{copymode:true});
         }

app_web/src/service/entity-service.ts

@@ -902,6 +902,23 @@ export default class EntityService {
         }
     }
 
+    /**
+     * 获取标准工作流版本信息
+     *
+     * @param {*} [context={}]
+     * @param {*} [data={}]
+     * @param {boolean} [isloading]
+     * @param {*} [localdata]
+     * @returns {Promise<any>}
+     * @memberof EntityService
+     */
+    public async getStandWorkflow(context: any = {}, data: any = {}, isloading?: boolean): Promise<any> {
+        return Http.getInstance().get(
+            `/wfcore/${this.SYSTEMNAME}-app-${this.APPNAME}/${this.APPDENAME}/process-definitions`,
+            isloading,
+        );
+    }
+
     /**
      * WFGetProxyData接口方法
      *

app_web/src/styles/default.less

@@ -274,6 +274,11 @@
   }
 }
 
+// 工作流流程版本选择
+.start-workflow-select-wraper {
+    z-index: 3000 !important;
+}
+
 /***    END:多数据视图属性布局    ***/
 
 // 看板视图，卡片模式

app_web/src/utils/types/http.d.ts

@@ -17,7 +17,7 @@ export declare interface Http {
      * @returns {Promise<any>}
      * @memberof Http
      */
-    post(url: string, params: any, isloading?: boolean, serialnumber?: number): Promise<any>;
+    post(url: string, params?: any, isloading?: boolean, serialnumber?: number): Promise<any>;
     /**
      * 获取
      *
@@ -27,7 +27,7 @@ export declare interface Http {
      * @returns {Promise<any>}
      * @memberof Http
      */
-    get(url: string, isloading?: boolean, serialnumber?: number): Promise<any>;
+    get(url: string, params?: any, isloading?: boolean, serialnumber?: number): Promise<any>;
     /**
      * 删除
      *

app_web/src/utils/view-tool/view-tool.ts

@@ -76,7 +76,7 @@ export class ViewTool {
      * @memberof ViewTool
      */
     public static getIndexRoutePath(route: Route): string {
-        const { parameters: _parameters }: { parameters: any[] } = route.meta;
+        const { parameters: _parameters }: { parameters: any[] } = route.meta as any;
         const { pathName: _pathName, parameterName: _parameterName }: { pathName: string, parameterName: string } = _parameters[0];
         const param = route.params[_parameterName];
         if (param && !Object.is(param, '')) {

app_web/src/widgets/meta-dynamic-model/main-grid/main-grid-model.ts

@@ -108,6 +108,22 @@ export default class MainModel {
           prop: 'srffrontuf',
           dataType: 'TEXT',
         },
+        // 预置工作流数据字段
+        {
+          name: 'srfprocessdefinitionkey',
+          prop: 'srfprocessdefinitionkey',
+          dataType: 'TEXT'
+        },
+        {
+          name: 'srftaskdefinitionkey',
+          prop: 'srftaskdefinitionkey',
+          dataType: 'TEXT'
+        },
+        {
+          name: 'srftaskid',
+          prop: 'srftaskid',
+          dataType: 'TEXT'
+        }
       ]
     }
   }

app_web/src/widgets/sdfile/main-grid/main-grid-model.ts

@@ -138,6 +138,22 @@ export default class MainModel {
           prop: 'srffrontuf',
           dataType: 'TEXT',
         },
+        // 预置工作流数据字段
+        {
+          name: 'srfprocessdefinitionkey',
+          prop: 'srfprocessdefinitionkey',
+          dataType: 'TEXT'
+        },
+        {
+          name: 'srftaskdefinitionkey',
+          prop: 'srftaskdefinitionkey',
+          dataType: 'TEXT'
+        },
+        {
+          name: 'srftaskid',
+          prop: 'srftaskid',
+          dataType: 'TEXT'
+        }
       ]
     }
   }

app_web/tsconfig.json

@@ -9,6 +9,7 @@
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,
     "sourceMap": true,
     "baseUrl": ".",
     "types": [

ibzdisk-core/src/main/java/cn/ibizlab/core/disk/service/impl/MetaDynamicModelServiceImpl.java

@@ -31,6 +31,7 @@ import cn.ibizlab.core.disk.service.IMetaDynamicModelService;
 
 import cn.ibizlab.util.helper.CachedBeanCopier;
 import cn.ibizlab.util.helper.DEFieldCacheMap;
+import com.alibaba.fastjson.JSONObject;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,7 +39,6 @@ import cn.ibizlab.core.disk.mapper.MetaDynamicModelMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.util.StringUtils;
 
 /**
@@ -272,6 +272,8 @@ public class MetaDynamicModelServiceImpl extends ServiceImpl<MetaDynamicModelMap
 
 
 
+
+
     public IMetaDynamicModelService getProxyService() {
         return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
     }

ibzdisk-core/src/main/java/cn/ibizlab/core/disk/service/impl/SDFileServiceImpl.java

@@ -31,6 +31,7 @@ import cn.ibizlab.core.disk.service.ISDFileService;
 
 import cn.ibizlab.util.helper.CachedBeanCopier;
 import cn.ibizlab.util.helper.DEFieldCacheMap;
+import com.alibaba.fastjson.JSONObject;
 
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,7 +39,6 @@ import cn.ibizlab.core.disk.mapper.SDFileMapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.util.StringUtils;
 
 /**
@@ -241,6 +241,8 @@ public class SDFileServiceImpl extends ServiceImpl<SDFileMapper, SDFile> impleme
     }
 
 
+
+
     public ISDFileService getProxyService() {
         return cn.ibizlab.util.security.SpringContextHolder.getBean(this.getClass());
     }

ibzdisk-core/src/main/resources/liquibase/h2_table.xml

@@ -4,7 +4,7 @@
 
 
     <!--输出实体[META_DYNAMICMODEL]数据结构 -->
-    <changeSet author="a_A_5d9d78509" id="tab-meta_dynamicmodel-4-1">
+    <changeSet author="root" id="tab-meta_dynamicmodel-4-1">
         <createTable tableName="IBZDYNAMICMODEL">
                 <column name="DYNAINSTID" remarks="" type="VARCHAR(100)">
                 </column>
@@ -27,7 +27,7 @@
 
 
         <!--输出实体[META_DYNAMICMODEL]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-meta_dynamicmodel-4-2">
+    <changeSet author="root" id="fk-meta_dynamicmodel-4-2">
        <addForeignKeyConstraint baseColumnNames="PDYNAINSTID" baseTableName="IBZDYNAMICMODEL" constraintName="DER1N_META_DYNAMICMODEL_META_D" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="CONFIGID" referencedTableName="IBZDYNAMICMODEL" validate="true"/>
     </changeSet>