workflow-editor 0.0.78-up → 0.0.80-up

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "workflow-editor",
   "private": false,
-  "version": "0.0.78-up",
+  "version": "0.0.80-up",
   "type": "module",
   "main": "./lib/workflow-editor.js",
   "scripts": {
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.2.3",
-    "agilebuilder-ui": "1.1.54",
+    "agilebuilder-ui": "1.1.66-sit1",
     "axios": "^1.5.1",
     "element-plus": "^2.4.1",
     "font-awesome": "^4.7.0",

package/packages/workflow-editor/src/properties-editors/common/task-title.vue

@@ -11,7 +11,7 @@
       {{ showText(tag) }}
     </el-tag>
     <el-input
-      v-if="inputVisible||showFormFields"
+      v-if="inputVisible||isShowAdditionalParam"
       ref="saveTagInput"
       v-model="inputValue"
       class="input-new-tag"
@@ -26,6 +26,9 @@
       <el-button class="button-new-tag" size="small" icon="Search" @click="showFormFields=true">
         {{ $t('workflowEditorMessage.selectField') }}
       </el-button>
+      <el-button class="button-new-tag" size="small" icon="EditPen" @click="showAdditionalParam">
+        {{ $t('workflowEditorMessage.additionalParam') }}
+      </el-button>
     </el-button-group>
     <form-fields v-if="showFormFields" @close="setField" />
   </div>
@@ -58,7 +61,8 @@ export default {
       inputVisible: false,
       showFormFields: false,
       inputValue: '',
-      showLabel: null
+      showLabel: null,
+      isShowAdditionalParam: false
     }
   },
   // watch: {
@@ -96,17 +100,26 @@ export default {
         this.$refs.saveTagInput.focus()
       })
     },
+    showAdditionalParam() {
+      this.isShowAdditionalParam = true
+      this.$nextTick(_ => {
+        this.$refs.saveTagInput.focus()
+      })
+    },
 
     handleInputConfirm() {
       let inputValue = this.inputValue
       if (inputValue) {
         if (this.inputVisible) {
           inputValue = '${writeTitle[' + inputValue + ']}'
+        } else if(this.isShowAdditionalParam) {
+          inputValue = '${request[' + inputValue + ']}'
         }
         this.dynamicTags.push(inputValue)
         this.$emit('update:modelValue', this.dynamicTags.join(''))
       }
       this.inputVisible = false
+      this.isShowAdditionalParam = false
       this.inputValue = ''
     },
     getType(tag) {

package/packages/workflow-editor/src/properties-editors/human-task/editable-fields.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="width: 100%">
-    <el-row style="padding-bottom: 10px;">
+    <el-row style="padding-bottom: 10px">
       <el-button type="primary" size="small" plain icon="CirclePlus" @click="add">
         {{ $t('workflowEditorPublicModel.add') }}
       </el-button>
@@ -16,31 +16,17 @@
       @selection-change="handleSelectionChange"
       @current-change="handleCurrentChange"
     >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
-      <el-table-column
-        type="index"
-        width="50"
-      />
-      <el-table-column
-        :label="$t('workflowEditor.common.name')"
-        width="180"
-      >
+      <el-table-column type="selection" width="55" />
+      <el-table-column type="index" width="50" />
+      <el-table-column :label="$t('workflowEditor.common.name')" width="180">
         <template v-slot="scope">
-          <span :style="{color:(scope.row.name && scope.row.name.indexOf('$')=== 0) ?'#409EFF':''}">{{ getFieldLabel(scope.row) }}</span>
+          <span :style="{ color: scope.row.name && scope.row.name.indexOf('$') === 0 ? '#409EFF' : '' }">{{
+            getFieldLabel(scope.row)
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="name"
-        :label="$t('workflowEditor.task.propertyName')"
-        width="180"
-      />
-      <el-table-column
-        prop="constraintRule"
-        :label="$t('workflowEditor.task.editingMethod')"
-      >
+      <el-table-column prop="name" :label="$t('workflowEditor.task.propertyName')" width="180" />
+      <el-table-column prop="constraintRule" :label="$t('workflowEditor.task.editingMethod')">
         <template v-slot="scope">
           <el-radio-group v-model="scope.row.constraintRule">
             <el-radio label="REQUIRED">
@@ -52,23 +38,29 @@
           </el-radio-group>
         </template>
       </el-table-column>
-      <el-table-column
-        prop="condition"
-        :label="$t('workflowEditor.task.condition')"
-      >
+      <el-table-column prop="condition" :label="$t('workflowEditor.task.condition')">
         <template v-slot="scope">
           <el-input
             :value="formatCondition(scope.row.condition)"
             type="textarea"
             autosize
-            @focus="selectCondition(scope.row)"
+            @click="selectCondition(scope.row)"
           />
         </template>
       </el-table-column>
     </el-table>
-       <!-- 之前是@input事件，会导致字段复选框无法选中 -->
-    <editable-field-selection v-if="showFieldSelection" :disabled-fields="disabledFields" @input-value="setSelectedFields" @close="showFieldSelection=false" />
-    <additional-condition-dialog v-if="showAdditionalCondition" v-model="currentRow.condition" @close="showAdditionalCondition=false" />
+    <!-- 之前是@input事件，会导致字段复选框无法选中 -->
+    <editable-field-selection
+      v-if="showFieldSelection"
+      :disabled-fields="disabledFields"
+      @input-value="setSelectedFields"
+      @close="showFieldSelection = false"
+    />
+    <additional-condition-dialog
+      v-if="showAdditionalCondition"
+      v-model="currentRow.condition"
+      @close="showAdditionalCondition = false"
+    />
   </div>
 </template>
 
@@ -111,11 +103,9 @@ export default {
     }
   },
   computed: {
-    ...mapGetters('wfEditor', [
-      'formFieldsWithSub'
-    ])
+    ...mapGetters('wfEditor', ['formFieldsWithSub'])
   },
-  watch:{
+  watch: {
     selectedFields: {
       handler(newValue, oldValue) {
         this.disabledFields = this.getDisabledFields(newValue)
@@ -129,12 +119,12 @@ export default {
     }
   },
   methods: {
-    getDisabledFields(feilds){
+    getDisabledFields(feilds) {
       if (feilds === null || feilds === undefined) return []
       const result = []
       // value可能是数组或者对象（一个字段时），要分别处理
       if (Array.isArray(feilds)) {
-        feilds.map(item => {
+        feilds.map((item) => {
           result.push(item.name)
         })
       } else {
@@ -142,7 +132,6 @@ export default {
       }
 
       return result
-
     },
     handleCurrentChange(val) {
       this.currentRow = val
@@ -186,9 +175,9 @@ export default {
       }
       this.selectedFields = this.selectedFields.concat(fields)
       this.selectRow(this.selectedFields[this.selectedFields.length - 1])
-        // 需要把input改成update:modelValue，否则v-model的属性无法双向绑定
+      // 需要把input改成update:modelValue，否则v-model的属性无法双向绑定
       // this.$emit('input', this.selectedFields)
-        this.$emit('update:modelValue', this.selectedFields)
+      this.$emit('update:modelValue', this.selectedFields)
     },
     formatCondition(value) {
       if (value === '' || !value) return this.$t('workflowEditor.task.nothing')
@@ -197,7 +186,7 @@ export default {
       return displayCondition(conditions)
     },
     getFieldLabel(row) {
-      const field = this.formFieldsWithSub.filter(item => {
+      const field = this.formFieldsWithSub.filter((item) => {
         return item.name === row.name
       })
       if (field.length > 0) {
@@ -214,6 +203,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

package/src/i18n/langs/cn.js

@@ -97,7 +97,8 @@ const cn = {
     addVersion: '增加版本',
     pleaseInputCode: '请先输入编码，再做国际化配置',
     blankFieldNameOrValue: '字段名或值有空白',
-    enabledSuccessfully: '启用成功'
+    enabledSuccessfully: '启用成功',
+    additionalParam: '请求参数'
   },
   workflowEditor: {
     // 主页面

package/src/i18n/langs/en.js

@@ -97,7 +97,8 @@ const en = {
     addVersion: 'Add Version',
     pleaseInputCode: 'Please input the code first, and then do the international configuration',
     blankFieldNameOrValue: 'Blank Field Name Or Value',
-    enabledSuccessfully: 'Enabled Successfully'
+    enabledSuccessfully: 'Enabled Successfully',
+    additionalParam: 'Request parameter'
   },
   workflowEditor: {
     // 主页面