workflow-editor 0.0.66-up → 0.0.66-up-rc2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "workflow-editor",
   "private": false,
-  "version": "0.0.66-up",
+  "version": "0.0.66-up-rc2",
   "type": "module",
   "main": "./lib/workflow-editor.js",
   "scripts": {

package/packages/plugins/formValidatorUtil.js

@@ -557,7 +557,7 @@ function validateSub(
       }
     }
   }
-  return true
+  return isNeedField?{msg: true, listCode: prop}: true
 }
 
 function getEntityId(row) {

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

@@ -51,26 +51,11 @@
         />
       </el-select>
     </el-row>
-    <div
-      class="main"
-      @mousedown="startDrag"
-      @mousemove="drag"
-      @mouseup="endDrag"
-      @mouseleave="clearStatus"
-    >
-      <toolbox
-        v-if="!readonly"
-        class="toolbox"
-        onselectstart="return false"
-        oncontextmenu="return false"
-      />
-      <section class="tabBox">
+    <div class="main" @mousedown="startDrag" @mousemove="drag" @mouseup="endDrag" @mouseleave="clearStatus">
+      <toolbox v-if="!readonly" class="toolbox" onselectstart="return false" oncontextmenu="return false" />
+      <section class="tabBox" :key="canvasKey">
         <el-tabs v-model="activeTab" class="tabs">
-          <el-tab-pane
-            :label="$t('workflowEditorPublicModel.flowChart')"
-            name="canvas"
-            class="tab-pane"
-          >
+          <el-tab-pane :label="$t('workflowEditorPublicModel.flowChart')" name="canvas" class="tab-pane">
             <workflow-canvas
               onselectstart="return false"
               :process="process"
@@ -110,33 +95,22 @@
         top: contextMenuPosition.y + 'px'
       }"
     />
-    <admin-save-dialog
-      v-if="isAdminSave"
-      @close="isAdminSave = false"
-      @update="updateWfVersion"
-      @add="addWfVersion"
-    />
+    <admin-save-dialog v-if="isAdminSave" @close="isAdminSave = false" @update="updateWfVersion" @add="addWfVersion" />
   </div>
 </template>
 <script>
 import './assets/wf-editor-icons.js'
 import { mapGetters, mapMutations } from 'vuex'
-import {
-  getMousePosition,
-  removeTextProperty,
-  getComponentInfo,
-  initializeProcessData,
-  processTemplate
-} from './util'
-import Toolbox from './main/toolbox'
-import WorkflowCanvas from './main/canvas'
-import IconSvg from './main/icon-svg'
-import ContextMenu from './main/context-menu'
+import { getMousePosition, removeTextProperty, getComponentInfo, initializeProcessData, processTemplate } from './util'
+import Toolbox from './main/toolbox.vue'
+import WorkflowCanvas from './main/canvas.vue'
+import IconSvg from './main/icon-svg.vue'
+import ContextMenu from './main/context-menu.vue'
 import convert from 'xml-js'
 import processService from './process-service'
 import FileSaver from 'file-saver'
 import Prism from 'prismjs'
-import AdminSaveDialog from './main/admin-save-dialog'
+import AdminSaveDialog from './main/admin-save-dialog.vue'
 import authApi from 'agilebuilder-ui/src/utils/auth-api'
 import http from 'agilebuilder-ui/src/utils/request'
 
@@ -198,7 +172,8 @@ export default {
       isShowEnable: false, // 流程定义是否已启用，如果已启用，则不显示“启用”按钮,草稿和禁用时才显示启用按钮
       defVersion: 0, //流程定义版本
       workflowDefVersionList: [], // 流程定义各版本集合
-      isShowDefVersionList: false // 是否显示流程定义版本下拉选
+      isShowDefVersionList: false, // 是否显示流程定义版本下拉选
+      canvasKey: 0
     }
   },
   computed: {
@@ -228,7 +203,7 @@ export default {
       }
     },
     sourceComponentType(newVal) {
-      if(newVal) {
+      if (newVal) {
         this.copyTache()
       }
     }
@@ -273,7 +248,6 @@ export default {
       'setProcessCode',
       'setPageCode',
       'setSourceComponentForCopy'
-
     ]),
     initShowDefinitionWhenUpdate(defId, workflowCode, workflowVersion) {
       window.$store.commit('wfEditor/setIsCreateDefinition', 'false')
@@ -301,6 +275,7 @@ export default {
         }
         const xml = data.xml
         this.initProcessByXml(xml, definition)
+        this.canvasKey++
       })
     },
     getWorkflowDefVersionList() {
@@ -334,9 +309,7 @@ export default {
       }
     },
     changeDefVersion(newDefVersion) {
-      const defList = this.workflowDefVersionList.filter(
-        (def) => def.definitionVersion === newDefVersion
-      )
+      const defList = this.workflowDefVersionList.filter((def) => def.definitionVersion === newDefVersion)
       if (defList && defList.length > 0) {
         const newDef = defList[0]
         // 打开或新建流程图时先清空画布，开发过程中代码热更新的时候可以避免节点重复
@@ -373,6 +346,7 @@ export default {
       }
       // 得到表单字段放到vuex
       this.fetchFormFields()
+      this.clearCanvas()
       initializeProcessData(this.process)
       this.count = this.getMaxCount() + 1
     },
@@ -381,10 +355,10 @@ export default {
       this.process.attr.code = definition.code
       this.process.properties.basicProperties.systemCode = definition.systemCode
       if (this.pageCode) {
-        if(!this.process.properties.parameterSettings){
+        if (!this.process.properties.parameterSettings) {
           this.process.properties.parameterSettings = {}
         }
-        if(!this.process.properties.parameterSettings.doTask){
+        if (!this.process.properties.parameterSettings.doTask) {
           this.process.properties.parameterSettings.doTask = {}
         }
         this.process.properties.parameterSettings.doTask.url = 'page:' + this.pageCode
@@ -456,8 +430,7 @@ export default {
           lineType: transition.lineInfo.type
         }
         if (transition.lineInfo.type === 'CurveLine' && transition.lineInfo.controlPoint) {
-          transition.ref.g.coordinate =
-            transition.lineInfo.controlPoint.x + ',' + transition.lineInfo.controlPoint.y
+          transition.ref.g.coordinate = transition.lineInfo.controlPoint.x + ',' + transition.lineInfo.controlPoint.y
         } else if (transition.lineInfo.type === 'BrokenLine' && transition.lineInfo.controlPoint) {
           let coordinate = ''
           transition.lineInfo.controlPoint.forEach((point) => {
@@ -490,16 +463,14 @@ export default {
           xml: xml,
           publishVersion: this.systemPublishVersion
         }
-        this.$http
-          .post(this.baseAPI + '/wf-editor/workflow-definitions', param)
-          .then((definition) => {
-            // 表示草稿状态保存
-            this.isShowEnable = true
-            window.$store.commit('wfEditor/setIsCreateDefinition', 'false')
-            this.definitionId = definition.id
-            this.$alert(this.$t('workflowEditorMessage.savedSuccessfully'))
-            // console.log('新建成功' + this.definitionId)
-          })
+        this.$http.post(this.baseAPI + '/wf-editor/workflow-definitions', param).then((definition) => {
+          // 表示草稿状态保存
+          this.isShowEnable = true
+          window.$store.commit('wfEditor/setIsCreateDefinition', 'false')
+          this.definitionId = definition.id
+          this.$alert(this.$t('workflowEditorMessage.savedSuccessfully'))
+          // console.log('新建成功' + this.definitionId)
+        })
       }
     },
     saveWf(xml, url, message) {
@@ -570,16 +541,14 @@ export default {
           xml: xml,
           publishVersion: this.systemPublishVersion
         }
-        this.$http
-          .post(this.baseAPI + '/wf-editor/workflow-definitions', param)
-          .then((definition) => {
-            // 表示草稿状态保存
-            this.isShowEnable = true
-            window.$store.commit('wfEditor/setIsCreateDefinition', 'false')
-            this.definitionId = definition.id
-            this.$alert(this.$t('workflowEditorMessage.savedSuccessfully'))
-            // console.log('新建成功' + this.definitionId)
-          })
+        this.$http.post(this.baseAPI + '/wf-editor/workflow-definitions', param).then((definition) => {
+          // 表示草稿状态保存
+          this.isShowEnable = true
+          window.$store.commit('wfEditor/setIsCreateDefinition', 'false')
+          this.definitionId = definition.id
+          this.$alert(this.$t('workflowEditorMessage.savedSuccessfully'))
+          // console.log('新建成功' + this.definitionId)
+        })
       }
     },
     updateWfVersion() {
@@ -669,10 +638,7 @@ export default {
         const ref = processTemplate['new' + this.componentToDraw]()
         // 组件类型转换为首字母小写形式
         ref.attr.id =
-          this.componentToDraw.charAt(0).toLowerCase() +
-          this.componentToDraw.substring(1) +
-          '_' +
-          this.count
+          this.componentToDraw.charAt(0).toLowerCase() + this.componentToDraw.substring(1) + '_' + this.count
         const tache = {
           // 默认id是组件类型加上下划线和数字序号，每次打开流程图的时候都需要动态计算最大的序号，然后加1作为count的的初始值
           id: ref.attr.id,
@@ -690,26 +656,22 @@ export default {
       }
     },
     copyTache() {
-      const sourceTache = this.selectedTaches && this.selectedTaches.length > 0? this.selectedTaches[0] : null
-      if(!sourceTache){
+      const sourceTache = this.selectedTaches && this.selectedTaches.length > 0 ? this.selectedTaches[0] : null
+      if (!sourceTache) {
         return
       }
       const tache = JSON.parse(JSON.stringify(sourceTache))
       const tacheType = tache.type
       const ref = tache.ref
       // 组件类型转换为首字母小写形式
-      ref.attr.id =
-        tacheType.charAt(0).toLowerCase() +
-        tacheType.substring(1) +
-        '_' +
-        this.count
+      ref.attr.id = tacheType.charAt(0).toLowerCase() + tacheType.substring(1) + '_' + this.count
       ref.attr.name = sourceTache.name + '_copy'
       // 默认id是组件类型加上下划线和数字序号，每次打开流程图的时候都需要动态计算最大的序号，然后加1作为count的的初始值
-      tache.id=ref.attr.id
-      tache.name=ref.attr.name
-      tache.x=sourceTache.x + 20 // 偏移20个像素
-      tache.y=sourceTache.y + 20
-      tache.isSelected=false
+      tache.id = ref.attr.id
+      tache.name = ref.attr.name
+      tache.x = sourceTache.x + 20 // 偏移20个像素
+      tache.y = sourceTache.y + 20
+      tache.isSelected = false
       tache.ref = ref
       this.taches.push(tache)
       this.count++
@@ -753,13 +715,11 @@ export default {
     // 启用流程定义
     enableWf() {
       if (this.definitionId) {
-        this.$http
-          .put(this.baseAPI + '/wf-editor/workflow-editors/' + this.definitionId + '/states')
-          .then(() => {
-            this.getWorkflowDefVersionList()
-            this.isShowEnable = false
-            this.$alert(this.$t('workflowEditorMessage.enabledSuccessfully'))
-          })
+        this.$http.put(this.baseAPI + '/wf-editor/workflow-editors/' + this.definitionId + '/states').then(() => {
+          this.getWorkflowDefVersionList()
+          this.isShowEnable = false
+          this.$alert(this.$t('workflowEditorMessage.enabledSuccessfully'))
+        })
       }
     }
   }