workflow-editor 0.9.66-pv1 → 0.9.66-pv3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "workflow-editor",
-  "version": "0.9.66-pv1",
+  "version": "0.9.66-pv3",
   "description": "流程编辑器",
   "main": "lib/workflow-editor.umd.min.js",
   "private": false,
@@ -33,7 +33,7 @@
     "element-ui": "2.15.3",
     "eslint": "5.16.0",
     "eslint-plugin-vue": "5.2.2",
-    "imatrix-ui": "2.8.22",
+    "imatrix-ui": "2.9.8-pv2",
     "node-sass": "4.12.0",
     "nprogress": "^0.2.0",
     "sass-loader": "^7.1.0",

package/packages/workflow-editor/src/process-service.js

@@ -6,8 +6,8 @@ function getHttp() {
   return window.$http
 }
 const processService = {
-  fetchFormFields(formCode, formVersion) {
-    getHttp().get(Vue.prototype.baseAPI + '/wf-editor/workflow-editors/form-fields?formCode=' + formCode + '&formVersion=' + formVersion).then(resultFields => {
+  fetchFormFields(formCode, formVersion, publishVersion) {
+    getHttp().get(Vue.prototype.baseAPI + '/wf-editor/workflow-editors/form-fields?formCode=' + formCode + '&formVersion=' + formVersion + '&publishVersion=' + publishVersion).then(resultFields => {
       const formFields = resultFields.formFields
       const subFormFields = resultFields.subFormFields
       getStore().commit('wfEditor/setFormCode', formCode)

package/packages/workflow-editor/src/properties-editors/process/basic-properties.vue

@@ -53,7 +53,7 @@
     <el-row>
       <el-col :span="12">
         <el-form-item :label="$t('workflowEditor.process.system')" prop="model.systemCode" :rules="[requiredRule]">
-          <el-select v-model="model.systemCode" :placeholder="$t('workflowEditorMessage.pleaseSelect')" @change="changeSystem">
+          <el-select v-model="model.systemCode" :placeholder="$t('workflowEditorMessage.pleaseSelect')" @change="changeSystem(model.systemCode, null)">
             <el-option
               v-for="item in allSystems"
               :key="item.code"
@@ -65,7 +65,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item :label="$t('workflowEditor.process.systemVersion')" :rules="[requiredRule]">
-          <el-select v-model="systemPublishVersion" :placeholder="$t('workflowEditorMessage.pleaseSelect')">
+          <el-select v-model="systemPublishVersion" :placeholder="$t('workflowEditorMessage.pleaseSelect')" @change="changeVersion">
             <el-option
               v-for="item in systems"
               :key="item.publishVersion"
@@ -101,6 +101,7 @@ import processService from '../../process-service'
 import { getI18n } from '../../../../workflow-editor/src/util'
 import i18nInput from '../common/i18n-input'
 import { getUsername } from 'imatrix-ui/src/utils/auth'
+import authApi from 'imatrix-ui/src/utils/auth-api'
 export default {
   name: 'BasicProperties',
   components: {
@@ -144,19 +145,19 @@ export default {
       isSelectAdmin: false,
       selectedForm: [],
       systemPublishVersion: null,
+      sysCode: null,
       systems: []
 
     }
   },
   computed: {
     ...mapGetters('wfEditor', [
-      'systemVersion'
+      'systemVersion', 'systemCode'
     ])
   },
   created() {
-    this.systemPublishVersion = this.systemVersion
     this.getAdminNameWhenUpdate()
-    this.listAllForms()
+    // this.listAllForms()
     this.listAllProcessTypes()
     this.listAllSystems()
     this.listAllBranches()
@@ -166,7 +167,16 @@ export default {
       this.model.creator = getUsername()
     }
     this.setProcessCode(this.formModel.code)
-    this.setSystemCode(this.model.systemCode)
+    if (this.model.systemCode) {
+      // 编辑修改流程
+      this.setSystemCode(this.model.systemCode)
+    } else {
+      // 新建流程, model systemCode为空
+      this.model.systemCode = this.systemCode
+    }
+    this.systemPublishVersion = parseInt(authApi.getSessionCache('wf_editor_systemVersion'))
+    this.changeSystem(this.systemCode, this.systemPublishVersion)
+    this.listAllForms(this.systemCode, this.systemPublishVersion)
   },
   mounted() {
     // 支持.snyc修饰符的写法
@@ -198,7 +208,7 @@ export default {
       this.model.formCode = formInfo.substring(formInfo.indexOf('/') + 1, formInfo.lastIndexOf('/'))
       this.model.formVersion = formInfo.substring(formInfo.lastIndexOf('/') + 1)
       // 表单改变时，重新获取表单字段并放到vuex中
-      processService.fetchFormFields(this.model.formCode, this.model.formVersion)
+      processService.fetchFormFields(this.model.formCode, this.model.formVersion, this.systemPublishVersion)
     },
     // 弹出人员树
     selectAdmin() {
@@ -223,8 +233,8 @@ export default {
       this.isSelectAdmin = false
     },
     // 获得对应表单列表
-    listAllForms() {
-      this.$http.get(this.baseAPI + '/wf-editor/workflow-editors/forms').then(systemAndForms => {
+    listAllForms(systemCode, publishVersion) {
+      this.$http.get(this.baseAPI + '/wf-editor/workflow-editors/forms?systemCode=' + systemCode + '&publishVersion=' + publishVersion).then(systemAndForms => {
         // 设置表单信息
         const selectedFormInfo = this.model.formCode + '/' + this.model.formVersion
         // 修改时，获得默认选中的表单项
@@ -294,7 +304,9 @@ export default {
     setI18nValue(i18nKey) {
       this.model.i18nKey = i18nKey
     },
-    changeSystem(systemCode) {
+    changeSystem(systemCode, systemPublishVersion) {
+      this.systemPublishVersion = systemPublishVersion
+      this.allForms = []
       this.$http.get(this.baseAPI + '/wf-editor/systems/getPublishVersionsByCode/' + systemCode).then(result => {
         if (result) {
           this.systems = result
@@ -302,6 +314,9 @@ export default {
           this.systems = []
         }
       })
+    },
+    changeVersion() {
+      this.listAllForms(this.model.systemCode, this.systemPublishVersion)
     }
   }
 }

package/packages/workflow-editor/src/properties-editors/process/selectPage.vue

@@ -28,6 +28,7 @@
 
 // import modulePageService from '@/subsystems/mms/api/module-page'
 import Vue from 'vue'
+import { mapGetters } from 'vuex'
 
 export default {
   props: {
@@ -43,6 +44,11 @@ export default {
       selection: []
     }
   },
+  computed: {
+    ...mapGetters('wfEditor', [
+      'systemVersion'
+    ])
+  },
   watch: {
     conditionList: {
       handler(newValue, oldValue) {
@@ -53,7 +59,7 @@ export default {
   created() {
     this.baseURL = Vue.prototype.baseURL
     if (this.pageFormCode) {
-      this.listURL = '/wf-editor/workflow-editors/modulePages/' + this.pageFormCode
+      this.listURL = '/wf-editor/workflow-editors/modulePages/' + this.pageFormCode + '/' + this.systemVersion
     }
   },
   methods: {

package/packages/workflow-editor/src/workflow-editor.vue

@@ -99,6 +99,7 @@ import processService from './process-service'
 import FileSaver from 'file-saver'
 import Prism from 'prismjs'
 import AdminSaveDialog from './main/admin-save-dialog'
+import authApi from 'imatrix-ui/src/utils/auth-api'
 export default {
   name: 'WorkflowEditor',
   components: {
@@ -135,7 +136,7 @@ export default {
     },
     // 系统版本号，修改时流程定义中的系统版本号，例如：v1.0.0，新增不会使用该属性
     systemPublishVersion: {
-      type: String,
+      type: Number,
       default: null
     }
   },
@@ -173,8 +174,9 @@ export default {
     }
   },
   created: function() {
-    if (this.systemPublishVersion) {
-      this.setSystemVersion(this.systemPublishVersion)
+    authApi.setSessionCache('wf_editor_systemVersion', this.systemPublishVersion)
+    if (this.systemCode) {
+      this.setSystemCode(this.systemCode)
     }
     // 打开或新建流程图时先清空画布，开发过程中代码热更新的时候可以避免节点重复
     this.clearCanvas()
@@ -194,7 +196,6 @@ export default {
     }
   },
   mounted: function() {
-
   },
   methods: {
     ...mapMutations('wfEditor', [
@@ -240,7 +241,7 @@ export default {
       const formVersion = processProperties.formVersion
       if (formCode && formCode !== '' && formVersion) {
       // 取出formFields放到vuex中
-        processService.fetchFormFields(processProperties.formCode, processProperties.formVersion)
+        processService.fetchFormFields(processProperties.formCode, processProperties.formVersion, this.systemPublishVersion)
       }
     },
     packageUrlParam(url) {

package/src/i18n/langs/cn.js

@@ -316,7 +316,8 @@ const cn = {
       isNotNull: '不等于Null',
       defaultMailTemplate: '默认邮件模板',
       trustTask: '委托任务',
-      subprocessIsSharedForm: '主子流程共用表单'
+      subprocessIsSharedForm: '主子流程共用表单',
+      systemVersion: '系统版本'
     },
     // 环节属性
     task: {

package/src/i18n/langs/en.js

@@ -316,7 +316,8 @@ const en = {
       isNotNull: 'Is Not Null',
       defaultMailTemplate: 'Default Mail Template',
       trustTask: 'Trust Task',
-      subprocessIsSharedForm: 'Main process and subprocess shared form'
+      subprocessIsSharedForm: 'Main process and subprocess shared form',
+      systemVersion: 'System Version'
     },
     // 环节属性
     task: {