Merge remote-tracking branch 'origin/master'

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

@@ -172,6 +172,14 @@ export default class AppUpicker extends Vue {
      */
     public inputState: boolean = false;
 
+    /**
+     * vue 生命周期
+     *
+     * @memberof AppUpicker
+     */
+    public created() {
+		this.analysis(this.itemParams);
+    }
     /**
      * 获取关联数据项值
      *
@@ -185,6 +193,77 @@ export default class AppUpicker extends Vue {
         return this.curvalue;
     }
 
+    /**
+     * 展开下拉
+     *
+     * @memberof AppUpicker
+     */
+    public openDropdown() {
+        const appUpicker: any = this.$refs.appUpicker;
+        if(appUpicker) {
+            appUpicker.focus();
+        }
+    }
+
+    /**
+     * 收起下拉
+     *
+     * @memberof AppUpicker
+     */
+    public closeDropdown() {
+        const appUpicker: any = this.$refs.appUpicker;
+        if(appUpicker) {
+            appUpicker.blur();
+        }
+    }
+
+    /**
+     * 下拉切换回调
+     * @param flag 
+     * 
+     * @memberof AppUpicker
+     */
+    public onSelectOpen(flag: boolean): void {
+        this.open = flag;
+        if (this.open) {
+			this.fectchItemList(this.url);
+        }
+    }
+
+    /**
+     * 下拉选中
+     *
+     * @param {string} val
+     * @memberof AppUpicker
+     */
+    public onSelect(val: string) {
+        let index = this.items.findIndex((item) => Object.is(item.value, val));
+        if (index >= 0) {
+            let item:any = this.items[index];
+            if (this.valueitem) {
+                this.$emit('formitemvaluechange', { name: this.valueitem, value: item.value });
+            }
+            if (this.name) {
+                this.$emit('formitemvaluechange', { name: this.name, value: item.label });
+            }
+        }
+    }
+
+    /**
+     * 清除
+     * 
+     * @memberof AppUpicker
+     */
+    public onClear($event: any): void {
+        if (this.valueitem) {
+            this.$emit('formitemvaluechange', { name: this.valueitem, value: '' });
+        }
+        if (this.name) {
+            this.$emit('formitemvaluechange', { name: this.name, value: '' });
+        }
+        this.$forceUpdate();
+    }
+
     /**
      * 值变化
      *
@@ -208,16 +287,6 @@ export default class AppUpicker extends Vue {
             }
         }
     }
-
-    /**
-     * vue 生命周期
-     *
-     * @memberof AppUpicker
-     */
-    public created() {
-        // 解析编辑器参数
-		this.analysis(this.itemParams);
-    }
 	
 	/**
 	 * 解析编辑器参数
@@ -281,53 +350,6 @@ export default class AppUpicker extends Vue {
         });
 	}
 
-    /**
-     * 下拉切换回调
-     * @param flag 
-     * 
-     * @memberof AppUpicker
-     */
-    public onSelectOpen(flag: boolean): void {
-        this.open = flag;
-        if (this.open) {
-			this.fectchItemList(this.url);
-        }
-    }
-
-    /**
-     * 下拉选中
-     *
-     * @param {string} val
-     * @memberof AppUpicker
-     */
-    public onSelect(val: string) {
-        let index = this.items.findIndex((item) => Object.is(item.value, val));
-        if (index >= 0) {
-            let item:any = this.items[index];
-            if (this.valueitem) {
-                this.$emit('formitemvaluechange', { name: this.valueitem, value: item.value });
-            }
-            if (this.name) {
-                this.$emit('formitemvaluechange', { name: this.name, value: item.label });
-            }
-        }
-    }
-
-    /**
-     * 清除
-     * 
-     * @memberof AppUpicker
-     */
-    public onClear($event: any): void {
-        if (this.valueitem) {
-            this.$emit('formitemvaluechange', { name: this.valueitem, value: '' });
-        }
-        if (this.name) {
-            this.$emit('formitemvaluechange', { name: this.name, value: '' });
-        }
-        this.$forceUpdate();
-    }
-
     /**
      * 公共参数处理
      *
@@ -354,32 +376,6 @@ export default class AppUpicker extends Vue {
         }
         return true;
     }
-
-    /**
-     * 展开下拉
-     *
-     * @memberof AppUpicker
-     */
-    public openDropdown() {
-        const appUpicker: any = this.$refs.appUpicker;
-        if(appUpicker) {
-            appUpicker.focus();
-        }
-    }
-
-    /**
-     * 收起下拉
-     *
-     * @memberof AppUpicker
-     */
-    public closeDropdown() {
-        const appUpicker: any = this.$refs.appUpicker;
-        if(appUpicker) {
-            appUpicker.blur();
-        }
-    }
-    
-
 }
 </script>
 <style lang="less">

app_web/src/locale/lang/en-US.ts

@@ -200,6 +200,7 @@ export default {
             back: "Back",
             next: "Next",
             complete: "Complete",
+            preactionmessage:"The calculation of the previous behavior is not configured"
         },
         viewLayoutPanel: {
             appLogoutView: {

app_web/src/locale/lang/zh-CN.ts

@@ -199,6 +199,7 @@ export default {
             back: "上一步",
             next: "下一步",
             complete: "完成",
+            preactionmessage:"未配置计算上一步行为"
         },
         viewLayoutPanel: {
             appLogoutView: {

app_web/src/widgets/wfgroup/main-form/main-form-base.vue

@@ -1094,6 +1094,9 @@ export default class MainBase extends Vue implements ControlInterface {
                 if (Object.is('refresh', action)) {
                     this.refresh(data);
                 }
+                if (Object.is('panelaction', action)) {
+                    this.panelAction(data.action,data.emitAction,data);
+                }
             });
         }
         this.dataChang
@@ -1585,6 +1588,50 @@ export default class MainBase extends Vue implements ControlInterface {
         })
     }
 
+    /**
+     * 面板行为
+     *
+     * @param {string} [action] 调用的实体行为
+     * @param {string} [emitAction] 抛出行为
+     * @param {*} [data={}] 传入数据
+     * @param {boolean} [showloading] 是否显示加载状态
+     * 
+     * @memberof MainBase
+     */
+    public panelAction(action:string,emitAction:string,data:any ={},showloading?:boolean):void{
+        if (!action || (action && Object.is(action, ''))) {
+            return;
+        }
+        const arg: any = { ...data };
+        const formdata = this.getValues();
+        Object.assign(arg, formdata);
+        Object.assign(arg,this.viewparams);
+        const post: Promise<any> = this.service.frontLogic(action,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.data) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                }
+                return;
+            }
+            const data = response.data;
+            this.onFormLoad(data,emitAction);
+            this.$emit(emitAction, data);
+            this.$nextTick(() => {
+                this.formState.next({ type: emitAction, data: data });
+            });
+        }).catch((response: any) => {
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) });
+                return;
+            }
+        });
+    }
+
     /**
      * 表单项更新
      *

app_web/src/widgets/wfgroup/main-grid/main-grid.less

@@ -36,7 +36,7 @@
       height: 100%;
       display:flex;
       flex-direction: column;
-      justify-content: start;
+      justify-content: flex-start;
       .el-table__row{
         .grid-uiaction-divider {
           padding:0 10px 0 10px;

app_web/src/widgets/wfmember/main-form/main-form-base.vue

@@ -1198,6 +1198,9 @@ export default class MainBase extends Vue implements ControlInterface {
                 if (Object.is('refresh', action)) {
                     this.refresh(data);
                 }
+                if (Object.is('panelaction', action)) {
+                    this.panelAction(data.action,data.emitAction,data);
+                }
             });
         }
         this.dataChang
@@ -1689,6 +1692,50 @@ export default class MainBase extends Vue implements ControlInterface {
         })
     }
 
+    /**
+     * 面板行为
+     *
+     * @param {string} [action] 调用的实体行为
+     * @param {string} [emitAction] 抛出行为
+     * @param {*} [data={}] 传入数据
+     * @param {boolean} [showloading] 是否显示加载状态
+     * 
+     * @memberof MainBase
+     */
+    public panelAction(action:string,emitAction:string,data:any ={},showloading?:boolean):void{
+        if (!action || (action && Object.is(action, ''))) {
+            return;
+        }
+        const arg: any = { ...data };
+        const formdata = this.getValues();
+        Object.assign(arg, formdata);
+        Object.assign(arg,this.viewparams);
+        const post: Promise<any> = this.service.frontLogic(action,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.data) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                }
+                return;
+            }
+            const data = response.data;
+            this.onFormLoad(data,emitAction);
+            this.$emit(emitAction, data);
+            this.$nextTick(() => {
+                this.formState.next({ type: emitAction, data: data });
+            });
+        }).catch((response: any) => {
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) });
+                return;
+            }
+        });
+    }
+
     /**
      * 表单项更新
      *

app_web/src/widgets/wfmember/main-grid/main-grid.less

@@ -36,7 +36,7 @@
       height: 100%;
       display:flex;
       flex-direction: column;
-      justify-content: start;
+      justify-content: flex-start;
       .el-table__row{
         .grid-uiaction-divider {
           padding:0 10px 0 10px;

app_web/src/widgets/wfprocess-definition/main-form/main-form-base.vue

@@ -1244,6 +1244,9 @@ export default class MainBase extends Vue implements ControlInterface {
                 if (Object.is('refresh', action)) {
                     this.refresh(data);
                 }
+                if (Object.is('panelaction', action)) {
+                    this.panelAction(data.action,data.emitAction,data);
+                }
             });
         }
         this.dataChang
@@ -1735,6 +1738,50 @@ export default class MainBase extends Vue implements ControlInterface {
         })
     }
 
+    /**
+     * 面板行为
+     *
+     * @param {string} [action] 调用的实体行为
+     * @param {string} [emitAction] 抛出行为
+     * @param {*} [data={}] 传入数据
+     * @param {boolean} [showloading] 是否显示加载状态
+     * 
+     * @memberof MainBase
+     */
+    public panelAction(action:string,emitAction:string,data:any ={},showloading?:boolean):void{
+        if (!action || (action && Object.is(action, ''))) {
+            return;
+        }
+        const arg: any = { ...data };
+        const formdata = this.getValues();
+        Object.assign(arg, formdata);
+        Object.assign(arg,this.viewparams);
+        const post: Promise<any> = this.service.frontLogic(action,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.data) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                }
+                return;
+            }
+            const data = response.data;
+            this.onFormLoad(data,emitAction);
+            this.$emit(emitAction, data);
+            this.$nextTick(() => {
+                this.formState.next({ type: emitAction, data: data });
+            });
+        }).catch((response: any) => {
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) });
+                return;
+            }
+        });
+    }
+
     /**
      * 表单项更新
      *

app_web/src/widgets/wfprocess-definition/main-grid/main-grid.less

@@ -36,7 +36,7 @@
       height: 100%;
       display:flex;
       flex-direction: column;
-      justify-content: start;
+      justify-content: flex-start;
       .el-table__row{
         .grid-uiaction-divider {
           padding:0 10px 0 10px;

app_web/src/widgets/wfremodel/main-form/main-form-base.vue

@@ -1021,6 +1021,9 @@ export default class MainBase extends Vue implements ControlInterface {
                 if (Object.is('refresh', action)) {
                     this.refresh(data);
                 }
+                if (Object.is('panelaction', action)) {
+                    this.panelAction(data.action,data.emitAction,data);
+                }
             });
         }
         this.dataChang
@@ -1512,6 +1515,50 @@ export default class MainBase extends Vue implements ControlInterface {
         })
     }
 
+    /**
+     * 面板行为
+     *
+     * @param {string} [action] 调用的实体行为
+     * @param {string} [emitAction] 抛出行为
+     * @param {*} [data={}] 传入数据
+     * @param {boolean} [showloading] 是否显示加载状态
+     * 
+     * @memberof MainBase
+     */
+    public panelAction(action:string,emitAction:string,data:any ={},showloading?:boolean):void{
+        if (!action || (action && Object.is(action, ''))) {
+            return;
+        }
+        const arg: any = { ...data };
+        const formdata = this.getValues();
+        Object.assign(arg, formdata);
+        Object.assign(arg,this.viewparams);
+        const post: Promise<any> = this.service.frontLogic(action,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.data) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                }
+                return;
+            }
+            const data = response.data;
+            this.onFormLoad(data,emitAction);
+            this.$emit(emitAction, data);
+            this.$nextTick(() => {
+                this.formState.next({ type: emitAction, data: data });
+            });
+        }).catch((response: any) => {
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) });
+                return;
+            }
+        });
+    }
+
     /**
      * 表单项更新
      *

app_web/src/widgets/wfuser/main-form/main-form-base.vue

@@ -1064,6 +1064,9 @@ export default class MainBase extends Vue implements ControlInterface {
                 if (Object.is('refresh', action)) {
                     this.refresh(data);
                 }
+                if (Object.is('panelaction', action)) {
+                    this.panelAction(data.action,data.emitAction,data);
+                }
             });
         }
         this.dataChang
@@ -1555,6 +1558,50 @@ export default class MainBase extends Vue implements ControlInterface {
         })
     }
 
+    /**
+     * 面板行为
+     *
+     * @param {string} [action] 调用的实体行为
+     * @param {string} [emitAction] 抛出行为
+     * @param {*} [data={}] 传入数据
+     * @param {boolean} [showloading] 是否显示加载状态
+     * 
+     * @memberof MainBase
+     */
+    public panelAction(action:string,emitAction:string,data:any ={},showloading?:boolean):void{
+        if (!action || (action && Object.is(action, ''))) {
+            return;
+        }
+        const arg: any = { ...data };
+        const formdata = this.getValues();
+        Object.assign(arg, formdata);
+        Object.assign(arg,this.viewparams);
+        const post: Promise<any> = this.service.frontLogic(action,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        post.then((response: any) => {
+            if (!response.status || response.status !== 200) {
+                if (response.data) {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                }
+                return;
+            }
+            const data = response.data;
+            this.onFormLoad(data,emitAction);
+            this.$emit(emitAction, data);
+            this.$nextTick(() => {
+                this.formState.next({ type: emitAction, data: data });
+            });
+        }).catch((response: any) => {
+            if (response && response.status && response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
+                return;
+            }
+            if (!response || !response.status || !response.data) {
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) });
+                return;
+            }
+        });
+    }
+
     /**
      * 表单项更新
      *

app_web/src/widgets/wfuser/main-grid/main-grid.less

@@ -36,7 +36,7 @@
       height: 100%;
       display:flex;
       flex-direction: column;
-      justify-content: start;
+      justify-content: flex-start;
       .el-table__row{
         .grid-uiaction-divider {
           padding:0 10px 0 10px;

config.xml

@@ -37,11 +37,6 @@
 	  git clone -b master $para2 ibzwf/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzwf/
-      mvn clean package -Papi
-      cd ibzwf-provider/ibzwf-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-provider-api.yaml ibzlab-rt --with-registry-auth      
       </command>
     </hudson.tasks.Shell>
   </builders>

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/domain/WFProcessNode.java

@@ -66,6 +66,13 @@ public class WFProcessNode extends EntityBase implements Serializable {
     @JsonProperty("processDefinitionName")
     private String processdefinitionname;
 
+    /**
+     * 版本
+     */
+    @JSONField(name = "version")
+    @JsonProperty("version")
+    private Integer version;
+
     /**
      * 数量
      */

ibzwf-provider/ibzwf-provider-api/src/main/docker/Dockerfile

@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar
 
-EXPOSE 40003
+EXPOSE 8081
 
 ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar

ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml

@@ -3,22 +3,9 @@ services:
   ibzwf-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
     ports:
-      - "40003:40003"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
-      - SERVER_PORT=40003
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
-      - SPRING_REDIS_HOST=172.16.100.243
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
-      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
-      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits: