hy-logic-flow 1.0.5 → 1.0.6

package/lib/hy-logic-flow-mini.common.js

@@ -10564,156 +10564,6 @@ var isBuffer = nativeIsBuffer || stubFalse;
 module.exports = isBuffer;
 
 
-/***/ }),
-
-/***/ 3660:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-
-// EXPORTS
-__webpack_require__.d(__webpack_exports__, {
-  A: function() { return /* binding */ FlowSimpleSelect; }
-});
-
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Component/FlowSimpleSelect.vue?vue&type=template&id=68aca4c4
-var render = function render() {
-  var _vm = this,
-    _c = _vm._self._c;
-  return _c('a-select', {
-    staticClass: "w-fill",
-    attrs: {
-      "size": _vm.size,
-      "show-search": "",
-      "allowClear": "",
-      "placeholder": _vm.placeholder
-    },
-    on: {
-      "change": _vm.onChange
-    },
-    model: {
-      value: _vm.currentValue,
-      callback: function ($$v) {
-        _vm.currentValue = $$v;
-      },
-      expression: "currentValue"
-    }
-  }, [_vm._l(_vm.datas, function (data, i) {
-    return [data.children?.length > 0 ? _c('a-select-opt-group', {
-      key: 'group_' + data[_vm.labelName],
-      attrs: {
-        "label": data[_vm.labelName]
-      }
-    }, _vm._l(data.children, function (childData, j) {
-      return _c('a-select-option', {
-        key: childData[_vm.labelName] + j,
-        attrs: {
-          "value": childData[_vm.valueName],
-          "title": childData[_vm.labelName]
-        }
-      }, [_vm._v(_vm._s(childData[_vm.labelName]))]);
-    }), 1) : _c('a-select-option', {
-      key: data[_vm.labelName] + i,
-      attrs: {
-        "value": data[_vm.valueName],
-        "title": data[_vm.labelName]
-      }
-    }, [_vm._v(" " + _vm._s(data[_vm.labelName]) + " ")])];
-  })], 2);
-};
-var staticRenderFns = [];
-
-;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Component/FlowSimpleSelect.vue?vue&type=script&lang=js
-/* harmony default export */ var FlowSimpleSelectvue_type_script_lang_js = ({
-  name: 'FlowSimpleSelect',
-  props: {
-    datas: {
-      type: Array,
-      required: false,
-      default: () => []
-    },
-    valueName: {
-      type: String,
-      required: false,
-      default: 'value'
-    },
-    labelName: {
-      type: String,
-      required: false,
-      default: 'name'
-    },
-    size: {
-      type: String,
-      required: false,
-      default: 'large'
-    },
-    placeholder: {
-      type: String,
-      required: false,
-      default: '请选择'
-    },
-    value: {
-      type: [Number, String],
-      required: false,
-      default: undefined
-    }
-  },
-  data() {
-    return {
-      currentValue: undefined
-    };
-  },
-  watch: {
-    value(curVal, oldVal) {
-      this.initData(curVal);
-    }
-  },
-  mounted() {
-    this.initData(this.value);
-  },
-  methods: {
-    initData(value) {
-      if (typeof value !== 'undefined') {
-        this.currentValue = value;
-      } else {
-        this.currentValue = undefined;
-      }
-    },
-    onChange(value, option) {
-      this.$emit('input', value);
-      let datas = this.datas.map(item => {
-        return Array.isArray(item.children) ? item.children : item;
-      }).flat();
-      this.$emit('update:name', datas.filter(data => data[this.valueName] == value).map(data => data[this.labelName])[0]);
-      this.$emit('change', value, datas.filter(data => data[this.valueName] == value)[0]);
-    }
-  }
-});
-;// ./packages/Component/FlowSimpleSelect.vue?vue&type=script&lang=js
- /* harmony default export */ var Component_FlowSimpleSelectvue_type_script_lang_js = (FlowSimpleSelectvue_type_script_lang_js); 
-// EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
-var componentNormalizer = __webpack_require__(1656);
-;// ./packages/Component/FlowSimpleSelect.vue
-
-
-
-
-
-/* normalize component */
-;
-var component = (0,componentNormalizer/* default */.A)(
-  Component_FlowSimpleSelectvue_type_script_lang_js,
-  render,
-  staticRenderFns,
-  false,
-  null,
-  null,
-  null
-  
-)
-
-/* harmony default export */ var FlowSimpleSelect = (component.exports);
-
 /***/ }),
 
 /***/ 3661:
@@ -28171,7 +28021,7 @@ module.exports = baseIsNative;
     drawerWidth() {
       return width => {
         if (!width) {
-          width = '40%';
+          width = '45%';
         }
         return _util_deviceUtil__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A.isMobile() ? '100%' : width;
       };
@@ -42783,6 +42633,8 @@ if (typeof __g == 'number') __g = global; // eslint-disable-line no-undef
 /* harmony import */ var _flowMethodsMixin__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6994);
 /* harmony import */ var _flowComputedMixin__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5157);
 /* harmony import */ var _flowBaseDataMixin__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(9631);
+/* harmony import */ var _flowComponentsMixin__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(8648);
+
 
 
 
@@ -42820,9 +42672,11 @@ if (typeof __g == 'number') __g = global; // eslint-disable-line no-undef
         height: 'calc(100vh - 114px)',
         'overflow-y': 'auto'
       },
+      drawerStyle: {},
       ..._flowBaseDataMixin__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .A.data()
     };
   },
+  ..._flowComponentsMixin__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .A,
   ..._flowComputedMixin__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .A,
   ..._flowMethodsMixin__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .A
 });
@@ -48041,7 +47895,7 @@ var render = function render() {
 var staticRenderFns = [];
 
 // EXTERNAL MODULE: ./packages/Component/FlowSimpleSelect.vue + 3 modules
-var FlowSimpleSelect = __webpack_require__(3660);
+var FlowSimpleSelect = __webpack_require__(8974);
 // EXTERNAL MODULE: ./packages/mixins/flowDrawerMixin.js
 var flowDrawerMixin = __webpack_require__(6915);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Common/DesignForm.vue?vue&type=script&lang=js
@@ -48561,6 +48415,54 @@ function isKey(value, object) {
 module.exports = isKey;
 
 
+/***/ }),
+
+/***/ 8648:
+/***/ (function(__unused_webpack_module, __webpack_exports__) {
+
+"use strict";
+/* harmony default export */ __webpack_exports__.A = ({
+  components: {
+    // 定义一个函数式组件作为占位符
+    VnodeContent: {
+      functional: true,
+      props: ['vnode', 'value', 'name'],
+      render(h, ctx) {
+        const {
+          vnode,
+          value,
+          name
+        } = ctx.props;
+        if (!vnode) return null;
+
+        // 深度克隆或直接修改 VNode 的 data（Vue 2 允许在渲染前微调）
+        const data = vnode.data || (vnode.data = {});
+
+        // 1. 注入 Props (对应 v-model 的 value 和 sync 的 name)
+        data.props = {
+          ...data.props,
+          value: value,
+          name: name
+        };
+
+        // 2. 注入事件 (监听 input 和 update:name)
+        const listeners = data.on || (data.on = {});
+
+        // 捕获 input 事件，触发父级的 v-model
+        listeners.input = val => {
+          ctx.listeners.input && ctx.listeners.input(val);
+        };
+
+        // 捕获 update:name 事件，触发父级的 .sync
+        listeners['update:name'] = val => {
+          ctx.listeners['update:name'] && ctx.listeners['update:name'](val);
+        };
+        return vnode;
+      }
+    }
+  }
+});
+
 /***/ }),
 
 /***/ 8655:
@@ -49375,6 +49277,173 @@ function parent(object, path) {
 module.exports = parent;
 
 
+/***/ }),
+
+/***/ 8974:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  A: function() { return /* binding */ FlowSimpleSelect; }
+});
+
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Component/FlowSimpleSelect.vue?vue&type=template&id=495492bc
+var render = function render() {
+  var _vm = this,
+    _c = _vm._self._c;
+  return _c('a-select', {
+    staticClass: "w-fill",
+    attrs: {
+      "size": _vm.size,
+      "show-search": "",
+      "filter-option": _vm.filterOption,
+      "allowClear": "",
+      "getPopupContainer": triggerNode => triggerNode.parentNode,
+      "placeholder": _vm.placeholder
+    },
+    on: {
+      "change": _vm.onChange
+    },
+    model: {
+      value: _vm.currentValue,
+      callback: function ($$v) {
+        _vm.currentValue = $$v;
+      },
+      expression: "currentValue"
+    }
+  }, [_vm._l(_vm.datas, function (data, i) {
+    return [_vm.dynamicChild(data)?.length > 0 ? _c('a-select-opt-group', {
+      key: 'group_' + data[_vm.labelName],
+      attrs: {
+        "label": data[_vm.labelName]
+      }
+    }, _vm._l(_vm.dynamicChild(data), function (childData, j) {
+      return _c('a-select-option', {
+        key: childData[_vm.labelName] + j,
+        attrs: {
+          "value": childData[_vm.valueName],
+          "title": childData[_vm.labelName]
+        }
+      }, [_vm._v(_vm._s(childData[_vm.labelName]))]);
+    }), 1) : _c('a-select-option', {
+      key: data[_vm.labelName] + i,
+      attrs: {
+        "value": data[_vm.valueName],
+        "title": data[_vm.labelName]
+      }
+    }, [_vm._v(" " + _vm._s(data[_vm.labelName]) + " ")])];
+  })], 2);
+};
+var staticRenderFns = [];
+
+;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Component/FlowSimpleSelect.vue?vue&type=script&lang=js
+/* harmony default export */ var FlowSimpleSelectvue_type_script_lang_js = ({
+  name: 'FlowSimpleSelect',
+  props: {
+    datas: {
+      type: Array,
+      required: false,
+      default: () => []
+    },
+    valueName: {
+      type: String,
+      required: false,
+      default: 'value'
+    },
+    labelName: {
+      type: String,
+      required: false,
+      default: 'name'
+    },
+    size: {
+      type: String,
+      required: false,
+      default: 'large'
+    },
+    placeholder: {
+      type: String,
+      required: false,
+      default: '请选择'
+    },
+    value: {
+      type: [Number, String],
+      required: false,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      currentValue: undefined
+    };
+  },
+  watch: {
+    value(curVal, oldVal) {
+      this.initData(curVal);
+    }
+  },
+  mounted() {
+    this.initData(this.value);
+  },
+  methods: {
+    dynamicChild(item) {
+      return item?.children || item?.child;
+    },
+    initData(value) {
+      if (typeof value !== 'undefined') {
+        this.currentValue = value;
+      } else {
+        this.currentValue = undefined;
+      }
+    },
+    onChange(value, option) {
+      this.$emit('input', value);
+      let datas = this.datas.map(item => {
+        return Array.isArray(this.dynamicChild(item)) ? this.dynamicChild(item) : item;
+      }).flat();
+      this.$emit('update:name', datas.filter(data => data[this.valueName] == value).map(data => data[this.labelName])[0]);
+      this.$emit('change', value, datas.filter(data => data[this.valueName] == value)[0]);
+    },
+    filterOption(input, option) {
+      let optionText = option.componentOptions.children[0]?.text ?? '';
+      // 如果当前节点是分组（a-select-optgroup）
+      if (option.data && option.data.attrs && option.data.attrs.role === 'optgroup') {
+        // 确保当前是具体的选项节点，再进行文本匹配
+        // 这里使用 option.componentOptions.children[0].text 获取选项的显示文本
+        optionText = option.componentOptions && option.componentOptions.children && option.componentOptions.children.length > 0 ? option.componentOptions.children[0].text : '';
+      }
+
+      // 进行大小写不敏感的模糊匹配
+      return optionText.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+    }
+  }
+});
+;// ./packages/Component/FlowSimpleSelect.vue?vue&type=script&lang=js
+ /* harmony default export */ var Component_FlowSimpleSelectvue_type_script_lang_js = (FlowSimpleSelectvue_type_script_lang_js); 
+// EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
+var componentNormalizer = __webpack_require__(1656);
+;// ./packages/Component/FlowSimpleSelect.vue
+
+
+
+
+
+/* normalize component */
+;
+var component = (0,componentNormalizer/* default */.A)(
+  Component_FlowSimpleSelectvue_type_script_lang_js,
+  render,
+  staticRenderFns,
+  false,
+  null,
+  null,
+  null
+  
+)
+
+/* harmony default export */ var FlowSimpleSelect = (component.exports);
+
 /***/ }),
 
 /***/ 8984:
@@ -53194,25 +53263,33 @@ if (typeof window !== 'undefined') {
 // Indicate to webpack that this file can be concatenated
 /* harmony default export */ var setPublicPath = (null);
 
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDesign/index.vue?vue&type=template&id=410d4fd8&scoped=true
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDesign/index.vue?vue&type=template&id=33f6e767&scoped=true
 var render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
-    staticClass: "designer-wrap"
-  }, [_vm.navable && !_vm.readable ? _c('FlowNav', {
-    attrs: {
-      "navItems": _vm.navMenu,
-      "currentNav": 3
-    },
-    on: {
-      "click": _vm.publish,
-      "change": _vm.change
+    staticClass: "designer-wrap",
+    style: {
+      height: _vm.height || '100vh'
     }
-  }) : _vm._e(), _c('div', {
+  }, [_vm._t("nav", function () {
+    return [_vm.navable && !_vm.readable ? _c('FlowNav', {
+      attrs: {
+        "navItems": _vm.navMenu,
+        "currentNav": 3
+      },
+      on: {
+        "click": _vm.publish,
+        "change": _vm.change
+      }
+    }) : _vm._e()];
+  }, {
+    "navItems": _vm.navMenu,
+    "currentNav": 3
+  }), _c('div', {
     staticClass: "designer-content-box",
     style: {
-      height: _vm.readable ? '100vh' : 'calc(100vh - 50px)'
+      height: !_vm.readable ? _vm.height || '100vh' : 'calc(' + (_vm.height || '100vh') + ' - 50px)'
     }
   }, [_vm.lf ? _c('NodePanel', {
     attrs: {
@@ -53233,18 +53310,18 @@ var render = function render() {
   }) : _vm._e(), _c('div', {
     ref: "designContainer",
     staticClass: "flow-design-wrap logic-panel"
-  })], 1)], 1);
+  })], 1)], 2);
 };
 var staticRenderFns = [];
 
-// EXTERNAL MODULE: ./packages/util/deviceUtil.js
-var deviceUtil = __webpack_require__(3305);
 // EXTERNAL MODULE: ./packages/mixins/flowMethodsMixin.js
 var flowMethodsMixin = __webpack_require__(6994);
 // EXTERNAL MODULE: ./packages/mixins/flowBaseDataMixin.js
 var flowBaseDataMixin = __webpack_require__(9631);
 // EXTERNAL MODULE: ./packages/mixins/flowComputedMixin.js
 var flowComputedMixin = __webpack_require__(5157);
+// EXTERNAL MODULE: ./packages/mixins/flowComponentsMixin.js
+var flowComponentsMixin = __webpack_require__(8648);
 ;// ./packages/mixins/flowMixin.js
 
 
@@ -53447,6 +53524,7 @@ const flowMixin = {
       ...flowBaseDataMixin/* default */.A.data()
     };
   },
+  ...flowComponentsMixin/* default */.A,
   ...flowComputedMixin/* default */.A,
   ...flowMethodsMixin/* default */.A
 };
@@ -116512,8 +116590,8 @@ var component = (0,componentNormalizer/* default */.A)(
 /* harmony default export */ var FlowNav = (component.exports);
 // EXTERNAL MODULE: ./packages/util/constant.js
 var util_constant = __webpack_require__(3595);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowNode/baseNode.vue?vue&type=template&id=4086fdcf&scoped=true
-var baseNodevue_type_template_id_4086fdcf_scoped_true_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowNode/baseNode.vue?vue&type=template&id=55b34434&scoped=true
+var baseNodevue_type_template_id_55b34434_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -116722,13 +116800,32 @@ var baseNodevue_type_template_id_4086fdcf_scoped_true_render = function render()
           "handleUserSelect": handleUserSelect
         })];
       }
+    }, {
+      key: "conditionComponent",
+      fn: function ({
+        value,
+        selectItem,
+        datas,
+        type,
+        field,
+        showValue
+      }) {
+        return [_vm._t("conditionComponent", null, {
+          "value": value,
+          "selectItem": selectItem,
+          "datas": datas,
+          "type": type,
+          "field": field,
+          "showValue": showValue
+        })];
+      }
     }], null, true)
   }) : _vm._e()], 1);
 };
-var baseNodevue_type_template_id_4086fdcf_scoped_true_staticRenderFns = [];
+var baseNodevue_type_template_id_55b34434_scoped_true_staticRenderFns = [];
 
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Approver/index.vue?vue&type=template&id=15804922
-var Approvervue_type_template_id_15804922_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Approver/index.vue?vue&type=template&id=69a89c58
+var Approvervue_type_template_id_69a89c58_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.node.approverGroups ? _c('a-drawer', {
@@ -116989,13 +117086,7 @@ var Approvervue_type_template_id_15804922_render = function render() {
         "type": "question-circle"
       }
     })], 2) : _vm._e()], 1);
-  }), 1)], 1), _c('div', {
-    staticClass: "flow-setting-item"
-  }, [_c('p', {
-    staticClass: "flow-setting-item-title"
-  }, [_vm._v("提示：")]), _c('div', {
-    staticClass: "hint-info"
-  }, [_vm.node.type == 6 ? _c('p', [_vm._v("办理人不涉及审批人去重设置，不同节点相同的办理人仍需要执行。")]) : _vm._e(), _c('p', [_vm._v("若审批人离职，会自动转交给审批人的上级代为处理")]), _c('p', [_vm._v("抄送的人数最多支持100人以内")])])])], 2)]), _c('a-tab-pane', {
+  }), 1)], 1)], 2)]), _c('a-tab-pane', {
     key: "2",
     attrs: {
       "tab": "表单权限"
@@ -117038,7 +117129,7 @@ var Approvervue_type_template_id_15804922_render = function render() {
     }
   })], 2) : _vm._e();
 };
-var Approvervue_type_template_id_15804922_staticRenderFns = [];
+var Approvervue_type_template_id_69a89c58_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./packages/mixins/flowDrawerMixin.js
 var flowDrawerMixin = __webpack_require__(6915);
@@ -117071,6 +117162,8 @@ var DrawerFootervue_type_template_id_5348482a_render = function render() {
 };
 var DrawerFootervue_type_template_id_5348482a_staticRenderFns = [];
 
+// EXTERNAL MODULE: ./packages/util/deviceUtil.js
+var deviceUtil = __webpack_require__(3305);
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Common/DrawerFooter.vue?vue&type=script&lang=js
 
 
@@ -117120,9 +117213,9 @@ var DrawerFooter_component = (0,componentNormalizer/* default */.A)(
 
 /* harmony default export */ var DrawerFooter = (DrawerFooter_component.exports);
 // EXTERNAL MODULE: ./packages/Component/FlowSimpleSelect.vue + 3 modules
-var FlowSimpleSelect = __webpack_require__(3660);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Approver/Approval.vue?vue&type=template&id=70d99796
-var Approvalvue_type_template_id_70d99796_render = function render() {
+var FlowSimpleSelect = __webpack_require__(8974);
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Approver/Approval.vue?vue&type=template&id=70f0872c
+var Approvalvue_type_template_id_70f0872c_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('a-space', {
@@ -117182,7 +117275,7 @@ var Approvalvue_type_template_id_70d99796_render = function render() {
           return _vm.sortUpGroup('down', k);
         }
       }
-    })], 2)], 1)], 1)], 1), _c('a-col', [k > 0 ? _c('a-icon', {
+    })], 2)], 1)], 1)], 1), _c('a-col', [_vm.sortedGroups.length > 1 ? _c('a-icon', {
       staticClass: "del-icon",
       attrs: {
         "type": "delete"
@@ -117888,20 +117981,22 @@ var Approvalvue_type_template_id_70d99796_render = function render() {
     }
   }, [_vm._v("添加" + _vm._s(_vm.title))]) : _vm._e()], 2);
 };
-var Approvalvue_type_template_id_70d99796_staticRenderFns = [];
+var Approvalvue_type_template_id_70f0872c_staticRenderFns = [];
 
 // EXTERNAL MODULE: ./packages/util/nodeUtil.js + 13 modules
 var util_nodeUtil = __webpack_require__(9295);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Component/FlowSelect.vue?vue&type=template&id=6f308b30
-var FlowSelectvue_type_template_id_6f308b30_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Component/FlowSelect.vue?vue&type=template&id=21c3729b
+var FlowSelectvue_type_template_id_21c3729b_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('a-select', {
     staticClass: "w-fill",
     attrs: {
       "size": _vm.size,
+      "filter-option": _vm.filterOption,
       "show-search": "",
       "mode": _vm.mode,
+      "getPopupContainer": triggerNode => triggerNode.parentNode,
       "allowClear": "",
       "placeholder": _vm.placeholder
     },
@@ -117916,12 +118011,12 @@ var FlowSelectvue_type_template_id_6f308b30_render = function render() {
       expression: "currentValue"
     }
   }, [_vm._l(_vm.datas, function (data, i) {
-    return [data.children?.length > 0 ? _c('a-select-opt-group', {
+    return [_vm.dynamicChild(data)?.length > 0 ? _c('a-select-opt-group', {
       key: 'group_' + data[_vm.labelName],
       attrs: {
         "label": data[_vm.labelName]
       }
-    }, _vm._l(data.children, function (childData, j) {
+    }, _vm._l(_vm.dynamicChild(data), function (childData, j) {
       return _c('a-select-option', {
         key: childData[_vm.labelName] + j,
         attrs: {
@@ -117938,7 +118033,7 @@ var FlowSelectvue_type_template_id_6f308b30_render = function render() {
     }, [_vm._v(" " + _vm._s(data[_vm.labelName]) + " ")])];
   })], 2);
 };
-var FlowSelectvue_type_template_id_6f308b30_staticRenderFns = [];
+var FlowSelectvue_type_template_id_21c3729b_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Component/FlowSelect.vue?vue&type=script&lang=js
 /* harmony default export */ var FlowSelectvue_type_script_lang_js = ({
@@ -117994,6 +118089,9 @@ var FlowSelectvue_type_template_id_6f308b30_staticRenderFns = [];
     this.initData(this.value);
   },
   methods: {
+    dynamicChild(item) {
+      return item?.children || item?.child;
+    },
     initData(value) {
       if (value && value.length > 0 && this.mode == 'default') {
         this.currentValue = value[0];
@@ -118006,10 +118104,22 @@ var FlowSelectvue_type_template_id_6f308b30_staticRenderFns = [];
     onChange(value, option) {
       this.$emit('input', this.mode == 'multiple' ? value : [value]);
       let datas = this.datas.map(item => {
-        return Array.isArray(item.children) ? item.children : item;
+        return Array.isArray(this.dynamicChild(item)) ? this.dynamicChild(item) : item;
       }).flat().filter(data => this.mode == 'multiple' ? value.includes(data[this.valueName]) : data[this.valueName] == value).map(data => data[this.labelName]);
-      this.$emit('update:name', this.mode == 'multiple' ? datas : datas[0]);
+      this.$emit('update:name', this.mode == 'multiple' ? datas.join(', ') : datas[0]);
       this.$emit('change', value, datas.filter(data => data[this.valueName] == value));
+    },
+    filterOption(input, option) {
+      let optionText = option.componentOptions.children[0]?.text ?? '';
+      // 如果当前节点是分组（a-select-optgroup）
+      if (option.data && option.data.attrs && option.data.attrs.role === 'optgroup') {
+        // 确保当前是具体的选项节点，再进行文本匹配
+        // 这里使用 option.componentOptions.children[0].text 获取选项的显示文本
+        optionText = option.componentOptions && option.componentOptions.children && option.componentOptions.children.length > 0 ? option.componentOptions.children[0].text : '';
+      }
+
+      // 进行大小写不敏感的模糊匹配
+      return optionText.toLowerCase().indexOf(input.toLowerCase()) >= 0;
     }
   }
 });
@@ -118025,8 +118135,8 @@ var FlowSelectvue_type_template_id_6f308b30_staticRenderFns = [];
 ;
 var FlowSelect_component = (0,componentNormalizer/* default */.A)(
   Component_FlowSelectvue_type_script_lang_js,
-  FlowSelectvue_type_template_id_6f308b30_render,
-  FlowSelectvue_type_template_id_6f308b30_staticRenderFns,
+  FlowSelectvue_type_template_id_21c3729b_render,
+  FlowSelectvue_type_template_id_21c3729b_staticRenderFns,
   false,
   null,
   null,
@@ -118453,34 +118563,34 @@ var FlowInput_component = (0,componentNormalizer/* default */.A)(
       }],
       // 上级层级
       higherLevels: this.$store.state.flow.nodeConfigs?.superiorLevels ?? [],
-      // 部门负责人方式
+      // 组织负责人方式
       departmentHeadModes: [{
-        name: '自下而上（以发起人的直接部门负责人为第一级）',
+        name: '自下而上（以发起人的直接组织负责人为第一级）',
         value: 1,
         popovers: [{
-          title: '什么是部门负责人 - 自下而上？',
-          content: '以发起人的直接部门负责人为第一级，向更高管理层级递增'
+          title: '什么是组织负责人 - 自下而上？',
+          content: '以发起人的直接组织负责人为第一级，向更高管理层级递增'
         }, {
-          content: '图示：若小王为发起人，则小张是小王的“直接部门负责人”，小李是小王的“第二级部门负责人”'
+          content: '图示：若小王为发起人，则小张是小王的“直接组织负责人”，小李是小王的“第二级组织负责人”'
         }]
       }, {
-        name: '自下而上（以上一个节点的审批人的直接部门负责人为第一级）',
+        name: '自下而上（以上一个节点的审批人的直接组织负责人为第一级）',
         value: 2,
         popovers: [{
-          title: '什么是上级 - 自下而上？',
-          content: '以上一个节点的审批人的直接部门负责人为第一级，向更高管理层级递增'
+          title: '什么是组织负责人 - 自下而上？',
+          content: '以上一个节点的审批人的直接组织负责人为第一级，向更高管理层级递增'
         }, {
-          content: '图示：若小王为上一个节点的审批人，则小张是小王的“直接部门负责人”，小李是小王的“第二级部门负责人”'
+          content: '图示：若小王为上一个节点的审批人，则小张是小王的“直接组织负责人”，小李是小王的“第二级组织负责人”'
         }]
       }, {
-        name: '自上而下（以公司的最高部门负责人为第一级）',
+        name: '自上而下（以公司的最高组织负责人为第一级）',
         code: 'higherLevel',
         value: 3,
         popovers: [{
-          title: '什么是部门负责人 - 自上而下？',
-          content: '以公司组织架构中的最高部门负责人为第一级，向更低管理层级递增'
+          title: '什么是组织负责人 - 自上而下？',
+          content: '以公司组织架构中的最高组织负责人为第一级，向更低管理层级递增'
         }, {
-          content: '图示：若小王为发起人，则小赵是小王的“最高部门负责人”，小周是小王的“第二级部门负责人”'
+          content: '图示：若小王为发起人，则小赵是小王的“最高组织负责人”，小周是小王的“第二级组织负责人”'
         }]
       }],
       // 部门负责人层级
@@ -118658,8 +118768,8 @@ var FlowInput_component = (0,componentNormalizer/* default */.A)(
 ;
 var Approval_component = (0,componentNormalizer/* default */.A)(
   Approver_Approvalvue_type_script_lang_js,
-  Approvalvue_type_template_id_70d99796_render,
-  Approvalvue_type_template_id_70d99796_staticRenderFns,
+  Approvalvue_type_template_id_70f0872c_render,
+  Approvalvue_type_template_id_70f0872c_staticRenderFns,
   false,
   null,
   null,
@@ -119058,8 +119168,8 @@ var EditName_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var EditName = (EditName_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Common/AuthForm.vue?vue&type=template&id=040acf86
-var AuthFormvue_type_template_id_040acf86_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Common/AuthForm.vue?vue&type=template&id=2f522221
+var AuthFormvue_type_template_id_2f522221_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', {
@@ -119107,7 +119217,7 @@ var AuthFormvue_type_template_id_040acf86_render = function render() {
       "checked": _vm.hidableChecked
     },
     on: {
-      "change": _vm.onAllhidableChange
+      "change": _vm.onAllHidableChange
     }
   }, [_vm._v(" 隐藏 ")])], 1), _vm.readable ? _c('div', {
     class: {
@@ -119197,7 +119307,7 @@ var AuthFormvue_type_template_id_040acf86_render = function render() {
     }, [_vm._v(" 必填 ")])], 1) : _vm._e()])]);
   }), 0)]);
 };
-var AuthFormvue_type_template_id_040acf86_staticRenderFns = [];
+var AuthFormvue_type_template_id_2f522221_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/Common/AuthForm.vue?vue&type=script&lang=js
 
@@ -119224,7 +119334,7 @@ var AuthFormvue_type_template_id_040acf86_staticRenderFns = [];
   },
   data() {
     return {
-      fields: this.value
+      fields: this.value.filter(item => item?.form_name)
     };
   },
   computed: {
@@ -119273,7 +119383,7 @@ var AuthFormvue_type_template_id_040acf86_staticRenderFns = [];
      * 全选隐藏
      * @param {*} e
      */
-    onAllhidableChange(e) {
+    onAllHidableChange(e) {
       this.fields.forEach((item, i) => {
         this.hidableChange(e, item, i);
       });
@@ -119365,8 +119475,8 @@ var AuthFormvue_type_template_id_040acf86_staticRenderFns = [];
 ;
 var AuthForm_component = (0,componentNormalizer/* default */.A)(
   Common_AuthFormvue_type_script_lang_js,
-  AuthFormvue_type_template_id_040acf86_render,
-  AuthFormvue_type_template_id_040acf86_staticRenderFns,
+  AuthFormvue_type_template_id_2f522221_render,
+  AuthFormvue_type_template_id_2f522221_staticRenderFns,
   false,
   null,
   null,
@@ -119580,8 +119690,8 @@ var AuthForm_component = (0,componentNormalizer/* default */.A)(
 ;
 var Approver_component = (0,componentNormalizer/* default */.A)(
   FlowDrawer_Approvervue_type_script_lang_js,
-  Approvervue_type_template_id_15804922_render,
-  Approvervue_type_template_id_15804922_staticRenderFns,
+  Approvervue_type_template_id_69a89c58_render,
+  Approvervue_type_template_id_69a89c58_staticRenderFns,
   false,
   null,
   null,
@@ -119590,13 +119700,13 @@ var Approver_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var Approver = (Approver_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Condition/index.vue?vue&type=template&id=379a9dc9
-var Conditionvue_type_template_id_379a9dc9_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Condition/index.vue?vue&type=template&id=559606a9
+var Conditionvue_type_template_id_559606a9_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.node.attr ? _c('a-drawer', {
     attrs: {
-      "width": _vm.drawerWidth(),
+      "width": _vm.drawerWidth('45vw'),
       "headerStyle": _vm.headerStyle,
       "bodyStyle": _vm.bodyStyle,
       "placement": "right",
@@ -119700,7 +119810,7 @@ var Conditionvue_type_template_id_379a9dc9_render = function render() {
           "update:name": function ($event) {
             return _vm.$set(condition, "columnName", $event);
           },
-          "change": _vm.handleColumnFieldChange
+          "change": (value, option) => _vm.handleColumnFieldChange(value, option, group, condition)
         },
         model: {
           value: condition.columnValue,
@@ -119754,10 +119864,32 @@ var Conditionvue_type_template_id_379a9dc9_render = function render() {
         }
       }), _c('div', {
         staticClass: "flow-setting-condition-value"
-      }, [condition.valueType == 2 ? _c('FlowSelect', {
+      }, [condition.valueType == 2 ? [_vm.flattenFieldList.find(item => item.value === condition.columnValue)?.component ? _c(_vm.flattenFieldList.find(item => item.value === condition.columnValue)?.renderObject, {
+        tag: "component",
+        attrs: {
+          "name": condition.conditionValueName,
+          "datas": condition.conditionValueDatas
+        },
+        on: {
+          "update:name": function ($event) {
+            return _vm.$set(condition, "conditionValueName", $event);
+          },
+          "update:datas": function ($event) {
+            return _vm.$set(condition, "conditionValueDatas", $event);
+          }
+        },
+        model: {
+          value: condition.conditionValue,
+          callback: function ($$v) {
+            _vm.$set(condition, "conditionValue", $$v);
+          },
+          expression: "condition.conditionValue"
+        }
+      }) : _c('FlowSelect', {
         attrs: {
           "name": condition.conditionValueName,
           "datas": _vm.optionValueTypes,
+          "mode": _vm.flattenFieldList.find(item => item.value === condition.columnValue)?.multi ? 'multiple' : 'default',
           "labelName": "label"
         },
         on: {
@@ -119772,7 +119904,7 @@ var Conditionvue_type_template_id_379a9dc9_render = function render() {
           },
           expression: "condition.conditionValue"
         }
-      }) : condition.valueType == 3 ? _c('FlowSelect', {
+      })] : condition.valueType == 3 ? _c('FlowSelect', {
         attrs: {
           "name": condition.conditionValueName,
           "datas": _vm.flowValueTypes,
@@ -119790,10 +119922,32 @@ var Conditionvue_type_template_id_379a9dc9_render = function render() {
           },
           expression: "condition.conditionValue"
         }
-      }) : condition.valueType == 4 ? _c('FlowSelect', {
+      }) : condition.valueType == 4 ? [_vm.flattenFieldList.find(item => item.value === condition.columnValue)?.component ? _c(_vm.flattenFieldList.find(item => item.value === condition.columnValue)?.renderObject, {
+        tag: "component",
+        attrs: {
+          "name": condition.conditionValueName,
+          "datas": condition.conditionValueDatas
+        },
+        on: {
+          "update:name": function ($event) {
+            return _vm.$set(condition, "conditionValueName", $event);
+          },
+          "update:datas": function ($event) {
+            return _vm.$set(condition, "conditionValueDatas", $event);
+          }
+        },
+        model: {
+          value: condition.conditionValue,
+          callback: function ($$v) {
+            _vm.$set(condition, "conditionValue", $$v);
+          },
+          expression: "condition.conditionValue"
+        }
+      }) : _c('FlowSelect', {
         attrs: {
           "name": condition.conditionValueName,
           "datas": _vm.dataSourceOptions,
+          "mode": _vm.flattenFieldList.find(item => item.value === condition.columnValue)?.multi ? 'multiple' : 'default',
           "labelName": "label"
         },
         on: {
@@ -119808,7 +119962,7 @@ var Conditionvue_type_template_id_379a9dc9_render = function render() {
           },
           expression: "condition.conditionValue"
         }
-      }) : _c('FlowInput', {
+      })] : _c('FlowInput', {
         attrs: {
           "name": condition.conditionValueName,
           "size": _vm.size
@@ -119825,7 +119979,7 @@ var Conditionvue_type_template_id_379a9dc9_render = function render() {
           },
           expression: "condition.conditionValue"
         }
-      })], 1)], 1), _c('div', {
+      })], 2)], 1), _c('div', {
         staticClass: "flow-setting-condition-del",
         on: {
           "click": function ($event) {
@@ -119969,7 +120123,7 @@ var Conditionvue_type_template_id_379a9dc9_render = function render() {
     }
   })], 2) : _vm._e();
 };
-var Conditionvue_type_template_id_379a9dc9_staticRenderFns = [];
+var Conditionvue_type_template_id_559606a9_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Condition/index.vue?vue&type=script&lang=js
 
@@ -120051,6 +120205,12 @@ var Conditionvue_type_template_id_379a9dc9_staticRenderFns = [];
       }, {
         label: '小于等于',
         value: 'lte'
+      }, {
+        label: '包含(属于)',
+        value: 'contains'
+      }, {
+        label: '不包含(不属于)',
+        value: 'not_contains'
       }
       /*  { label: '为空', value: '7' },
       { label: '不为空', value: '8' }, */],
@@ -120116,19 +120276,25 @@ var Conditionvue_type_template_id_379a9dc9_staticRenderFns = [];
     };
   },
   computed: {
+    commonConditionFields() {
+      return this.$store.state.flow.nodeConfigs.conditionFieldList;
+    },
     fieldList() {
-      let list = this.$store.state.flow.nodeConfigs.conditionFieldList;
-      let formFields = this.$store.state.flow.formFields;
+      /* 条件 表单字段 */
+      let list = this.commonConditionFields;
+      let formFields = (this.node?.privileges ?? []).filter(p => p?.condition_name);
+      let formFieldList = [];
       if (formFields.length > 0) {
-        list.push({
+        formFieldList.push({
           label: '表单字段',
           children: formFields.map(item => ({
-            label: item.label + '(' + item.key + ')',
-            value: item.key
+            ...item,
+            label: item?.form_name ?? item?.label,
+            value: item.condition_name
           }))
         });
       }
-      return list;
+      return [...list, ...formFieldList];
     }
   },
   methods: {
@@ -120150,24 +120316,15 @@ var Conditionvue_type_template_id_379a9dc9_staticRenderFns = [];
       this.visible = false;
       this.$emit('close');
     },
-    handleColumnFieldChange(value, option) {
+    handleColumnFieldChange(value, option, index) {
       console.warn('handleColumnFieldChange(value,option)=>', value, option);
       this.dataSourceOptions.splice(0, this.dataSourceOptions.length);
       this.$nextTick(() => {
-        if (!Array.isArray(option)) {
-          option = [option];
-        }
-        this.dataSourceOptions.push(...option.map(item => {
-          return {
-            'label': item.label,
-            'children': (Array.isArray(item.dataSource) ? item.dataSource : this.$store.state.flow.nodeConfigs[item.dataSource]).map(item => {
-              return {
-                'label': item?.label || item.name,
-                'value': item?.value || item.id
-              };
-            })
-          };
-        }));
+        // this.$set(this.node.groupConditions[group])
+        condition.conditionValue = undefined;
+        condition.conditionValueName = undefined;
+        const optionList = Array.isArray(option?.dataSource) ? option.dataSource : this.$store.state.flow.nodeConfigs[option.dataSource];
+        this.dataSourceOptions.splice(0, this.dataSourceOptions.length, ...optionList);
       });
     },
     addGroup(type) {
@@ -120185,7 +120342,8 @@ var Conditionvue_type_template_id_379a9dc9_staticRenderFns = [];
           optTypeName: undefined,
           valueType: undefined,
           conditionValue: [],
-          conditionValueName: []
+          conditionValueName: [],
+          conditionValueDatas: []
         }]
       });
       // }
@@ -120204,7 +120362,8 @@ var Conditionvue_type_template_id_379a9dc9_staticRenderFns = [];
             optTypeName: undefined,
             valueType: undefined,
             conditionValue: [],
-            conditionValueName: []
+            conditionValueName: [],
+            conditionValueDatas: []
           });
         }
       });
@@ -120323,8 +120482,8 @@ var Conditionvue_type_template_id_379a9dc9_staticRenderFns = [];
 ;
 var Condition_component = (0,componentNormalizer/* default */.A)(
   FlowDrawer_Conditionvue_type_script_lang_js,
-  Conditionvue_type_template_id_379a9dc9_render,
-  Conditionvue_type_template_id_379a9dc9_staticRenderFns,
+  Conditionvue_type_template_id_559606a9_render,
+  Conditionvue_type_template_id_559606a9_staticRenderFns,
   false,
   null,
   null,
@@ -121660,13 +121819,13 @@ var Notice_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var Notice = (Notice_component.exports);
-;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Branch/index.vue?vue&type=template&id=0754f454
-var Branchvue_type_template_id_0754f454_render = function render() {
+;// ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Branch/index.vue?vue&type=template&id=2668f886
+var Branchvue_type_template_id_2668f886_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _vm.node.attr ? _c('a-drawer', {
     attrs: {
-      "width": _vm.drawerWidth(),
+      "width": _vm.drawerWidth('45vw'),
       "headerStyle": _vm.headerStyle,
       "bodyStyle": _vm.bodyStyle,
       "placement": "right",
@@ -121743,7 +121902,13 @@ var Branchvue_type_template_id_0754f454_render = function render() {
         "value": branchType.value
       }
     }, [_vm._v(" " + _vm._s(branchType.label) + " ")]);
-  }), 1)], 1), _vm.node.attr.branchType == 1 ? _c('div', {
+  }), 1)], 1), _vm.node.attr.branchType == 3 ? [_c('div', {
+    staticClass: "flow-setting-item"
+  }, [_c('p', {
+    staticClass: "flow-setting-item-title"
+  }, [_vm._v("默认条件")]), _c('div', {
+    staticClass: "flow-setting-condition-box"
+  }, [_vm._v("表示该条件永远为真，一般是优先级排最后的条件")])])] : [_vm.node.attr.branchType == 1 ? _c('div', {
     staticClass: "flow-setting-item"
   }, [_c('p', {
     staticClass: "flow-setting-item-title"
@@ -121773,7 +121938,7 @@ var Branchvue_type_template_id_0754f454_render = function render() {
           "update:name": function ($event) {
             return _vm.$set(condition, "columnName", $event);
           },
-          "change": _vm.handleColumnFieldChange
+          "change": (value, option) => _vm.handleColumnFieldChange(value, option, group, condition)
         },
         model: {
           value: condition.columnValue,
@@ -121827,10 +121992,18 @@ var Branchvue_type_template_id_0754f454_render = function render() {
         }
       }), _c('div', {
         staticClass: "flow-setting-condition-value"
-      }, [condition.valueType == 2 ? _c('FlowSelect', {
+      }, [condition.valueType == 2 ? [_vm.flattenFieldList.find(item => item.value === condition.columnValue)?.component ? _vm._t("conditionComponent", null, {
+        "value": condition.conditionValue,
+        "selectItem": (value, name, datas) => _vm.conditionComponentSelect(value, name, datas, condition),
+        "datas": condition.conditionValueDatas,
+        "showValue": condition.conditionValueName,
+        "field": _vm.flattenFieldList.find(item => item.value === condition.columnValue),
+        "type": _vm.flattenFieldList.find(item => item.value === condition.columnValue)?.component
+      }) : _c('FlowSelect', {
         attrs: {
           "name": condition.conditionValueName,
           "datas": _vm.optionValueTypes,
+          "mode": _vm.flattenFieldList.find(item => item.value === condition.columnValue)?.multi ? 'multiple' : 'default',
           "labelName": "label"
         },
         on: {
@@ -121845,7 +122018,7 @@ var Branchvue_type_template_id_0754f454_render = function render() {
           },
           expression: "condition.conditionValue"
         }
-      }) : condition.valueType == 3 ? _c('FlowSelect', {
+      })] : condition.valueType == 3 ? _c('FlowSelect', {
         attrs: {
           "name": condition.conditionValueName,
           "datas": _vm.flowValueTypes,
@@ -121863,10 +122036,18 @@ var Branchvue_type_template_id_0754f454_render = function render() {
           },
           expression: "condition.conditionValue"
         }
-      }) : condition.valueType == 4 ? _c('FlowSelect', {
+      }) : condition.valueType == 4 ? [_vm.flattenFieldList.find(item => item.value === condition.columnValue)?.component ? _vm._t("conditionComponent", null, {
+        "value": condition.conditionValue,
+        "selectItem": (value, name, datas) => _vm.conditionComponentSelect(value, name, datas, condition),
+        "datas": condition.conditionValueDatas,
+        "showValue": condition.conditionValueName,
+        "field": _vm.flattenFieldList.find(item => item.value === condition.columnValue),
+        "type": _vm.flattenFieldList.find(item => item.value === condition.columnValue)?.component
+      }) : _c('FlowSelect', {
         attrs: {
           "name": condition.conditionValueName,
           "datas": _vm.dataSourceOptions,
+          "mode": _vm.flattenFieldList.find(item => item.value === condition.columnValue)?.multi ? 'multiple' : 'default',
           "labelName": "label"
         },
         on: {
@@ -121881,7 +122062,7 @@ var Branchvue_type_template_id_0754f454_render = function render() {
           },
           expression: "condition.conditionValue"
         }
-      }) : _c('FlowInput', {
+      })] : _c('FlowInput', {
         attrs: {
           "name": condition.conditionValueName,
           "size": _vm.size
@@ -121898,7 +122079,7 @@ var Branchvue_type_template_id_0754f454_render = function render() {
           },
           expression: "condition.conditionValue"
         }
-      })], 1)], 1), _c('div', {
+      })], 2)], 1), _c('div', {
         staticClass: "flow-setting-condition-del",
         on: {
           "click": function ($event) {
@@ -122028,7 +122209,7 @@ var Branchvue_type_template_id_0754f454_render = function render() {
     staticStyle: {
       "margin-left": "5px"
     }
-  }, [_vm._v("或条件")])], 1)], 2)])])]), _c('PreCodeShow', {
+  }, [_vm._v("或条件")])], 1)], 2)])]], 2)]), _c('PreCodeShow', {
     staticStyle: {
       "display": "none"
     },
@@ -122042,7 +122223,7 @@ var Branchvue_type_template_id_0754f454_render = function render() {
     }
   })], 2) : _vm._e();
 };
-var Branchvue_type_template_id_0754f454_staticRenderFns = [];
+var Branchvue_type_template_id_2668f886_staticRenderFns = [];
 
 ;// ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDrawer/Branch/index.vue?vue&type=script&lang=js
 
@@ -122079,9 +122260,10 @@ var Branchvue_type_template_id_0754f454_staticRenderFns = [];
       }, {
         label: '公式',
         value: 2
-      }
-      // { label: '其他', value: 3 },
-      ],
+      }, {
+        label: '默认条件',
+        value: 3
+      }],
       optTypes: [{
         label: '等于',
         value: 'eq'
@@ -122100,6 +122282,12 @@ var Branchvue_type_template_id_0754f454_staticRenderFns = [];
       }, {
         label: '小于等于',
         value: 'le'
+      }, {
+        label: '包含(属于)',
+        value: 'contains'
+      }, {
+        label: '不包含(不属于)',
+        value: 'not_contains'
       }
       /*  { label: '为空', value: '7' },
       { label: '不为空', value: '8' }, */],
@@ -122221,15 +122409,26 @@ var Branchvue_type_template_id_0754f454_staticRenderFns = [];
         formFieldList.push({
           label: '表单字段',
           children: formFields.map(item => ({
-            label: item.form_name,
+            ...item,
+            label: item?.form_name ?? item?.label,
             value: item.condition_name
           }))
         });
       }
       return [...list, ...formFieldList];
+    },
+    flattenFieldList() {
+      return this.fieldList.reduce((acc, curr) => {
+        return acc.concat(curr?.children || curr);
+      }, []);
     }
   },
   methods: {
+    conditionComponentSelect(value, name, datas, condition) {
+      condition.conditionValue = value;
+      condition.conditionValueName = name;
+      condition.conditionValueDatas = datas;
+    },
     levelOptionChange(val) {
       const findLevelOption = this.levelOptions.find(item => item.value.toString() === val.toString());
       this.node.attr.priorityLevelName = findLevelOption?.label ?? findLevelOption?.name;
@@ -122270,24 +122469,15 @@ var Branchvue_type_template_id_0754f454_staticRenderFns = [];
       this.visible = false;
       this.$emit('close');
     },
-    handleColumnFieldChange(value, option) {
+    handleColumnFieldChange(value, option, group, condition) {
       console.warn('handleColumnFieldChange(value,option)=>', value, option);
       this.dataSourceOptions.splice(0, this.dataSourceOptions.length);
       this.$nextTick(() => {
-        if (!Array.isArray(option)) {
-          option = [option];
-        }
-        this.dataSourceOptions.push(...option.map(item => {
-          return {
-            'label': item.label,
-            'children': (Array.isArray(item?.dataSource) ? item.dataSource : this.$store.state.flow.nodeConfigs[item.dataSource])?.map(item => {
-              return {
-                'label': item?.label || item.name,
-                'value': item?.value || item.id
-              };
-            })
-          };
-        }));
+        // this.$set(this.node.groupConditions[group])
+        condition.conditionValue = undefined;
+        condition.conditionValueName = undefined;
+        const optionList = Array.isArray(option?.dataSource) ? option.dataSource : this.$store.state.flow.nodeConfigs[option.dataSource];
+        this.dataSourceOptions.splice(0, this.dataSourceOptions.length, ...(optionList || []));
       });
     },
     addGroup(type) {
@@ -122305,7 +122495,8 @@ var Branchvue_type_template_id_0754f454_staticRenderFns = [];
           optTypeName: undefined,
           valueType: undefined,
           conditionValue: [],
-          conditionValueName: []
+          conditionValueName: [],
+          conditionValueDatas: []
         }]
       });
       // }
@@ -122324,7 +122515,8 @@ var Branchvue_type_template_id_0754f454_staticRenderFns = [];
             optTypeName: undefined,
             valueType: undefined,
             conditionValue: [],
-            conditionValueName: []
+            conditionValueName: [],
+            conditionValueDatas: []
           });
         }
       });
@@ -122382,23 +122574,28 @@ var Branchvue_type_template_id_0754f454_staticRenderFns = [];
           }
         });
       } else {
-        this.node.conditionGroup.forEach((group, j) => {
-          if (group.conditions.length > 0) {
-            if (j != 0) {
-              content += ' 或 ';
-            }
-            group.conditions.forEach((condition, i) => {
-              const conditionValueName = typeof condition.conditionValueName === 'string' ? condition.conditionValueName : condition.conditionValueName[0];
-              if (conditionValueName) {
-                if (i != 0) {
-                  content += ' 且 ';
-                }
-                content += '[' + conditionValueName + ']';
+        if (this.node.attr.branchType == 3) {
+          this.node.conditionGroup = [];
+          content = '默认条件<永为真>';
+        } else {
+          this.node.conditionGroup.forEach((group, j) => {
+            if (group.conditions.length > 0) {
+              if (j != 0) {
+                content += ' 或 ';
               }
-            });
-          }
-        });
-        if (content.trim().length === 0) content += '任意(其他)';
+              group.conditions.forEach((condition, i) => {
+                const conditionValueName = typeof condition.conditionValueName === 'string' ? condition.conditionValueName : condition.conditionValueName[0];
+                if (conditionValueName) {
+                  if (i != 0) {
+                    content += ' 且 ';
+                  }
+                  content += '[' + conditionValueName + ']';
+                }
+              });
+            }
+          });
+          if (content.trim().length === 0) content += '任意(其他)';
+        }
       }
       this.$store.dispatch('flow/updateNode', {
         currNode: this.node,
@@ -122444,8 +122641,8 @@ var Branchvue_type_template_id_0754f454_staticRenderFns = [];
 ;
 var Branch_component = (0,componentNormalizer/* default */.A)(
   FlowDrawer_Branchvue_type_script_lang_js,
-  Branchvue_type_template_id_0754f454_render,
-  Branchvue_type_template_id_0754f454_staticRenderFns,
+  Branchvue_type_template_id_2668f886_render,
+  Branchvue_type_template_id_2668f886_staticRenderFns,
   false,
   null,
   null,
@@ -122885,10 +123082,10 @@ function registerWrite(lf) {
 });
 ;// ./packages/FlowNode/baseNode.vue?vue&type=script&lang=js
  /* harmony default export */ var FlowNode_baseNodevue_type_script_lang_js = (baseNodevue_type_script_lang_js); 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowNode/baseNode.vue?vue&type=style&index=0&id=4086fdcf&prod&scoped=true&lang=less
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-32.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-32.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-32.use[2]!./node_modules/less-loader/dist/cjs.js??clonedRuleSet-32.use[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowNode/baseNode.vue?vue&type=style&index=0&id=55b34434&prod&scoped=true&lang=less
 // extracted by mini-css-extract-plugin
 
-;// ./packages/FlowNode/baseNode.vue?vue&type=style&index=0&id=4086fdcf&prod&scoped=true&lang=less
+;// ./packages/FlowNode/baseNode.vue?vue&type=style&index=0&id=55b34434&prod&scoped=true&lang=less
 
 ;// ./packages/FlowNode/baseNode.vue
 
@@ -122901,11 +123098,11 @@ function registerWrite(lf) {
 
 var baseNode_component = (0,componentNormalizer/* default */.A)(
   FlowNode_baseNodevue_type_script_lang_js,
-  baseNodevue_type_template_id_4086fdcf_scoped_true_render,
-  baseNodevue_type_template_id_4086fdcf_scoped_true_staticRenderFns,
+  baseNodevue_type_template_id_55b34434_scoped_true_render,
+  baseNodevue_type_template_id_55b34434_scoped_true_staticRenderFns,
   false,
   null,
-  "4086fdcf",
+  "55b34434",
   null
   
 )
@@ -124122,6 +124319,30 @@ class graph_Graph {
     this.selectedNodes = [];
     this.hoveredNodes = [];
   }
+  updateWriteNodeProperties(nodes, formList) {
+    //更新write 节点的表单数据
+    const graphWriteNodeIndex = nodes.findIndex(n => n.type === 'write');
+    const graphFirstNode = nodes[graphWriteNodeIndex] ?? null;
+    const properties = graphFirstNode?.properties ?? null;
+    if (graphFirstNode && properties) {
+      const formDesignData = properties.formDesignData ?? {};
+      const form = formList.find(item => item.value?.toString() === formDesignData?.chooseFormId?.toString());
+      if (form && formDesignData?.chooseFormId) {
+        if (form?.fields && form?.fields.length > 0) {
+          properties['formDesignData']['fields'] = Array.isArray(form.fields) ? form.fields : JSON.parse(form.fields);
+        }
+        properties['formDesignData']['privilegeFields'] = Array.isArray(form.privilege_fields) ? form.privilege_fields : JSON.parse(form.privilege_fields);
+        let privilegeFields = form.privilege_fields;
+        if (Array.isArray(privilegeFields)) {
+          privilegeFields = JSON.stringify(privilegeFields);
+        }
+        properties['formDesignData']['privilegeFields'] = JSON.parse(privilegeFields);
+        graphFirstNode.properties = properties;
+        nodes[graphWriteNodeIndex] = graphFirstNode;
+      }
+    }
+    return nodes;
+  }
 
   /**
    * 当选中左侧画布组件时，选中逻辑图上对应节点
@@ -124679,6 +124900,10 @@ window.LogicFlow = es;
         return null;
       }
     },
+    height: {
+      type: String,
+      default: ''
+    },
     navable: {
       type: Boolean,
       default: true
@@ -124728,7 +124953,8 @@ window.LogicFlow = es;
       lf: null,
       renderData: null,
       currentModel: null,
-      mapShow: false
+      mapShow: false,
+      initFinished: false
     };
   },
   computed: {
@@ -124746,6 +124972,7 @@ window.LogicFlow = es;
     flowConfigs: {
       handler() {
         this.setGlobalNodeConfigs();
+        this.resetFlowData();
       },
       deep: true
     },
@@ -124754,9 +124981,7 @@ window.LogicFlow = es;
         // 重新初始数据
         // this.$store.dispatch('flow/setNode', newVal);
         // this.$store.dispatch('flow/clearHasError');
-        this.lf.clearData();
-        this.renderData = newVal;
-        this.lf.render(newVal);
+        this.resetFlowData(newVal);
       },
       deep: true
     },
@@ -124791,6 +125016,17 @@ window.LogicFlow = es;
     this.setGlobalNodeConfigs();
   },
   methods: {
+    resetFlowData(data) {
+      let newVal = data ?? this.renderData;
+      this.lf.clearData();
+      if (newVal && newVal?.nodes && newVal?.nodes?.length > 0 && !this.initFinished && this.flowConfigs?.formList?.length > 0) {
+        //更新节点数据
+        newVal.nodes = this.graph.updateWriteNodeProperties([...newVal.nodes], this.flowConfigs.formList);
+        this.initFinished = true;
+      }
+      this.renderData = newVal;
+      this.lf.render(newVal);
+    },
     initFlow() {
       const lf = new es({
         container: this.$refs.designContainer,
@@ -125463,10 +125699,10 @@ window.LogicFlow = es;
 });
 ;// ./packages/FlowDesign/index.vue?vue&type=script&lang=js
  /* harmony default export */ var packages_FlowDesignvue_type_script_lang_js = (FlowDesignvue_type_script_lang_js); 
-;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDesign/index.vue?vue&type=style&index=0&id=410d4fd8&prod&scoped=true&lang=css
+;// ./node_modules/mini-css-extract-plugin/dist/loader.js??clonedRuleSet-12.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-12.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-12.use[2]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/FlowDesign/index.vue?vue&type=style&index=0&id=33f6e767&prod&scoped=true&lang=css
 // extracted by mini-css-extract-plugin
 
-;// ./packages/FlowDesign/index.vue?vue&type=style&index=0&id=410d4fd8&prod&scoped=true&lang=css
+;// ./packages/FlowDesign/index.vue?vue&type=style&index=0&id=33f6e767&prod&scoped=true&lang=css
 
 ;// ./packages/FlowDesign/index.vue
 
@@ -125483,7 +125719,7 @@ var FlowDesign_component = (0,componentNormalizer/* default */.A)(
   staticRenderFns,
   false,
   null,
-  "410d4fd8",
+  "33f6e767",
   null
   
 )