workflow-editor 0.0.85-up → 0.0.86-up

package/packages/workflow-editor/src/properties-editors/decision.vue

@@ -12,27 +12,22 @@
     <el-form>
       <el-form-item :label="$t('workflowEditor.task.name')" label-width="40px">
         <!-- <el-input v-model="formModel.attr.name" /> -->
-        <i18n-input v-model.trim="formModel.attr.name" :i18n-key="(formModel.basicProperties && formModel.basicProperties.i18nKey)?formModel.basicProperties.i18nKey:'name.'+formModel.attr.id" @setI18n="setI18nValue" />
+        <i18n-input
+          v-model.trim="formModel.attr.name"
+          :i18n-key="
+            formModel.basicProperties && formModel.basicProperties.i18nKey
+              ? formModel.basicProperties.i18nKey
+              : 'name.' + formModel.attr.id
+          "
+          @setI18n="setI18nValue"
+        />
       </el-form-item>
       <el-form-item>
         <span>{{ $t('workflowEditor.task.allBranchFlows') }}</span>
-        <el-table
-          border
-          :data="transitions"
-          style="width: 100%"
-        >
-          <el-table-column
-            type="index"
-            width="50"
-          />
-          <el-table-column
-            prop="to"
-            :label="$t('workflowEditor.task.targetLink')"
-          />
-          <el-table-column
-            prop="condition"
-            :label="$t('workflowEditor.task.condition')"
-          />
+        <el-table border :data="transitions" style="width: 100%">
+          <el-table-column type="index" width="50" />
+          <el-table-column prop="to" :label="$t('workflowEditor.task.targetLink')" />
+          <el-table-column prop="condition" :label="$t('workflowEditor.task.condition')" />
         </el-table>
       </el-form-item>
     </el-form>
@@ -41,7 +36,7 @@
 
 <script>
 import { findOutgoingTransitionsByTacheId } from '../util.js'
-import i18nInput from './common/i18n-input'
+import i18nInput from './common/i18n-input.vue'
 export default {
   name: 'DecisionPropertiesEditor',
   components: {
@@ -53,7 +48,7 @@ export default {
       default: null
     }
   },
-  data(){
+  data() {
     return {
       dialogVisible: true
     }
@@ -65,7 +60,7 @@ export default {
     transitions() {
       const transitions = findOutgoingTransitionsByTacheId(this.formModel.attr.id)
       const data = []
-      transitions.map(transition => {
+      transitions.map((transition) => {
         data.push({
           to: transition.ref.attr.to,
           condition: transition.ref.basicProperties.condition
@@ -75,7 +70,7 @@ export default {
     }
   },
   mounted() {
-    this.$watch('model.ref.attr.name', function(newVal) {
+    this.$watch('model.ref.attr.name', function (newVal) {
       this.model.name = newVal
     })
   },
@@ -90,6 +85,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>

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

@@ -91,7 +91,7 @@
   </el-form>
 </template>
 <script>
-import TaskTitle from '../common/task-title'
+import TaskTitle from '../common/task-title.vue'
 import CustomActions from './custom-actions'
 import { validateTacheCode } from '../../util'
 import i18nInput from '../common/i18n-input'

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

@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import EditableFieldSelection from './editable-field-selection'
+import EditableFieldSelection from './editable-field-selection.vue'
 import AdditionalConditionDialog from './additional-condition-dialog'
 import { mapGetters } from 'vuex'
 import { parseCondition, displayCondition } from '../common/additional-condition-utils'

package/packages/workflow-editor/src/properties-editors/human-task/permission-settings.vue

@@ -3,11 +3,12 @@
     <el-form-item :label="$t('workflowEditor.task.allowEditingForms')">
       <el-switch v-model="formModel.editForm.permission" />
     </el-form-item>
-	  <el-form-item v-show="formModel.editForm.permission">
-		  <editable-fields v-if="formModel.editForm.permission" v-model="formModel.editForm.field" />
-		  <editable-child-fields v-if="formModel.editForm.permission" v-model="formModel.editForm.subTablePermission" />
-	  </el-form-item>
-    <el-form-item :label="$t('workflowEditor.task.allowViews')">
+    <el-form-item v-show="formModel.editForm.permission">
+      <editable-fields v-if="formModel.editForm.permission" v-model="formModel.editForm.field" />
+      <editable-child-fields v-if="formModel.editForm.permission" v-model="formModel.editForm.subTablePermission" />
+    </el-form-item>
+    <!-- 暂时隐藏以下权限，后续如果有需求再放开 2026-03-16
+		<el-form-item :label="$t('workflowEditor.task.allowViews')">
       <el-switch v-model="formModel.viewOpinion.permission" />
       <el-checkbox v-if="formModel.viewOpinion.permission" v-model="formModel.viewOpinionCheckbox">
         {{ $t('workflowEditor.task.additionalConditions') }}
@@ -99,12 +100,12 @@
     </el-card>
     <el-form-item :label="$t('workflowEditor.task.bodyPermission')">
       <el-switch v-model="formModel.officialText.permission" />
-    </el-form-item>
+    </el-form-item> -->
   </el-form>
 </template>
 <script>
-import EditableFields from './editable-fields'
-import editableChildFields from './editable-child-fields'
+import EditableFields from './editable-fields.vue'
+import editableChildFields from './editable-child-fields.vue'
 import AdditionalCondition from '../common/additional-condition'
 import UserSelection from '../common/user-selection'
 import { deepCopy } from '../../util'
@@ -126,20 +127,24 @@ export default {
     const formModel = deepCopy(this.modelValue)
     // 控制附加条件的属性名
     const attrNames = [
-      'viewOpinion', 'editOpinion', 'requireOpinion', 'viewMeetingResult', 'viewVoteResult',
-      'viewFlowHistory', 'printForm'
+      'viewOpinion',
+      'editOpinion',
+      'requireOpinion',
+      'viewMeetingResult',
+      'viewVoteResult',
+      'viewFlowHistory',
+      'printForm'
     ]
-    attrNames.forEach(name => {
+    attrNames.forEach((name) => {
       // 如果是''或者undefined,那么两次!后就是false
       formModel[name + 'Checkbox'] = !!this.modelValue[name].condition
     })
     // 控制附件各个权限的附加条件的属性名
-    const attachmentAttrNames = [
-      'add', 'delete', 'download'
-    ]
-    attachmentAttrNames.forEach(name => {
-    // 如果是''或者undefined,那么两次!后就是false
-      formModel.attachment[name + 'Checkbox'] = !!this.modelValue.attachment[name] && !!this.modelValue.attachment[name].condition
+    const attachmentAttrNames = ['add', 'delete', 'download']
+    attachmentAttrNames.forEach((name) => {
+      // 如果是''或者undefined,那么两次!后就是false
+      formModel.attachment[name + 'Checkbox'] =
+        !!this.modelValue.attachment[name] && !!this.modelValue.attachment[name].condition
       if (!formModel.attachment.permission) {
         formModel.attachment[name] = {
           permission: false,
@@ -155,70 +160,72 @@ export default {
     }
   },
   mounted() {
-    this.$watch('formModel', function(formModel) {
-      const result = {
-        editForm: { },
-        viewOpinion: { },
-        editOpinion: { },
-        requireOpinion: { },
-        viewMeetingResult: { },
-        viewVoteResult: { },
-        viewFlowHistory: { },
-        printForm: { },
-        officialText: { },
-        attachment: { },
-        deleteInstance: {
-          userCondition: ''
+    this.$watch(
+      'formModel',
+      function (formModel) {
+        const result = {
+          editForm: {},
+          viewOpinion: {},
+          editOpinion: {},
+          requireOpinion: {},
+          viewMeetingResult: {},
+          viewVoteResult: {},
+          viewFlowHistory: {},
+          printForm: {},
+          officialText: {},
+          attachment: {},
+          deleteInstance: {
+            userCondition: ''
+          }
         }
-      }
-      console.log('触发了watch')
-      result.editForm.permission = formModel.editForm.permission
-      if (formModel.editForm.permission) {
-        result.editForm.field = formModel.editForm.field
-        result.editForm.subTablePermission = formModel.editForm.subTablePermission
-      }
-
-      this.attrNames.map(name => {
-        // permission为true且附件条件的checkbox也选中了，condition才有效
-        result[name].permission = formModel[name].permission
-        if (formModel[name].permission && formModel[name + 'Checkbox']) {
-          result[name].condition = formModel[name].condition
-        } else {
-          result[name].condition = ''
+        console.log('触发了watch')
+        result.editForm.permission = formModel.editForm.permission
+        if (formModel.editForm.permission) {
+          result.editForm.field = formModel.editForm.field
+          result.editForm.subTablePermission = formModel.editForm.subTablePermission
         }
-      })
 
-      result.attachment.permission = formModel.attachment.permission
-      // 允许设置附件权限时，add，delete等的权限设置才有效，否则根本不生成add，delete等对应的json
-      if (formModel.attachment.permission) {
-        this.attachmentAttrNames.map(name => {
-        // 需要避免result的add,delete等属性为undefined
-          if (!result.attachment[name])result.attachment[name] = {}
-          // attachment不是undefined并且对应的add，delete等属性的permission为true
-          result.attachment[name].permission = formModel.attachment[name].permission
+        this.attrNames.map((name) => {
           // permission为true且附件条件的checkbox也选中了，condition才有效
-          if (formModel.attachment[name].permission && formModel.attachment[name + 'Checkbox']) {
-            result.attachment[name].condition = formModel.attachment[name].condition
+          result[name].permission = formModel[name].permission
+          if (formModel[name].permission && formModel[name + 'Checkbox']) {
+            result[name].condition = formModel[name].condition
           } else {
-            result.attachment[name].condition = ''
+            result[name].condition = ''
           }
         })
-      }
 
-      // 正文权限暂不处理
-      // this.$emit('input', result)
-      this.$emit('update:modelValue', result)
-    }, {
-      deep: true
-    })
-  },
-  methods: {
+        result.attachment.permission = formModel.attachment.permission
+        // 允许设置附件权限时，add，delete等的权限设置才有效，否则根本不生成add，delete等对应的json
+        if (formModel.attachment.permission) {
+          this.attachmentAttrNames.map((name) => {
+            // 需要避免result的add,delete等属性为undefined
+            if (!result.attachment[name]) result.attachment[name] = {}
+            // attachment不是undefined并且对应的add，delete等属性的permission为true
+            result.attachment[name].permission = formModel.attachment[name].permission
+            // permission为true且附件条件的checkbox也选中了，condition才有效
+            if (formModel.attachment[name].permission && formModel.attachment[name + 'Checkbox']) {
+              result.attachment[name].condition = formModel.attachment[name].condition
+            } else {
+              result.attachment[name].condition = ''
+            }
+          })
+        }
 
-  }
+        // 正文权限暂不处理
+        // this.$emit('input', result)
+        this.$emit('update:modelValue', result)
+      },
+      {
+        deep: true
+      }
+    )
+  },
+  methods: {}
 }
 </script>
 <style scoped>
-  .el-checkbox{
-    margin-left: 20px;
-  }
+.el-checkbox {
+  margin-left: 20px;
+}
 </style>

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

@@ -44,11 +44,11 @@
 
 <script>
 import BasicProperties from './human-task/basic-properties'
-import PermissionSettings from './human-task/permission-settings'
+import PermissionSettings from './human-task/permission-settings.vue'
 import TransactorSettings from './common/transactor-settings'
 import AutoFilledFields from './common/auto-filled-fields.vue'
 // import Reminder from './common/reminder'
-import Variables from './common/variables'
+import Variables from './common/variables.vue'
 import Events from './human-task/events'
 import NoticeReminder from './common/notice-reminder.vue'
 export default {

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

@@ -26,7 +26,11 @@
         <notice-settings v-model="model.properties.inform" />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.process.reminderSettings')" name="reminders">
-        <notice-reminder v-model:reminder-value="model.properties.reminder" :task-notice-value="model.properties.taskNotice" :isProcess="true" />
+        <notice-reminder
+          v-model:reminder-value="model.properties.reminder"
+          :task-notice-value="model.properties.taskNotice"
+          :isProcess="true"
+        />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.process.parameterSsetting')" name="parameterSettings">
         <parameter-settings :model="model.properties.parameterSettings" />
@@ -35,7 +39,7 @@
         <events v-model="model.properties.events" />
       </el-tab-pane>
       <el-tab-pane :label="$t('workflowEditor.process.processVariables')" name="variables">
-        <variables :model="model.properties.variables" />
+        <variables v-model="model.properties.variables" />
       </el-tab-pane>
     </el-tabs>
   </el-dialog>
@@ -112,4 +116,3 @@ export default {
   }
 }
 </script>
-

package/src/i18n/langs/cn.js

@@ -98,7 +98,9 @@ const cn = {
     pleaseInputCode: '请先输入编码，再做国际化配置',
     blankFieldNameOrValue: '字段名或值有空白',
     enabledSuccessfully: '启用成功',
-    additionalParam: '请求参数'
+    additionalParam: '请求参数',
+    handlingOpinion: '办理意见',
+    opinionSourceField: '意见来源字段'
   },
   workflowEditor: {
     // 主页面
@@ -458,7 +460,10 @@ const cn = {
       reminderTipRemindImmediately:
         '催办方式、通知模板、邮件模板、催办次数、通知方式、通知人员、移交人员 修改后立即生效',
       reminderTipRemindHistory:
-        '办理时限、办理时限的时间粒度(天/小时)、催办间隔、催办间隔的时间粒度(天/小时)仅对新发起的流程生效，如历史数据也需要应用最新配置，请联系运维人员调整'
+        '办理时限、办理时限的时间粒度(天/小时)、催办间隔、催办间隔的时间粒度(天/小时)仅对新发起的流程生效，如历史数据也需要应用最新配置，请联系运维人员调整',
+      timeLimitTypeDefault: '默认',
+      timeLimitTypeFormField: '表单字段',
+      timeLimitTypeCustom: '自定义'
     },
     // 流向属性
     transition: {
@@ -514,7 +519,7 @@ const cn = {
       accessControl: '进行权限控制',
       formBindingModel: '表单绑定model',
       allFields: '全部字段',
-      tableDataNotEmpty: '表格数据不为空',
+      tableDataNotEmpty: '表格数据不为空'
     }
   }
 }

package/src/i18n/langs/en.js

@@ -98,7 +98,9 @@ const en = {
     pleaseInputCode: 'Please input the code first, and then do the international configuration',
     blankFieldNameOrValue: 'Blank Field Name Or Value',
     enabledSuccessfully: 'Enabled Successfully',
-    additionalParam: 'Request parameter'
+    additionalParam: 'Request parameter',
+    handlingOpinion: 'Handling Opinion',
+    opinionSourceField: 'Opinion Source Field'
   },
   workflowEditor: {
     // 主页面
@@ -466,7 +468,10 @@ const en = {
       reminderTipRemindImmediately:
         'The reminder method, notification template, email template, maximum number of reminders, notification method, notification personnel, and transfer personnel will take effect immediately after modification',
       reminderTipRemindHistory:
-        'The processing time limit, processing time granularity (days/hours), reminder interval, reminder interval time granularity (days/hours) are only effective for newly initiated processes. If historical data also requires the latest configuration, please contact the operation and maintenance personnel to adjust'
+        'The processing time limit, processing time granularity (days/hours), reminder interval, reminder interval time granularity (days/hours) are only effective for newly initiated processes. If historical data also requires the latest configuration, please contact the operation and maintenance personnel to adjust',
+      timeLimitTypeDefault: 'Default',
+      timeLimitTypeFormField: 'Form Field',
+      timeLimitTypeCustom: 'Custom'
     },
     // 流向属性
     transition: {