From a2adac0d0a0ffb03658b7cc79dc7d437e630c8d1 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 30 May 2024 18:31:25 +0800
Subject: [PATCH 1/5] =?UTF-8?q?-=20[=E5=8A=9F=E8=83=BD]=20=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=8C=96=E6=B5=81=E7=A8=8B=E7=BB=84=E4=BB=B6=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9=20=20=20-=20[=E5=85=B3=E8=81=94]=20#[1158069810069504?=
 =?UTF-8?q?]=E8=87=AA=E5=8A=A8=E5=8C=96=E6=B5=81=E7=A8=8B=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E8=8A=82=E7=82=B9=20http://192.168.0.96:8090/demo/rdm?=
 =?UTF-8?q?.html#/story-detail/939050947543040/939050947543042/11580698100?=
 =?UTF-8?q?69504?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/assets/languages/term/en.json   |   3 +-
 src/resources/assets/languages/term/zh.json   |   3 +-
 .../autoexec/components/param/view/node.vue   |   4 +-
 src/views/pages/process/flow/flow-valid.js    |  34 +--
 .../components/autoexec/autoexec-setting.vue  | 182 +++++++++++++
 .../components/autoexec/flowNodeValid.js      |  25 ++
 .../flowedit/components/autoexec/index.vue    | 116 ++++++++
 .../setting}/autoexec-config.vue              |   0
 .../setting}/config-list-dialog.vue           |   2 +-
 .../setting}/joppolicy/base.vue               |  41 ++-
 .../setting}/joppolicy/batchjobpolicy.vue     |  37 ++-
 .../joppolicy/mappingmode-expression.vue      | 252 ++++++++++++++++++
 .../setting}/joppolicy/singlejobpolicy.vue    |  43 ++-
 .../setting}/protocol-readonly.vue            |   0
 .../{autoexec-node.vue => base-config.vue}    | 238 +++++++++--------
 .../process/flow/flowedit/components/index.js |   2 +-
 16 files changed, 832 insertions(+), 150 deletions(-)
 create mode 100644 src/views/pages/process/flow/flowedit/components/autoexec/autoexec-setting.vue
 create mode 100644 src/views/pages/process/flow/flowedit/components/autoexec/flowNodeValid.js
 create mode 100644 src/views/pages/process/flow/flowedit/components/autoexec/index.vue
 rename src/views/pages/process/flow/flowedit/components/{nodesetting/autoexec => autoexec/setting}/autoexec-config.vue (100%)
 rename src/views/pages/process/flow/flowedit/components/{nodesetting/autoexec => autoexec/setting}/config-list-dialog.vue (97%)
 rename src/views/pages/process/flow/flowedit/components/{nodesetting/autoexec => autoexec/setting}/joppolicy/base.vue (82%)
 rename src/views/pages/process/flow/flowedit/components/{nodesetting/autoexec => autoexec/setting}/joppolicy/batchjobpolicy.vue (92%)
 create mode 100644 src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue
 rename src/views/pages/process/flow/flowedit/components/{nodesetting/autoexec => autoexec/setting}/joppolicy/singlejobpolicy.vue (93%)
 rename src/views/pages/process/flow/flowedit/components/{nodesetting/autoexec => autoexec/setting}/protocol-readonly.vue (100%)
 rename src/views/pages/process/flow/flowedit/components/{autoexec-node.vue => base-config.vue} (48%)

diff --git a/src/resources/assets/languages/term/en.json b/src/resources/assets/languages/term/en.json
index dc3f4151..1440423c 100644
--- a/src/resources/assets/languages/term/en.json
+++ b/src/resources/assets/languages/term/en.json
@@ -590,7 +590,8 @@
     "phase": "·Stage",
     "channel": "passageway",
     "saveandstart": "Save and start",
-    "createcollection": "Create Collection"
+    "createcollection": "Create Collection",
+    "taskinformation": "Work order information"
   },
   "autoexec": {
     "addrootdirectory": "Add root directory",
diff --git a/src/resources/assets/languages/term/zh.json b/src/resources/assets/languages/term/zh.json
index 5c95e397..81fe5472 100644
--- a/src/resources/assets/languages/term/zh.json
+++ b/src/resources/assets/languages/term/zh.json
@@ -590,7 +590,8 @@
     "phase": "·阶段",
     "channel": "通道",
     "saveandstart": "保存并开始",
-    "createcollection": "创建集合"
+    "createcollection": "创建集合",
+    "taskinformation": "工单信息"
   },
   "autoexec": {
     "addrootdirectory": "添加根目录",
diff --git a/src/views/pages/autoexec/components/param/view/node.vue b/src/views/pages/autoexec/components/param/view/node.vue
index 4c152002..eb573636 100644
--- a/src/views/pages/autoexec/components/param/view/node.vue
+++ b/src/views/pages/autoexec/components/param/view/node.vue
@@ -51,10 +51,12 @@
 </template>
 <script>
 import viewmixin from './viewmixin.js';
+import AddNode from '../edit/node/add-node'; //异步加载报错
 export default {
   name: 'Node',
   components: {
-    AddNode: () => import('../edit/node/add-node'),
+    AddNode,
+    // AddNode: () => import('@/views/pages/autoexec/components/param/edit/node/add-node.vue'),
     MoreTarget: () => import('@/resources/components/FormMaker/formedit/view/resourceinput/more-target.vue')
   },
   filters: {},
diff --git a/src/views/pages/process/flow/flow-valid.js b/src/views/pages/process/flow/flow-valid.js
index 1d141ddd..461207b8 100644
--- a/src/views/pages/process/flow/flow-valid.js
+++ b/src/views/pages/process/flow/flow-valid.js
@@ -1,6 +1,19 @@
 import utils from '@/resources/assets/js/util.js';
 import { $t } from '@/resources/init.js';
+let validConfig = {};
+try {
+  // 导入组件校验方法
+  const validPath = require.context('@', true, /flowNodeValid.js$/);
+  validPath
+    .keys()
+    .forEach(path => {
+      Object.assign(validConfig, validPath(path).nodeConfigValid);
+    });
+} catch (error) {
+  console.error('flowNodeValid.js异常', error);
+}
 let valid = {
+  ...validConfig,
   common(nodeConfig, d, that) {
     //公共校验方法  校验名称
     let validList = this.poliyUser(nodeConfig, d, that) || [];
@@ -277,27 +290,6 @@ let valid = {
     }
     return validList;
   },
-  autoexec(nodeConfig, d, that) {
-    //自动化节点
-    let validList = [];
-    let nodeData = nodeConfig.stepConfig || {};
-    let autoexecConfig = nodeData.autoexecConfig || {};
-    if (nodeConfig.handler === 'autoexec') {
-      if (!autoexecConfig.failPolicy) {
-        validList.push({
-          name: $t('form.validate.required', { target: $t('page.failurestrategy') }),
-          href: '#autoexecCombop'
-        });
-      }
-      if (that.$utils.isEmpty(autoexecConfig.configList)) {
-        validList.push({
-          name: $t('form.validate.leastonetarget', { target: $t('term.autoexec.job') }),
-          href: '#autoexecCombop'
-        });
-      }
-    }
-    return validList;
-  },
   timer(nodeConfig, d, that) {
     //定时节点
     let validList = [];
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/autoexec-setting.vue b/src/views/pages/process/flow/flowedit/components/autoexec/autoexec-setting.vue
new file mode 100644
index 00000000..77f3ca44
--- /dev/null
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/autoexec-setting.vue
@@ -0,0 +1,182 @@
+
+<template>
+  <div>
+    <div class="control-box">
+      <div class="control-setting">
+        <span class="label">
+          <span>{{ $t('term.process.recreatenewjob') }}</span>
+          <Tooltip
+            max-width="300"
+            :content="$t('message.process.recreatenewjobtip')"
+            theme="light"
+            placement="bottom"
+            :transfer="true"
+          >
+            <span class="text-href tsfont-info-o"></span>
+          </Tooltip>
+        </span>
+        <span class="control-btn">
+          <TsFormSwitch v-model="autoexecConfig.rerunStepToCreateNewJob"></TsFormSwitch>
+        </span>
+      </div>
+    </div>
+    <div class="permission-list">
+      <div class="list">
+        <div class="second-title text-grey require-label">{{ $t('page.failurestrategy') }}</div>
+        <div class="input-border">
+          <TsFormSelect
+            ref="failPolicy"
+            v-model="autoexecConfig.failPolicy"
+            :dataList="failPolicyList"
+            :validateList="validateList"
+            border="border"
+          > </TsFormSelect>
+        </div>
+      </div>
+    </div>
+    <div id="autoexecConfig">
+      <div class="autoexecConfig-top">
+        <div class="require-label text-grey">{{ $t('term.inspect.jobdetail') }}</div>
+        <div class="text-href" @click="editAutoexecList">{{ autoexecConfig.configList.length > 0? $t('page.edit') : $t('term.deploy.clickadd') }}</div>
+      </div>
+      <div v-if="autoexecConfig.configList && autoexecConfig.configList.length > 0" class="pl-nm pr-nm">
+        <div
+          v-for="item in autoexecConfig.configList"
+          :key="item.uuid"
+          class="overflow pb-sm"
+          :title="item.jobName"
+        >
+          {{ item.jobName }}
+        </div>
+      </div>
+      <div v-if="!isValid && $utils.isEmpty(autoexecConfig.configList)" class="form-error-tip pl-nm">
+        {{ $t('form.validate.leastonetarget', {'target': $t('term.autoexec.job')}) }}
+      </div>
+    </div>
+    <ConfigListDialog
+      v-if="isShow"
+      :formUuid="formUuid"
+      :list="autoexecConfig.configList"
+      @close="closeConfigList"
+    ></ConfigListDialog>
+  </div>
+</template>
+<script>
+export default {
+  name: '',
+  components: {
+    ConfigListDialog: () => import('./setting/config-list-dialog.vue'),
+    TsFormSwitch: () => import('@/resources/plugins/TsForm/TsFormSwitch'),
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect')
+  },
+  filters: {
+  },
+  props: {
+    defaultAutoexecConfig: Object,
+    allPrevNodes: Array, //所有前置节点，用于判断是否是开始节点
+    uuid: String, //节点uuid
+    formUuid: String
+  },
+  data() {
+    return {
+      validateList: ['required'],
+      autoexecConfig: {
+        failPolicy: null,
+        rerunStepToCreateNewJob: 0,
+        configList: []
+      },
+      failPolicyList: [], //失败策略
+      isShow: false,
+      isValid: true //校验
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getFailPolicyList();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    initData(val) {
+      let config = this.$utils.deepClone(val);
+      if (val) {
+        Object.keys(this.autoexecConfig).forEach(key => {
+          if (config[key]) {
+            this.autoexecConfig[key] = config[key];
+          }
+        });
+      }
+    },
+    getFailPolicyList() {
+      let data = {
+        enumClass: 'neatlogic.module.autoexec.constvalue.FailPolicy'
+      };
+      this.$api.common.getSelectList(data).then((res) => {
+        if (res.Status == 'OK') {
+          let failPolicyList = res.Return || [];
+          let newfailPolicyList = [];
+          let isBack = false;
+          if (this.nodeAllLinksList && this.nodeAllLinksList.length > 0) {
+            this.nodeAllLinksList.forEach(item => {
+              if (item.config.type == 'backward') {
+                isBack = true;
+              }
+            });
+          }
+          if (!isBack) {
+            newfailPolicyList = failPolicyList.filter(f => f.value != 'back');
+          } else {
+            newfailPolicyList = failPolicyList;
+          }
+          this.failPolicyList = newfailPolicyList;
+        }
+      });
+    },
+    editAutoexecList() {
+      this.isShow = true;
+    },
+    closeConfigList(list) {
+      if (list) {
+        this.$set(this.autoexecConfig, 'configList', list);
+      }
+      this.isShow = false;
+    },
+    autoexecConfigValid() { //校验
+      this.isValid = true;
+      if (this.$utils.isEmpty(this.autoexecConfig.configList)) {
+        this.isValid = false;
+      }
+      return this.isValid;
+    },
+    saveAutoexecConfig() {
+      return this.autoexecConfig;
+    }
+  },
+  computed: {},
+  watch: {
+    defaultAutoexecConfig: {
+      handler(val) {
+        if (val && JSON.stringify(val) != '{}') {
+          this.initData(val);
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  }
+};
+</script>
+<style lang="less" scoped>
+.autoexecConfig-top {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 8px 16px;
+}
+</style>
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/flowNodeValid.js b/src/views/pages/process/flow/flowedit/components/autoexec/flowNodeValid.js
new file mode 100644
index 00000000..945fc0c9
--- /dev/null
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/flowNodeValid.js
@@ -0,0 +1,25 @@
+import { $t } from '@/resources/init.js';
+const nodeConfigValid = {
+  autoexec(nodeConfig, d, that) {
+    //自动化节点
+    let validList = [];
+    let nodeData = nodeConfig.stepConfig || {};
+    let autoexecConfig = nodeData.autoexecConfig || {};
+    if (nodeConfig.handler === 'autoexec') {
+      if (!autoexecConfig.failPolicy) {
+        validList.push({
+          name: $t('form.validate.required', { target: $t('page.failurestrategy') }),
+          href: '#autoexecCombop'
+        });
+      }
+      if (that.$utils.isEmpty(autoexecConfig.configList)) {
+        validList.push({
+          name: $t('form.validate.leastonetarget', { target: $t('term.autoexec.job') }),
+          href: '#autoexecCombop'
+        });
+      }
+    }
+    return validList;
+  }
+};
+export { nodeConfigValid };
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/index.vue b/src/views/pages/process/flow/flowedit/components/autoexec/index.vue
new file mode 100644
index 00000000..3233f39d
--- /dev/null
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/index.vue
@@ -0,0 +1,116 @@
+
+<template>
+  <div class="autoexecNode">
+    <BaseConfig
+      ref="baseConfig"
+      :keyList="keyList"
+      :formUuid="formUuid"
+      :nodeConfig="nodeConfig"
+      :formConfig="formConfig"
+      :nodeFormconfig="nodeFormconfig"
+      :nodeChildren="nodeChildren"
+      :toSetting="toSetting"
+      :prevNodes="prevNodes"
+      :allPrevNodes="allPrevNodes"
+      :formhandlerList="formhandlerList"
+      :isExtendList="isExtendList"
+      :isStart="isStart"
+      :stepList="stepList"
+      :nodeAllLinksList="nodeAllLinksList"
+    >
+      <template v-slot:customConfig>
+        <AutoexecSetting
+          ref="autoexecConfig"
+          :defaultAutoexecConfig="autoexecConfig"
+          :allPrevNodes="allPrevNodes"
+          :uuid="uuid"
+          :formUuid="formUuid"
+        ></AutoexecSetting>
+      </template>
+    </BaseConfig>
+  
+  </div>
+</template>
+<script>
+
+export default {
+  name: '',
+  components: {
+    BaseConfig: () => import('../base-config.vue'),
+    AutoexecSetting: () => import('./autoexec-setting.vue')
+  },
+  filters: {},
+  mixins: [],
+  props: {
+    nodeConfig: Object, //节点数据
+    formConfig: Object,
+    nodeFormconfig: Object,
+    prevNodes: Array, //前置节点数据
+    allPrevNodes: Array, //所有前置节点，用于判断是否是开始节点
+    toSetting: Function,
+    isStart: Boolean, // 是否是起始节点
+    nodeChildren: Array, //条件子节点
+    formhandlerList: Array, //表单组件信息（含授权）
+    isExtendList: Array, //表单额外扩展属性配置列表比如配置项
+    stepList: Array, //当前画布的所有步骤节点数据
+    nodeAllLinksList: Array //节点连线数据
+  },
+  data() {
+    return {
+      uuid: this.nodeConfig && this.nodeConfig.uuid, //节点uuid
+      formUuid: this.formConfig && this.formConfig.uuid ? this.formConfig.uuid : '', //表单id
+      keyList: ['actionConfig', 'authorityList', 'customStatusList', 'customButtonList', 'replaceableTextList', 'notifyPolicyConfig', 'workerPolicyConfig'], //stepConfig 需要包含的数据
+      autoexecConfig: {}
+    };
+  },
+  beforeCreate() {},
+  created() {
+    this.getNodeSetting();
+  },
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    getNodeSetting() {
+      //初始化节点数据
+      if (!this.nodeConfig) {
+        return;
+      }
+      let config = this.configData = this.$utils.deepClone(this.nodeConfig);
+      if (config.stepConfig) {
+        this.autoexecConfig = config.stepConfig.autoexecConfig || {};
+      }
+    },
+    nodeValid(href) {
+      //校验
+      let querySelect = href.substring(1);
+      this.$nextTick(() => {
+        if (querySelect == 'autoexecCombop') {
+          this.$refs.autoexecConfig && this.$refs.autoexecConfig.autoexecConfigValid();
+        } else {
+          this.$refs.baseConfig.nodeBaseValid(querySelect);
+        }
+      });
+    },
+    saveNodeData() {
+      //保存数据
+      let stepConfig = Object.assign({}, this.configData.stepConfig);
+      if (this.$refs.baseConfig) {
+        Object.assign(stepConfig, this.$refs.baseConfig.saveNodeBaseData());
+      }
+      if (this.$refs.autoexecConfig) { //组合工具
+        let autoexecConfig = this.$refs.autoexecConfig.saveAutoexecConfig();
+        this.$set(stepConfig, 'autoexecConfig', autoexecConfig);
+      }
+      return stepConfig;
+    }
+  },
+  computed: {},
+  watch: {}
+};
+</script>
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/autoexec-config.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/autoexec-config.vue
similarity index 100%
rename from src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/autoexec-config.vue
rename to src/views/pages/process/flow/flowedit/components/autoexec/setting/autoexec-config.vue
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/config-list-dialog.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue
similarity index 97%
rename from src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/config-list-dialog.vue
rename to src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue
index 206c5a34..2ff8d1e5 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/config-list-dialog.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue
@@ -15,7 +15,7 @@
           <div class="autoexec-title">
             <div>#{{ index+1 }}</div>
             <div class="action-btn">
-              <!-- <span class="tsfont-close pr-sm text-tip-active" @click="delItem(index)"></span> -->
+              <span class="tsfont-close pr-sm text-tip-active" @click="delItem(index)"></span>
               <span class="text-tip-active" :class="item.isShow ? 'tsfont-down' : 'tsfont-up'" @click="item.isShow=!item.isShow"></span>
             </div>
           </div>
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/joppolicy/base.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/base.vue
similarity index 82%
rename from src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/joppolicy/base.vue
rename to src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/base.vue
index f19bcfff..8a25df95 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/joppolicy/base.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/base.vue
@@ -10,7 +10,8 @@ export default {
     TsFormRadio: () => import('@/resources/plugins/TsForm/TsFormRadio'),
     TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput'),
     TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
-    TsTable: () => import('@/resources/components/TsTable/TsTable.vue')
+    TsTable: () => import('@/resources/components/TsTable/TsTable.vue'),
+    MappingmodeExpression: () => import('@/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue')
   },
   props: {
     config: Object,
@@ -34,7 +35,14 @@ export default {
         }
       ],
       validateList: ['required'],
-      formDataList: [] //表单赋值：仅支持文本框、文本域类型的控件赋值
+      formDataList: [], //表单赋值：仅支持文本框、文本域类型的控件赋值
+      processTaskParamConfig: {
+        dynamicUrl: '/api/rest/process/condition/list',
+        textName: 'label',
+        valueName: 'name',
+        border: 'border',
+        transfer: true
+      }
     };
   },
   created() {
@@ -58,6 +66,20 @@ export default {
         });
       }
     },
+    runtimeParamMappingModeList(type) {
+      let dataList = this.$utils.deepClone(this.mappingModeList);
+      dataList.push({
+        text: this.$t('term.process.taskinformation'),
+        value: 'processTaskParam'
+      });
+      if (type === 'text') {
+        dataList.push({
+          text: this.$t('term.cmdb.expression'),
+          value: 'expression'
+        });
+      }
+      return dataList;
+    },
     getRoundCountText(value) {
       let text = value;
       if (value === 0) {
@@ -106,6 +128,16 @@ export default {
           this.$set(e, '_disabled', false);
         }
       });
+    },
+    addFilter(filterList) {
+      filterList.push({
+        'column': '',
+        'expression': 'like',
+        'value': ''
+      });
+    },
+    delFilterItem(filterList, index) {
+      filterList.splice(index, 1);
     }
   },
   computed: {
@@ -127,7 +159,7 @@ export default {
       };
     },
     getAttrList() {
-      return (value) => {
+      return (value, column, filterList) => {
         let dataList = [];
         if (this.allFormitemList && this.allFormitemList.length > 0) {
           let find = this.allFormitemList.find(item => item.uuid === value);
@@ -135,7 +167,8 @@ export default {
             find.config.dataConfig.forEach(d => {
               dataList.push({
                 text: d.label,
-                value: d.uuid
+                value: d.uuid,
+                _disabled: !!(filterList && filterList.find(f => f.column === d.uuid && f.column != column))
               });
             });
           }
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/joppolicy/batchjobpolicy.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue
similarity index 92%
rename from src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/joppolicy/batchjobpolicy.vue
rename to src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue
index da510b7b..5b0c33db 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/joppolicy/batchjobpolicy.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue
@@ -17,12 +17,17 @@
     <TsFormItem :label="$t('term.dashboard.datafilter')" labelPosition="left" required>
       <TsFormSwitch v-model="isActive" @on-change="changeActive"></TsFormSwitch>
       <div v-if="isActive">
-        <TsRow v-for="(f,findex) in filterList" :key="findex" :gutter="8">
+        <TsRow
+          v-for="(f,findex) in filterList"
+          :key="findex"
+          :gutter="8"
+          class="pb-xs"
+        >
           <Col span="6">
             <TsFormSelect
               ref="formValid"
               v-model="f.column"
-              :dataList="getAttrList(batchJobDataSource.attributeUuid)"
+              :dataList="getAttrList(batchJobDataSource.attributeUuid, f.column, filterList)"
               :validateList="validateList"
               :firstSelect="false"
               transfer
@@ -40,7 +45,7 @@
               @on-change="changeFilter"
             ></TsFormSelect>
           </Col>
-          <Col span="12">
+          <Col span="10">
             <TsFormInput
               ref="formValid"
               v-model="f.value"
@@ -48,7 +53,11 @@
               @on-change="changeFilter"
             ></TsFormInput>
           </Col>
+          <Col span="2">
+            <span class="text-tip-active tsfont-trash-o delete-condition" @click="delFilterItem(r.filterList, findex)"></span>
+          </Col>
         </TsRow>
+        <span class="tsfont-plus text-href" @click="addFilter(filterList)">{{ $t('term.pbc.adddata') }}</span>
       </div>
     </TsFormItem>
     <div v-if="autoexecConfig.scenarioParamList.length > 0">
@@ -300,6 +309,28 @@
                 :isRequired="!!r.isRequired"
               ></Edit>
             </template>
+            <template v-else-if="r.mappingMode === 'expression'">
+              <MappingmodeExpression
+                ref="formValid"
+                :allFormitemList="allFormitemList"
+                :value="r.value"
+                :formCommonComponentList="getFormComponent('formCommonComponent')"
+                :mappingDataList="runtimeParamMappingModeList(r.type)"
+                :formTableComponentList="getFormComponent('formTableComponent')"
+                :isRequired="!!r.isRequired"
+                @setConfig="(val)=>{
+                  $set(r,'value',val);
+                }"
+              ></MappingmodeExpression>
+            </template>
+            <template v-else-if="r.mappingMode === 'processTaskParam'">
+              <TsFormSelect
+                ref="formValid"
+                v-model="r.value"
+                v-bind="processTaskParamConfig"
+                :validateList="r.isRequired? validateList:[]"
+              ></TsFormSelect>
+            </template>
             <template v-else>
               <TsFormInput
                 ref="formValid"
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue
new file mode 100644
index 00000000..dc291eb2
--- /dev/null
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue
@@ -0,0 +1,252 @@
+<template>
+  <div>
+    <Tag
+      v-for="(item, index) in expression"
+      :key="index"
+      :closable="true"
+      @on-close="deleteAttr(index)"
+    >
+      <span>{{ getLabel(item) }}</span>
+      <span class="tsfont-edit cursor" @click="editAttr(item, index)"></span>
+    </Tag>
+    <span>
+      <Poptip
+        v-model="isPopShow"
+        :transfer="true"
+        placement="right"
+        width="400"
+      >
+        <span class="text-href tsfont-plus" @click="addAttr()"></span>
+        <div slot="content" class="api">
+          <div>
+            <Tabs v-model="mappingMode" :animated="false" @on-click="changetab()">
+              <TabPane :label="$t('page.constant')" name="constant">
+                <TsFormInput
+                  ref="value_constant"
+                  v-model="currentData.value"
+                  border="border"
+                  :validateList="mappingMode === 'constant'? validateList : []"
+                ></TsFormInput>
+              </TabPane>
+              <TabPane :label="$t('term.process.formcommonitem')" name="formCommonComponent">
+                <TsFormSelect
+                  ref="value_formCommonComponent"
+                  v-model="currentData.value"
+                  :dataList="formCommonComponentList"
+                  textName="label"
+                  valueName="uuid"
+                  border="border"
+                  :validateList="mappingMode === 'formCommonComponent'? validateList : []"
+                  transfer
+                ></TsFormSelect>
+              </TabPane>
+              <TabPane v-if="isShowFormTableComponent" :label="$t('term.framework.formtableinputercomponent')" name="formTableComponent">
+                <TsRow :gutter="8">
+                  <Col :span="12">
+                    <TsFormSelect
+                      ref="value_formTableComponent"
+                      v-model="currentData.value"
+                      :dataList="formTableComponentList"
+                      textName="label"
+                      valueName="uuid"
+                      :validateList="mappingMode === 'formTableComponent'? validateList : []"
+                      :firstSelect="false"
+                      border="border"
+                      transfer
+                    ></TsFormSelect>
+                  </Col>
+                  <Col :span="12">
+                    <TsFormSelect
+                      ref="column_formTableComponent"
+                      v-model="currentData.column"
+                      :dataList="getFormTableAttrList(currentData.value)"
+                      :validateList="mappingMode === 'formTableComponent'? validateList : []"
+                      :firstSelect="false"
+                      border="border"
+                      transfer
+                    ></TsFormSelect>
+                  </Col>
+                </TsRow>
+              </TabPane>
+            </Tabs>
+            <div style="text-align: right" class="mt-md">
+              <Button class="mr-xs" size="small" @click="cancel()">{{ $t('page.cancel') }}</Button>
+              <Button type="primary" size="small" @click="confirm()">{{ $t('page.confirm') }}</Button>
+            </div>
+          </div>
+        </div>
+      </Poptip>
+    </span>
+    <div v-if="isHasMessageError" class="text-error">{{ $t('form.validate.required', {'target': $t('term.cmdb.expression')}) }}</div>
+  </div>
+</template>
+<script>
+export default {
+  name: 'MappingmodeExpression',
+  components: {
+    TsFormSelect: () => import('@/resources/plugins/TsForm/TsFormSelect'),
+    TsFormInput: () => import('@/resources/plugins/TsForm/TsFormInput')
+  },
+  props: {
+    allFormitemList: {
+      type: Array,
+      default: () => []
+    },
+    valueList: {
+      type: Array,
+      default: () => []
+    },
+    mappingDataList: {
+      type: Array,
+      default: () => []
+    },
+    formCommonComponentList: {
+      type: Array,
+      default: () => []
+    },
+    formTableComponentList: {
+      type: Array,
+      default: () => []
+    },
+    isRequired: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      expression: [],
+      isPopShow: false,
+      mappingMode: 'constant',
+      currentData: {},
+      currentIndex: null,
+      validateList: ['required'],
+      isHasMessageError: false
+    };
+  },
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {},
+  beforeUpdate() {},
+  updated() {},
+  activated() {},
+  deactivated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  methods: {
+    changetab() {
+      this.currentData = {};
+    },
+    deleteAttr(index) {
+      this.isPopShow = false;
+      this.$delete(this.expression, index);
+      this.$emit('setConfig', this.expression);
+    },
+    editAttr(item, index) {
+      this.currentData = this.$utils.deepClone(item);
+      this.currentIndex = index;
+      this.mappingMode = this.currentData.mappingMode;
+      this.isPopShow = true;
+    },
+    addAttr() {
+      this.mappingMode = 'constant';
+      this.currentIndex = null;
+      this.currentData = {};
+    },
+    cancel() {
+      this.isPopShow = false;
+      this.currentIndex = null;
+      this.currentData = {};
+    },
+    confirm() {
+      let isValid = true;
+      if (this.$refs[`value_${this.mappingMode}`]) {
+        isValid = this.$refs[`value_${this.mappingMode}`].valid();
+      }
+      if (this.$refs[`column_${this.mappingMode}`]) {
+        isValid = this.$refs[`column_${this.mappingMode}`].valid() && isValid;
+      }
+      if (isValid) {
+        this.isPopShow = false;
+        this.$set(this.currentData, 'mappingMode', this.mappingMode);
+        if (this.currentIndex === null) {
+          this.expression.push(this.currentData);
+        } else {
+          this.$set(this.expression, this.currentIndex, this.currentData);
+        }
+        this.$emit('setConfig', this.expression);
+        this.isHasMessageError = false;
+      }
+    },
+    valid() {
+      let isValid = true;
+      if (this.isRequired && this.$utils.isEmpty(this.expression)) {
+        isValid = false;
+      }
+      this.isHasMessageError = !isValid;
+      return isValid;
+    }
+  },
+  filter: {},
+  computed: {
+    isShowFormTableComponent() {
+      return this.mappingDataList.find(item => item.value === 'formTableComponent');
+    },
+    getFormTableAttrList() {
+      return (value) => {
+        let dataList = [];
+        if (value) {
+          let findTable = this.allFormitemList.find(item => item.uuid === value);
+          if (findTable && findTable.config && findTable.config.dataConfig) {
+            findTable.config.dataConfig.forEach(d => {
+              if (d.handler !== 'formtable') {
+                dataList.push({
+                  text: d.label,
+                  value: d.uuid
+                });
+              }
+            });
+          }
+        }
+        return dataList;
+      };
+    },
+    getLabel() {
+      return (item) => {
+        let label = item.value;
+        if (item.mappingMode === 'formCommonComponent') {
+          let findCommon = this.formCommonComponentList.find(f => f.uuid === item.value);
+          if (findCommon) {
+            label = findCommon.label;
+          }
+        } else if (item.mappingMode === 'formTableComponent') {
+          let findTable = this.formTableComponentList.find(f => f.uuid === item.value);
+          if (findTable) {
+            label = findTable.label;
+            let dataList = this.getFormTableAttrList(item.value);
+            let findAttr = dataList.find(d => d.value === item.column);
+            if (findAttr) {
+              label += '.' + findAttr.text;
+            }
+          }
+        }
+        return label;
+      };
+    }
+  },
+  watch: {
+    valueList: {
+      handler(val) {
+        if (!this.$utils.isSame(val, this.expression)) {
+          this.expression = this.$utils.deepClone(val) || [];
+        }
+      },
+      deep: true,
+      immediate: true
+    }
+  }
+};
+</script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/joppolicy/singlejobpolicy.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue
similarity index 93%
rename from src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/joppolicy/singlejobpolicy.vue
rename to src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue
index e6698ab6..3acd40ce 100644
--- a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/joppolicy/singlejobpolicy.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue
@@ -393,7 +393,7 @@
                 <TsFormSelect
                   ref="formValid"
                   v-model="r.mappingMode"
-                  :dataList="mappingModeList"
+                  :dataList="runtimeParamMappingModeList(r.type)"
                   :validateList="r.isRequired?validateList:[]"
                   :firstSelect="false"
                   transfer
@@ -485,6 +485,28 @@
                     :isRequired="!!r.isRequired"
                   ></Edit>
                 </template>
+                <template v-else-if="r.mappingMode === 'expression'">
+                  <MappingmodeExpression
+                    ref="formValid"
+                    :allFormitemList="allFormitemList"
+                    :value="r.value"
+                    :formCommonComponentList="getFormComponent('formCommonComponent')"
+                    :mappingDataList="runtimeParamMappingModeList(r.type)"
+                    :formTableComponentList="getFormComponent('formTableComponent')"
+                    :isRequired="!!r.isRequired"
+                    @setConfig="(val)=>{
+                      $set(r,'value',val);
+                    }"
+                  ></MappingmodeExpression>
+                </template>
+                <template v-else-if="r.mappingMode === 'processTaskParam'">
+                  <TsFormSelect
+                    ref="formValid"
+                    v-model="r.value"
+                    v-bind="processTaskParamConfig"
+                    :validateList="r.isRequired? validateList:[]"
+                  ></TsFormSelect>
+                </template>
                 <template v-else>
                   <TsFormInput
                     ref="formValid"
@@ -505,19 +527,24 @@
                   }"
                 ></TsFormSwitch>
               </div>
-              <div v-if="r.isActive" class="pb-sm">
-                <TsRow v-for="(f,findex) in r.filterList" :key="findex" :gutter="8">
+              <div v-if="r.isActive">
+                <TsRow
+                  v-for="(f,findex) in r.filterList"
+                  :key="findex"
+                  :gutter="8"
+                  class="pb-xs"
+                >
                   <Col span="10">
                     <TsFormSelect
                       ref="formValid"
                       v-model="f.column"
-                      :dataList="getAttrList(r.value)"
+                      :dataList="getAttrList(r.value, f.column, r.filterList)"
                       :validateList="validateList"
                       :firstSelect="false"
                       transfer
                     ></TsFormSelect>
                   </Col>
-                  <Col span="7">
+                  <Col span="6">
                     <TsFormSelect
                       ref="formValid"
                       v-model="f.expression"
@@ -527,14 +554,18 @@
                       transfer
                     ></TsFormSelect>
                   </Col>
-                  <Col span="7">
+                  <Col span="6">
                     <TsFormInput
                       ref="formValid"
                       v-model="f.value"
                       :validateList="validateList"
                     ></TsFormInput>
                   </Col>
+                  <Col span="2">
+                    <span class="text-tip-active tsfont-trash-o delete-condition" @click="delFilterItem(r.filterList, findex)"></span>
+                  </Col>
                 </TsRow>
+                <span class="tsfont-plus text-href" @click="addFilter(r.filterList)">{{ $t('term.pbc.adddata') }}</span>
               </div>
             </div>
           </Col>
diff --git a/src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/protocol-readonly.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/protocol-readonly.vue
similarity index 100%
rename from src/views/pages/process/flow/flowedit/components/nodesetting/autoexec/protocol-readonly.vue
rename to src/views/pages/process/flow/flowedit/components/autoexec/setting/protocol-readonly.vue
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec-node.vue b/src/views/pages/process/flow/flowedit/components/base-config.vue
similarity index 48%
rename from src/views/pages/process/flow/flowedit/components/autoexec-node.vue
rename to src/views/pages/process/flow/flowedit/components/base-config.vue
index d677695b..47b94fc1 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec-node.vue
+++ b/src/views/pages/process/flow/flowedit/components/base-config.vue
@@ -1,17 +1,17 @@
-
 <template>
-  <div class="autoexecNode">
+  <div>
     <!-- 表单场景 -->
     <FormsceneSetting
       :value="configData.stepConfig"
       :formConfig="formConfig"
       :toSetting="toSetting"
+      :nodeConfig="nodeConfig"
       @updateScene="updateScene"
     ></FormsceneSetting>
     <!-- 权限 -->
     <AuthoritySetting
       :list="authorityList"
-      :defaultIsActive="activeSetting.permission"
+      :defaultIsActive="activeSetting.enableAuthority"
       :nodeConfig="nodeConfig"
       @updateauthority="updateauthority"
     ></AuthoritySetting>
@@ -28,11 +28,10 @@
       v-bind="actionConfig"
       :defaultIsActive="activeSetting.actionSetting"
       :formConfig="formConfig"
-      @updateaction="updateaction"
       @updateActionSetting="updateActionSetting"
+      @updateaction="updateaction"
     ></ActionSetting>
-    <!-- 动作设置_end -->
-    <!-- 按钮映射 -->
+    <!--文案修改 按钮映射 -->
     <ButtonSetting
       :defaultIsActive="activeSetting.buttonStatus"
       :defaultCustomButtonList="customButtonList"
@@ -41,23 +40,8 @@
       :nodeConfig="nodeConfig"
       @updatebutton="updatebutton"
     ></ButtonSetting>
-    <div class="settingList">
-      <div v-if="formUuid !='' && isExtend(previewFormContent)">
-        <ExtendAuth
-          :config="extendConfig"
-          :noUserExtendList="noUserExtendList"
-          :formConfig="previewFormContent"
-          @updateConfig="updateExtendConfig"
-        ></ExtendAuth>
-      </div>
-    </div>
-    <AutoexecSetting
-      ref="autoexecConfig"
-      :defaultAutoexecConfig="autoexecConfig"
-      :allPrevNodes="allPrevNodes"
-      :uuid="uuid"
-      :formUuid="formUuid"
-    ></AutoexecSetting>
+    <!-- 节点自定义配置 -->
+    <slot name="customConfig"></slot>
     <!-- 初步处理人 -->
     <div v-if="!isStart">
       <AssignSetting
@@ -72,59 +56,60 @@
   </div>
 </template>
 <script>
-import AssignSetting from './nodesetting/assign-setting';
-import AutoexecSetting from './nodesetting/autoexec-setting.vue';
-import nodemixin from './nodemixin.js';
-import itemmixin from './itemmixin.js';
 export default {
   name: '',
   components: {
-    AssignSetting,
-    AutoexecSetting,
-    AuthoritySetting: () => import('./nodesetting/authority-setting.vue'),
-    NoticeSetting: () => import('./nodesetting/notice-setting.vue'),
-    ActionSetting: () => import('./nodesetting/action-setting.vue'),
-    ButtonSetting: () => import('./nodesetting/button-setting.vue'),
-    ExtendAuth: () => import('./nodesetting/extend/extendauth.vue'),
+    AuthoritySetting: () => import('./nodesetting/authority-setting.vue'), // 权限设置
+    NoticeSetting: () => import('./nodesetting/notice-setting.vue'), // 通知设置
+    ActionSetting: () => import('./nodesetting/action-setting.vue'), // 动作设置
+    ButtonSetting: () => import('./nodesetting/button-setting.vue'), // 文案修改
+    AssignSetting: () => import('./nodesetting/assign-setting.vue'), //分派处理人
     FormsceneSetting: () => import('./nodesetting/formscene-setting') // 表单场景
   },
-  filters: {},
-  mixins: [nodemixin, itemmixin],
-  props: {},
+  mixins: [],
+  props: {
+    formUuid: String,
+    keyList: {
+      type: Array,
+      default: () => ['actionConfig', 'authorityList', 'customStatusList', 'customButtonList', 'replaceableTextList', 'notifyPolicyConfig', 'workerPolicyConfig']
+    }, //当前节点需要的配置
+    nodeConfig: Object, //节点数据
+    formConfig: Object,
+    nodeFormconfig: Object,
+    prevNodes: Array, //前置节点数据
+    allPrevNodes: Array, //所有前置节点，用于判断是否是开始节点
+    toSetting: Function,
+    isStart: Boolean, // 是否是起始节点
+    nodeChildren: Array, //条件子节点
+    formhandlerList: Array, //表单组件信息（含授权）
+    isExtendList: Array, //表单额外扩展属性配置列表比如配置项
+    stepList: Array, //当前画布的所有步骤节点数据
+    nodeAllLinksList: Array //节点连线数据
+  },
   data() {
-    let _this = this;
     return {
       configData: {stepConfig: {}}, //当前节点数据
       activeSetting: {//开关设置
-        permission: 0, //权限设置开关
+        enableAuthority: 0, //权限设置开关
         buttonStatus: 0, //按钮状态设置
         informSetting: 0, //通知设置
         actionSetting: 0 // 动作设置
       },
-      formUuid: _this.formConfig && _this.formConfig.uuid ? _this.formConfig.uuid : '', //表单id
-      taskisStrategy: {
-        isStrategy: 0 //子任务节点是否开启，如果说有子任务节点id就开启，没有就关闭
-      },
       authorityList: [], //权限
       customButtonList: [], //按钮
       customStatusList: [], //工单状态映射
       replaceableTextList: [], //文案映射
       notifyPolicyConfig: {}, //通知
       actionConfig: {}, //动作数据
-      previewFormContent: null, //用来预览表单数据
-      extendConfig: {}, //拓展属性配置的流程设置
-      validateList: ['required'],
-      autoexecConfig: {}, //自动化数据
-      workerPolicyConfig: {}
+      workerPolicyConfig: {} //初步处理人
     };
   },
   beforeCreate() {},
-  created() {},
-  beforeMount() {},
-  mounted() {
-    this.keyList = ['actionConfig', 'authorityList', 'customStatusList', 'customButtonList', 'replaceableTextList', 'notifyPolicyConfig', 'autoexecConfig', 'workerPolicyConfig'];//stepConfig 需要包含的数据
+  created() {
     this.getNodeSetting();
   },
+  beforeMount() {},
+  mounted() {},
   beforeUpdate() {},
   updated() {},
   activated() {},
@@ -138,54 +123,82 @@ export default {
         return;
       }
       let config = this.configData = this.$utils.deepClone(this.nodeConfig);
-      this.uuid = config.uuid;
       this.initNodeData(config, this.keyList);//初始化数据
-      if (this.formUuid) { //获取表单对应的数据
-        this.getFormItem(this.formUuid);
+    },
+    initNodeData(config, keyList) {
+      if (!config.stepConfig) {
+        return;
+      }
+      config = config.stepConfig;
+      if (this.activeSetting) {
+        this.activeSetting.enableAuthority = config.enableAuthority || 0;
+        let btnList = [].concat(config.customStatusList || [], config.customButtonList || [], config.replaceableTextList || []);
+        this.activeSetting.buttonStatus = btnList.find(item => !!item.value) ? 1 : 0; // 文案修改
+        this.activeSetting.informSetting = config.notifyPolicyConfig && config.notifyPolicyConfig.policyId ? 1 : 0;
+        this.activeSetting.actionSetting = config.actionConfig && config.actionConfig.actionList.length > 0 ? 1 : 0; // 动作设置状态回显
+      }
+      if (keyList && keyList.length) {
+        keyList.forEach(item => {
+          this[item] = config[item] || undefined;
+        });
       }
-      this.getFailPolicyList();
-      let failPolicy = this.autoexecConfig.failPolicy || null;
-      this.failPolicy = this.$utils.deepClone(failPolicy);
     },
-    getFailPolicyList() {
-      let data = {
-        enumClass: 'neatlogic.module.autoexec.constvalue.FailPolicy'
-      };
-      this.$api.common.getSelectList(data).then((res) => {
-        if (res.Status == 'OK') {
-          let failPolicyList = res.Return || [];
-          let newfailPolicyList = [];
-          let isBack = false;
-          if (this.nodeAllLinksList && this.nodeAllLinksList.length > 0) {
-            this.nodeAllLinksList.forEach(item => {
-              if (item.config.type == 'backward') {
-                isBack = true;
+    getFormItem(uuid) {
+      //获取表单指定版本的数据，渲染表单
+      if (uuid) {
+        let data = {
+          uuid: uuid
+        };
+        this.$api.framework.form.getFormByVersionUuid(data).then(res => {
+          if (res.Status == 'OK') {
+            try {
+              let formConfig = res.Return.formConfig || {};
+              this.previewFormContent = formConfig;
+              formConfig.sceneList && formConfig.sceneList.forEach((item) => {
+                if (item.uuid) {
+                  this.formSceneUuidList.push(item.uuid);
+                }
+              });
+              if (formConfig.uuid) {
+                this.formSceneUuidList.unshift(formConfig.uuid);
               }
-            });
+            } catch (error) {
+              this.formSceneUuidList = [];
+              this.previewFormContent = {};
+            }
           }
-          if (!isBack) {
-            newfailPolicyList = failPolicyList.filter(f => f.value != 'back');
-          } else {
-            newfailPolicyList = failPolicyList;
-          }
-          this.failPolicyList = newfailPolicyList;
+        });
+      }
+    },
+    updateauthority(enableAuthority, list) {
+      this.$set(this.activeSetting, 'enableAuthority', enableAuthority);
+      this.configData.stepConfig.enableAuthority = enableAuthority;
+      this.authorityList = list || [];
+    },
+    updatebutton(data) {
+      if (data) {
+        for (let key in data) {
+          this[key] = data[key];
         }
-      });
+      }
     },
-    nodeValid(href) {
+    updateActionSetting(actionSetting) {
+      // 更新动作设置
+      this.$set(this.activeSetting, 'actionSetting', actionSetting);
+    },
+    updateScene(sceneConfig) {
+      // 更新表单场景值
+      this.$set(this.configData.stepConfig, 'formSceneUuid', sceneConfig.value);
+    },
+    nodeBaseValid(querySelect) {
       //校验
-      let querySelect = href.substring(1);
-      this.$nextTick(() => {
-        if (querySelect == 'autoexecCombop') {
-          this.$refs.autoexecConfig && this.$refs.autoexecConfig.autoexecConfigValid();
-        } else if (querySelect == 'assignData') {
-          this.$refs.assignData && this.$refs.assignData.assignValid();
-        } else {
-          this.$refs[`${querySelect}`].valid();
-        }
-      });
+      if (querySelect == 'assignData') {
+        this.$refs.assignData && this.$refs.assignData.assignValid();
+      } else {
+        this.$refs[`${querySelect}`].valid();
+      }
     },
-    saveNodeData() {
+    saveNodeBaseData() {
       //保存数据
       let stepConfig = Object.assign({}, this.configData.stepConfig);
       if (this.keyList && this.keyList.length) {
@@ -200,11 +213,6 @@ export default {
         let autoexecConfig = this.$refs.autoexecConfig.saveAutoexecConfig();
         this.$set(stepConfig, 'autoexecConfig', autoexecConfig);
       }
-      // if (!stepConfig.taskConfig) {
-      //   stepConfig.taskConfig = {};
-      //   stepConfig.taskConfig.rangeList = [];
-      //   stepConfig.taskConfig.idList = [];
-      // }
       //分派处理人
       if (this.$refs.assignData) {
         stepConfig.workerPolicyConfig = this.$refs.assignData.saveAssignData();
@@ -212,6 +220,21 @@ export default {
       stepConfig['formSceneUuid'] = this.configData.stepConfig.formSceneUuid || '';
       return this.clearNodeData(stepConfig);
     },
+    clearNodeData(stepConfig) {
+      // 清空隐藏节点值
+      let stepConfigs = this.$utils.deepClone(stepConfig);
+      for (let key in this.activeSetting) {
+        if (key == 'actionSetting' && this.activeSetting[key] == 0) {
+          // 动作设置
+          if (!stepConfigs.actionConfig) {
+            this.$set(stepConfigs, 'actionConfig', {});
+          }
+          this.$set(stepConfigs.actionConfig, 'actionList', []);
+          break;
+        }
+      }
+      return stepConfigs;
+    },
     updateaction(type, data, index) {
       if (type == 'add') {
         this.actionConfig.actionList.push(data);
@@ -224,26 +247,19 @@ export default {
       }
     }
   },
+  filter: {},
   computed: {},
   watch: {
-    formConfig: {
-      handler(newVal, oldVal) {
-        let _this = this;
-        let newformConfig = newVal ? JSON.parse(JSON.stringify(new Object(newVal))) : {};
-        this.formUuid = newformConfig.uuid || '';
-        this.extendConfig = {};
-        _this.getNodeform(newformConfig);
-        if (newformConfig.extendConfig) {
-          for (let key in newformConfig.extendConfig) {
-            this.extendConfig[key] = newformConfig.extendConfig[key] ? newformConfig.extendConfig[key][this.nodeConfig.uuid] || {} : {};
-          }
+    formUuid: {
+      handler(val) {
+        if (val) { //获取表单对应的数据
+          this.getFormItem(val);
         }
-        _this.$nextTick(() => {
-          _this.getFormItem(_this.formUuid);
-        });
       },
-      deep: true
+      immediate: true
     }
   }
 };
 </script>
+<style lang="less">
+</style>
diff --git a/src/views/pages/process/flow/flowedit/components/index.js b/src/views/pages/process/flow/flowedit/components/index.js
index e3206c0c..f9a7323a 100644
--- a/src/views/pages/process/flow/flowedit/components/index.js
+++ b/src/views/pages/process/flow/flowedit/components/index.js
@@ -5,7 +5,7 @@ import distributary from './distributary-node';
 import changecreate from './changecreate-node';
 import changehandle from './changehandle-node';
 import event from './event-node';
-import autoexec from './autoexec-node';
+import autoexec from './autoexec/index.vue';
 import timer from './timer-node';
 import cmdb from '@/views/pages/cmdb/flow/node/index.js'; //cmdb
 
-- 
Gitee


From 4e60fcea686003b9cd7bac44b541a8ff6c1a4b7c Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Thu, 30 May 2024 19:11:42 +0800
Subject: [PATCH 2/5] =?UTF-8?q?-[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E8=8A=82=E7=82=B9-=E5=8D=95=E6=AC=A1=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E4=B8=8D=E7=94=A8=E8=A1=A8=E8=BE=BE=E5=BC=8F=E7=9A=84?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E7=BB=84=E4=BB=B6=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/autoexec/setting/joppolicy/batchjobpolicy.vue | 3 ++-
 .../autoexec/setting/joppolicy/mappingmode-expression.vue    | 5 +++--
 .../autoexec/setting/joppolicy/singlejobpolicy.vue           | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue
index 5b0c33db..0ce7ff5d 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue
@@ -264,7 +264,7 @@
             <TsFormSelect
               ref="formValid"
               v-model="r.mappingMode"
-              :dataList="mappingModeList"
+              :dataList="runtimeParamMappingModeList(r.type)"
               :validateList="r.isRequired?validateList:[]"
               :firstSelect="false"
               transfer
@@ -312,6 +312,7 @@
             <template v-else-if="r.mappingMode === 'expression'">
               <MappingmodeExpression
                 ref="formValid"
+                jopPolicy="batch"
                 :allFormitemList="allFormitemList"
                 :value="r.value"
                 :formCommonComponentList="getFormComponent('formCommonComponent')"
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue
index dc291eb2..3d045cdc 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/mappingmode-expression.vue
@@ -40,7 +40,7 @@
                   transfer
                 ></TsFormSelect>
               </TabPane>
-              <TabPane v-if="isShowFormTableComponent" :label="$t('term.framework.formtableinputercomponent')" name="formTableComponent">
+              <TabPane v-if="isShowFormTableComponent && jopPolicy!='single'" :label="$t('term.framework.formtableinputercomponent')" name="formTableComponent">
                 <TsRow :gutter="8">
                   <Col :span="12">
                     <TsFormSelect
@@ -111,7 +111,8 @@ export default {
     isRequired: {
       type: Boolean,
       default: false
-    }
+    },
+    jopPolicy: String //作业策略（单次、批量）
   },
   data() {
     return {
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue
index 3acd40ce..79460637 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue
@@ -488,6 +488,7 @@
                 <template v-else-if="r.mappingMode === 'expression'">
                   <MappingmodeExpression
                     ref="formValid"
+                    jopPolicy="single"
                     :allFormitemList="allFormitemList"
                     :value="r.value"
                     :formCommonComponentList="getFormComponent('formCommonComponent')"
-- 
Gitee


From a92c684ff94f330d5023ccec069cb7e1d764de32 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 31 May 2024 10:52:14 +0800
Subject: [PATCH 3/5] =?UTF-8?q?-=20[=E5=85=B3=E8=81=94]#[1158069810069504]?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8C=96=E6=B5=81=E7=A8=8B=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=20http://192.168.0.96:8090/demo/rdm.html#/st?=
 =?UTF-8?q?ory-detail/939050947543040/939050947543042/1158069810069504?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/resources/plugins/TsForm/TsFormDatePicker.vue               | 2 +-
 .../components/autoexec/setting/joppolicy/batchjobpolicy.vue    | 2 +-
 .../components/autoexec/setting/joppolicy/singlejobpolicy.vue   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/resources/plugins/TsForm/TsFormDatePicker.vue b/src/resources/plugins/TsForm/TsFormDatePicker.vue
index 5e5c0bbe..0a78b075 100755
--- a/src/resources/plugins/TsForm/TsFormDatePicker.vue
+++ b/src/resources/plugins/TsForm/TsFormDatePicker.vue
@@ -321,7 +321,7 @@ export default {
       }
       //初始化  valueType=='format'  格式完整
       value instanceof Number && (value = new Date(value));
-      if (this.type.indexOf('time') != -1 && typeof value == 'string' && (format.indexOf('yyyy') > 0 || format.indexOf('MM') > 0)) {
+      if (this.type && this.type.indexOf('time') != -1 && typeof value == 'string' && (format.indexOf('yyyy') > 0 || format.indexOf('MM') > 0)) {
         //处理当格式是时间的但是用了错的format（比如：yyyy-mm-dd）
         value = new Date(value);
       }
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue
index 0ce7ff5d..684e5b67 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/batchjobpolicy.vue
@@ -314,7 +314,7 @@
                 ref="formValid"
                 jopPolicy="batch"
                 :allFormitemList="allFormitemList"
-                :value="r.value"
+                :valueList="r.value"
                 :formCommonComponentList="getFormComponent('formCommonComponent')"
                 :mappingDataList="runtimeParamMappingModeList(r.type)"
                 :formTableComponentList="getFormComponent('formTableComponent')"
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue
index 79460637..eeddbe44 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/joppolicy/singlejobpolicy.vue
@@ -490,7 +490,7 @@
                     ref="formValid"
                     jopPolicy="single"
                     :allFormitemList="allFormitemList"
-                    :value="r.value"
+                    :valueList="r.value"
                     :formCommonComponentList="getFormComponent('formCommonComponent')"
                     :mappingDataList="runtimeParamMappingModeList(r.type)"
                     :formTableComponentList="getFormComponent('formTableComponent')"
-- 
Gitee


From e886d9980b31164a80c78f003b314295fe3f7def Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 31 May 2024 12:00:52 +0800
Subject: [PATCH 4/5] =?UTF-8?q?-[=E5=8A=9F=E8=83=BD]=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E8=8A=82=E7=82=B9=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/process/flow/flow-valid.js                    | 4 +++-
 .../flow/flowedit/components/autoexec/autoexec-setting.vue    | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/pages/process/flow/flow-valid.js b/src/views/pages/process/flow/flow-valid.js
index f1042342..c05c218e 100644
--- a/src/views/pages/process/flow/flow-valid.js
+++ b/src/views/pages/process/flow/flow-valid.js
@@ -7,7 +7,9 @@ try {
   validPath
     .keys()
     .forEach(path => {
-      Object.assign(validConfig, validPath(path).nodeConfigValid);
+      if (validPath(path).nodeConfigValid) {
+        Object.assign(validConfig, validPath(path).nodeConfigValid);
+      }
     });
 } catch (error) {
   console.error('flowNodeValid.js异常', error);
diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/autoexec-setting.vue b/src/views/pages/process/flow/flowedit/components/autoexec/autoexec-setting.vue
index 77f3ca44..129ec10f 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec/autoexec-setting.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/autoexec-setting.vue
@@ -152,6 +152,9 @@ export default {
       if (this.$utils.isEmpty(this.autoexecConfig.configList)) {
         this.isValid = false;
       }
+      if (this.$refs.failPolicy && !this.$refs.failPolicy.valid()) {
+        this.isValid = false;
+      }
       return this.isValid;
     },
     saveAutoexecConfig() {
-- 
Gitee


From 59f917e516195412e2ec0b1845495ecd9a5d4882 Mon Sep 17 00:00:00 2001
From: dengbf <dengbf@aliyun.com>
Date: Fri, 31 May 2024 12:12:54 +0800
Subject: [PATCH 5/5] commit

---
 .../flowedit/components/autoexec/setting/config-list-dialog.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue b/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue
index 2ff8d1e5..206c5a34 100644
--- a/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue
+++ b/src/views/pages/process/flow/flowedit/components/autoexec/setting/config-list-dialog.vue
@@ -15,7 +15,7 @@
           <div class="autoexec-title">
             <div>#{{ index+1 }}</div>
             <div class="action-btn">
-              <span class="tsfont-close pr-sm text-tip-active" @click="delItem(index)"></span>
+              <!-- <span class="tsfont-close pr-sm text-tip-active" @click="delItem(index)"></span> -->
               <span class="text-tip-active" :class="item.isShow ? 'tsfont-down' : 'tsfont-up'" @click="item.isShow=!item.isShow"></span>
             </div>
           </div>
-- 
Gitee