@bit-sun/business-component 4.2.0-alpha.1 → 4.2.0-alpha.10

package/dist/index.js

@@ -230,306 +230,113 @@ function _possibleConstructorReturn(t, e) {
   if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
   return _assertThisInitialized(t);
 }
-function _regeneratorRuntime() {
-  _regeneratorRuntime = function () {
-    return e;
-  };
-  var t,
-    e = {},
-    r = Object.prototype,
-    n = r.hasOwnProperty,
-    o = Object.defineProperty || function (t, e, r) {
-      t[e] = r.value;
-    },
-    i = "function" == typeof Symbol ? Symbol : {},
-    a = i.iterator || "@@iterator",
-    c = i.asyncIterator || "@@asyncIterator",
-    u = i.toStringTag || "@@toStringTag";
-  function define(t, e, r) {
-    return Object.defineProperty(t, e, {
-      value: r,
-      enumerable: !0,
-      configurable: !0,
-      writable: !0
-    }), t[e];
-  }
-  try {
-    define({}, "");
-  } catch (t) {
-    define = function (t, e, r) {
-      return t[e] = r;
-    };
-  }
-  function wrap(t, e, r, n) {
-    var i = e && e.prototype instanceof Generator ? e : Generator,
-      a = Object.create(i.prototype),
-      c = new Context(n || []);
-    return o(a, "_invoke", {
-      value: makeInvokeMethod(t, r, c)
-    }), a;
-  }
-  function tryCatch(t, e, r) {
-    try {
-      return {
-        type: "normal",
-        arg: t.call(e, r)
-      };
-    } catch (t) {
-      return {
-        type: "throw",
-        arg: t
+function _regenerator() {
+  /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
+  var e,
+    t,
+    r = "function" == typeof Symbol ? Symbol : {},
+    n = r.iterator || "@@iterator",
+    o = r.toStringTag || "@@toStringTag";
+  function i(r, n, o, i) {
+    var c = n && n.prototype instanceof Generator ? n : Generator,
+      u = Object.create(c.prototype);
+    return _regeneratorDefine(u, "_invoke", function (r, n, o) {
+      var i,
+        c,
+        u,
+        f = 0,
+        p = o || [],
+        y = !1,
+        G = {
+          p: 0,
+          n: 0,
+          v: e,
+          a: d,
+          f: d.bind(e, 4),
+          d: function (t, r) {
+            return i = t, c = 0, u = e, G.n = r, a;
+          }
+        };
+      function d(r, n) {
+        for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) {
+          var o,
+            i = p[t],
+            d = G.p,
+            l = i[2];
+          r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0));
+        }
+        if (o || r > 1) return a;
+        throw y = !0, n;
+      }
+      return function (o, p, l) {
+        if (f > 1) throw TypeError("Generator is already running");
+        for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) {
+          i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u);
+          try {
+            if (f = 2, i) {
+              if (c || (o = "next"), t = i[o]) {
+                if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object");
+                if (!t.done) return t;
+                u = t.value, c < 2 && (c = 0);
+              } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1);
+              i = e;
+            } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break;
+          } catch (t) {
+            i = e, c = 1, u = t;
+          } finally {
+            f = 1;
+          }
+        }
+        return {
+          value: t,
+          done: y
+        };
       };
-    }
+    }(r, o, i), !0), u;
   }
-  e.wrap = wrap;
-  var h = "suspendedStart",
-    l = "suspendedYield",
-    f = "executing",
-    s = "completed",
-    y = {};
+  var a = {};
   function Generator() {}
   function GeneratorFunction() {}
   function GeneratorFunctionPrototype() {}
-  var p = {};
-  define(p, a, function () {
+  t = Object.getPrototypeOf;
+  var c = [][n] ? t(t([][n]())) : (_regeneratorDefine(t = {}, n, function () {
+      return this;
+    }), t),
+    u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c);
+  function f(e) {
+    return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e;
+  }
+  return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine(u), _regeneratorDefine(u, o, "Generator"), _regeneratorDefine(u, n, function () {
     return this;
-  });
-  var d = Object.getPrototypeOf,
-    v = d && d(d(values([])));
-  v && v !== r && n.call(v, a) && (p = v);
-  var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p);
-  function defineIteratorMethods(t) {
-    ["next", "throw", "return"].forEach(function (e) {
-      define(t, e, function (t) {
-        return this._invoke(e, t);
-      });
-    });
-  }
-  function AsyncIterator(t, e) {
-    function invoke(r, o, i, a) {
-      var c = tryCatch(t[r], t, o);
-      if ("throw" !== c.type) {
-        var u = c.arg,
-          h = u.value;
-        return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) {
-          invoke("next", t, i, a);
-        }, function (t) {
-          invoke("throw", t, i, a);
-        }) : e.resolve(h).then(function (t) {
-          u.value = t, i(u);
-        }, function (t) {
-          return invoke("throw", t, i, a);
-        });
-      }
-      a(c.arg);
-    }
-    var r;
-    o(this, "_invoke", {
-      value: function (t, n) {
-        function callInvokeWithMethodAndArg() {
-          return new e(function (e, r) {
-            invoke(t, n, e, r);
-          });
-        }
-        return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
-      }
-    });
-  }
-  function makeInvokeMethod(e, r, n) {
-    var o = h;
-    return function (i, a) {
-      if (o === f) throw Error("Generator is already running");
-      if (o === s) {
-        if ("throw" === i) throw a;
-        return {
-          value: t,
-          done: !0
-        };
-      }
-      for (n.method = i, n.arg = a;;) {
-        var c = n.delegate;
-        if (c) {
-          var u = maybeInvokeDelegate(c, n);
-          if (u) {
-            if (u === y) continue;
-            return u;
-          }
-        }
-        if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) {
-          if (o === h) throw o = s, n.arg;
-          n.dispatchException(n.arg);
-        } else "return" === n.method && n.abrupt("return", n.arg);
-        o = f;
-        var p = tryCatch(e, r, n);
-        if ("normal" === p.type) {
-          if (o = n.done ? s : l, p.arg === y) continue;
-          return {
-            value: p.arg,
-            done: n.done
-          };
-        }
-        "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg);
-      }
-    };
-  }
-  function maybeInvokeDelegate(e, r) {
-    var n = r.method,
-      o = e.iterator[n];
-    if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y;
-    var i = tryCatch(o, e.iterator, r.arg);
-    if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y;
-    var a = i.arg;
-    return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y);
-  }
-  function pushTryEntry(t) {
-    var e = {
-      tryLoc: t[0]
-    };
-    1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e);
-  }
-  function resetTryEntry(t) {
-    var e = t.completion || {};
-    e.type = "normal", delete e.arg, t.completion = e;
-  }
-  function Context(t) {
-    this.tryEntries = [{
-      tryLoc: "root"
-    }], t.forEach(pushTryEntry, this), this.reset(!0);
-  }
-  function values(e) {
-    if (e || "" === e) {
-      var r = e[a];
-      if (r) return r.call(e);
-      if ("function" == typeof e.next) return e;
-      if (!isNaN(e.length)) {
-        var o = -1,
-          i = function next() {
-            for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next;
-            return next.value = t, next.done = !0, next;
-          };
-        return i.next = i;
-      }
-    }
-    throw new TypeError(typeof e + " is not iterable");
-  }
-  return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", {
-    value: GeneratorFunctionPrototype,
-    configurable: !0
-  }), o(GeneratorFunctionPrototype, "constructor", {
-    value: GeneratorFunction,
-    configurable: !0
-  }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) {
-    var e = "function" == typeof t && t.constructor;
-    return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name));
-  }, e.mark = function (t) {
-    return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t;
-  }, e.awrap = function (t) {
+  }), _regeneratorDefine(u, "toString", function () {
+    return "[object Generator]";
+  }), (_regenerator = function () {
     return {
-      __await: t
+      w: i,
+      m: f
     };
-  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () {
-    return this;
-  }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) {
-    void 0 === i && (i = Promise);
-    var a = new AsyncIterator(wrap(t, r, n, o), i);
-    return e.isGeneratorFunction(r) ? a : a.next().then(function (t) {
-      return t.done ? t.value : a.next();
-    });
-  }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () {
-    return this;
-  }), define(g, "toString", function () {
-    return "[object Generator]";
-  }), e.keys = function (t) {
-    var e = Object(t),
-      r = [];
-    for (var n in e) r.push(n);
-    return r.reverse(), function next() {
-      for (; r.length;) {
-        var t = r.pop();
-        if (t in e) return next.value = t, next.done = !1, next;
-      }
-      return next.done = !0, next;
-    };
-  }, e.values = values, Context.prototype = {
-    constructor: Context,
-    reset: function (e) {
-      if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t);
-    },
-    stop: function () {
-      this.done = !0;
-      var t = this.tryEntries[0].completion;
-      if ("throw" === t.type) throw t.arg;
-      return this.rval;
-    },
-    dispatchException: function (e) {
-      if (this.done) throw e;
-      var r = this;
-      function handle(n, o) {
-        return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o;
-      }
-      for (var o = this.tryEntries.length - 1; o >= 0; --o) {
-        var i = this.tryEntries[o],
-          a = i.completion;
-        if ("root" === i.tryLoc) return handle("end");
-        if (i.tryLoc <= this.prev) {
-          var c = n.call(i, "catchLoc"),
-            u = n.call(i, "finallyLoc");
-          if (c && u) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
-            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
-          } else if (c) {
-            if (this.prev < i.catchLoc) return handle(i.catchLoc, !0);
-          } else {
-            if (!u) throw Error("try statement without catch or finally");
-            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
-          }
-        }
-      }
-    },
-    abrupt: function (t, e) {
-      for (var r = this.tryEntries.length - 1; r >= 0; --r) {
-        var o = this.tryEntries[r];
-        if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) {
-          var i = o;
-          break;
-        }
-      }
-      i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null);
-      var a = i ? i.completion : {};
-      return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a);
-    },
-    complete: function (t, e) {
-      if ("throw" === t.type) throw t.arg;
-      return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y;
-    },
-    finish: function (t) {
-      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
-        var r = this.tryEntries[e];
-        if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y;
-      }
-    },
-    catch: function (t) {
-      for (var e = this.tryEntries.length - 1; e >= 0; --e) {
-        var r = this.tryEntries[e];
-        if (r.tryLoc === t) {
-          var n = r.completion;
-          if ("throw" === n.type) {
-            var o = n.arg;
-            resetTryEntry(r);
-          }
-          return o;
-        }
-      }
-      throw Error("illegal catch attempt");
-    },
-    delegateYield: function (e, r, n) {
-      return this.delegate = {
-        iterator: values(e),
-        resultName: r,
-        nextLoc: n
-      }, "next" === this.method && (this.arg = t), y;
+  })();
+}
+function _regeneratorDefine(e, r, n, t) {
+  var i = Object.defineProperty;
+  try {
+    i({}, "", {});
+  } catch (e) {
+    i = 0;
+  }
+  _regeneratorDefine = function (e, r, n, t) {
+    function o(r, n) {
+      _regeneratorDefine(e, r, function (e) {
+        return this._invoke(r, n, e);
+      });
     }
-  }, e;
+    r ? i ? i(e, r, {
+      value: n,
+      enumerable: !t,
+      configurable: !t,
+      writable: !t
+    }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
+  }, _regeneratorDefine(e, r, n, t);
 }
 function _setPrototypeOf(t, e) {
   return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
@@ -1477,6 +1284,45 @@ var handleConvertResponse = function handleConvertResponse(items, total) {
 var noEmptyArray = function noEmptyArray(targetObj) {
   return Array.isArray(targetObj) && targetObj.length !== 0;
 };
+var formContainerAndItemLayout = function formContainerAndItemLayout(type, title, name) {
+  return type === 'form' ? {
+    container: {
+      type: 'card',
+      props: {
+        title: title,
+        id: Math.random(),
+        level: 1,
+        name: name
+      }
+    },
+    itemLayout: {
+      span: 8,
+      labelCol: {
+        span: 8
+      },
+      wrapperCol: {
+        span: 18
+      }
+    }
+  } : {
+    container: {
+      type: 'card',
+      props: {
+        title: title,
+        id: Math.random(),
+        level: 1,
+        bordered: null,
+        isWhiteCard: true,
+        name: name
+      }
+    },
+    itemLayout: {
+      wrapperCol: {
+        span: 0
+      }
+    }
+  };
+};
 
 // 判断某个按钮/菜单 是否有权限，返回布尔值
 var authFunc = function authFunc(code) {
@@ -1563,22 +1409,22 @@ var parseToServe = function parseToServe(outdata, revertChart) {
 // sheepMap是表头字段中英文映射
 // sheetCount:表的数量，默认一张
 var resolveFile = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(file) {
     var config,
       data,
       _args = arguments;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
           config = _args.length > 1 && _args[1] !== undefined ? _args[1] : {
             sheetMap: [],
             sheetCount: 1
           };
-          _context.next = 3;
+          _context.n = 1;
           return analyseExcelToByte(file);
-        case 3:
-          data = _context.sent;
-          return _context.abrupt("return", new Promise(function (resolve, reject) {
+        case 1:
+          data = _context.v;
+          return _context.a(2, new Promise(function (resolve, reject) {
             var workbook = XLSX.read(data, {
               type: 'binary'
             });
@@ -1590,9 +1436,6 @@ var resolveFile = /*#__PURE__*/function () {
             var outdata = parseToServe(sheetMapJsonList, config.sheetMap);
             resolve(outdata);
           }));
-        case 5:
-        case "end":
-          return _context.stop();
       }
     }, _callee);
   }));
@@ -1602,41 +1445,40 @@ var resolveFile = /*#__PURE__*/function () {
 }();
 //读取文件 
 var readerXlsxToList = /*#__PURE__*/function () {
-  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(file, fileList, uploadRef, done, otherInfo) {
+  var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(file, fileList, uploadRef, done, otherInfo) {
     var _ref5, callback, sheetMap, nowFile, data2, data;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           _ref5 = otherInfo || {}, callback = _ref5.callback, sheetMap = _ref5.sheetMap;
           if (!(Array.isArray(fileList) && fileList.length > 0)) {
-            _context2.next = 15;
+            _context2.n = 3;
             break;
           }
           nowFile = fileList[fileList.length - 1]; // 阻止了默认上传file没有originFileObj了 得从fileList中去取
-          _context2.next = 5;
+          _context2.n = 1;
           return resolveFile(nowFile.originFileObj, {
             sheetMap: fieldMappingReverse(sheetMap),
             sheetCount: 1
           });
-        case 5:
-          data2 = _context2.sent;
+        case 1:
+          data2 = _context2.v;
           data = data2[0];
           if (data.length) {
-            _context2.next = 10;
+            _context2.n = 2;
             break;
           }
           antd.message.error("\u8BF7\u5148\u5F55\u5165\u6570\u636E\u518D\u5BFC\u5165");
-          return _context2.abrupt("return");
-        case 10:
+          return _context2.a(2);
+        case 2:
           if (callback) callback(data);
           !callback && antd.message.success("\u5BFC\u5165\u6210\u529F");
-          return _context2.abrupt("return", data);
-        case 15:
+          return _context2.a(2, data);
+        case 3:
           antd.message.error("\u8BF7\u9009\u62E9\u6587\u4EF6");
-          return _context2.abrupt("return");
-        case 17:
-        case "end":
-          return _context2.stop();
+          return _context2.a(2);
+        case 4:
+          return _context2.a(2);
       }
     }, _callee2);
   }));
@@ -2588,17 +2430,14 @@ var requestUtil = function requestUtil(_ref) {
   return request__default['default'](url, parms).then(handleResponseData);
 };
 var handleResponseData = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(response) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
-          return _context.abrupt("return", Promise.resolve({
+          return _context.a(2, Promise.resolve({
             data: response,
             status: response.status
           }));
-        case 1:
-        case "end":
-          return _context.stop();
       }
     }, _callee);
   }));
@@ -2971,88 +2810,108 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         data: luckysheet.transToCellData(newData)
       });
     };
-    _this.resetData = function () {
+    _this.resetData = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var _customerColumnsMappi;
-      var _this$props = _this.props,
-        validDataUrl = _this$props.validDataUrl,
-        validDataParams = _this$props.validDataParams,
-        updateData = _this$props.updateData,
-        columns = _this$props.columns,
-        isBrandAuth = _this$props.isBrandAuth,
-        _this$props$isCheckSt = _this$props.isCheckStockNum,
-        isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt,
-        customerColumnsMapping = _this$props.customerColumnsMapping;
-      var resultData = _this.getData().filter(function (d) {
-        return ___default['default'].compact(Object.values(d)).length;
-      });
-      var resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
-        return !!(c === null || c === void 0 ? void 0 : c.name);
-      })) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
-        return c.name;
-      }) : columns;
-      // 处理业务参数
-      var otherParams = {};
-      if (isBrandAuth) {
-        otherParams = {
-          brandAuth: 'ctl-withAuth'
-        };
-      }
-      requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
-        columns: resultColumns,
-        data: resultData,
-        checkStockNum: isCheckStockNum
-      })).then(function (result) {
-        result = result.data;
-        if (judgeIsRequestError(result)) {
-          antd.message.error(result.msg);
-          return;
-        }
-        var items = _this.state.items;
-        var validIndex = items.length;
-        var res = result.data;
-        var sheetData = luckysheet.getSheetData();
-        sheetData.map(function (item, index) {
-          if (!res[index]) return item;
-          var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
-            return i === 'skuCode';
-          });
-          if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
-            return i === 'skuCode';
-          })) && item[changeVMIndex].v !== res[index].skuCode) {
-            item[changeVMIndex].v = res[index].skuCode;
-            item[changeVMIndex].m = res[index].skuCode;
-          }
-          if (res[index].flag) {
-            item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
-              v: '通过',
-              m: '通过',
-              fc: 'green' //字体颜色为 "#990000"
-            });
-          } else {
-            item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
-              v: res[index].checkResults,
-              m: res[index].checkResults,
-              fc: 'red' //字体颜色为 "#990000"
+      var _this$props, validDataUrl, validDataParams, updateData, columns, isBrandAuth, _this$props$isCheckSt, isCheckStockNum, customerColumnsMapping, checkSharedValue, beforeCheckCallback, resultData, resultColumns, otherParams;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
+          case 0:
+            _this$props = _this.props, validDataUrl = _this$props.validDataUrl, validDataParams = _this$props.validDataParams, updateData = _this$props.updateData, columns = _this$props.columns, isBrandAuth = _this$props.isBrandAuth, _this$props$isCheckSt = _this$props.isCheckStockNum, isCheckStockNum = _this$props$isCheckSt === void 0 ? true : _this$props$isCheckSt, customerColumnsMapping = _this$props.customerColumnsMapping, checkSharedValue = _this$props.checkSharedValue, beforeCheckCallback = _this$props.beforeCheckCallback;
+            resultData = _this.getData().filter(function (d) {
+              return ___default['default'].compact(Object.values(d)).length;
             });
-          }
-          item[validIndex].ct = {
-            fa: 'General',
-            t: 'g'
-          };
-        });
-        // sheetData.map((item, index) => {
-        //   luckysheet.setCellValue(index + 1, 4, 345)
-        // })
-        luckysheet.create(_this.setConfig(luckysheet.transToCellData(sheetData)));
-        _this.setState({
-          data: luckysheet.transToCellData(sheetData),
-          errorListCheck: false,
-          resultData: res
-        });
-        console.log(setExportData);
-        setExportData([123123]);
-      }).catch(function (err) {});
-    };
+            resultColumns = (customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : customerColumnsMapping.length) ? customerColumnsMapping === null || customerColumnsMapping === void 0 ? void 0 : (_customerColumnsMappi = customerColumnsMapping.filter(function (c) {
+              return !!(c === null || c === void 0 ? void 0 : c.name);
+            })) === null || _customerColumnsMappi === void 0 ? void 0 : _customerColumnsMappi.map(function (c) {
+              return c.name;
+            }) : columns; // 处理业务参数
+            otherParams = {};
+            if (isBrandAuth) {
+              otherParams = {
+                brandAuth: 'ctl-withAuth'
+              };
+            }
+            // 处理校验参数，隐藏校验参数（公用的部分）
+            if (checkSharedValue) {
+              resultData = resultData.map(function (d) {
+                return _objectSpread2(_objectSpread2({}, d), checkSharedValue);
+              });
+            }
+            // 调用回调函数
+            if (!beforeCheckCallback) {
+              _context.n = 2;
+              break;
+            }
+            _context.n = 1;
+            return beforeCheckCallback(resultData);
+          case 1:
+            resultData = _context.v;
+            if (resultData) {
+              _context.n = 2;
+              break;
+            }
+            return _context.a(2);
+          case 2:
+            requestUtil.post(validDataUrl, _objectSpread2(_objectSpread2(_objectSpread2({}, otherParams), validDataParams), {}, {
+              columns: resultColumns,
+              data: resultData,
+              checkStockNum: isCheckStockNum
+            })).then(function (result) {
+              result = result.data;
+              if (judgeIsRequestError(result)) {
+                antd.message.error(result.msg);
+                return;
+              }
+              var items = _this.state.items;
+              var validIndex = items.length;
+              var res = result.data;
+              var sheetData = luckysheet.getSheetData();
+              sheetData.map(function (item, index) {
+                if (!res[index]) return item;
+                var changeVMIndex = resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.findIndex(function (i) {
+                  return i === 'skuCode';
+                });
+                if ((resultColumns === null || resultColumns === void 0 ? void 0 : resultColumns.find(function (i) {
+                  return i === 'skuCode';
+                })) && item[changeVMIndex].v !== res[index].skuCode) {
+                  item[changeVMIndex].v = res[index].skuCode;
+                  item[changeVMIndex].m = res[index].skuCode;
+                }
+                if (res[index].flag) {
+                  item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
+                    v: '通过',
+                    m: '通过',
+                    fc: 'green' //字体颜色为 "#990000"
+                  });
+                } else {
+                  item[validIndex] = _objectSpread2(_objectSpread2({}, item[validIndex]), {}, {
+                    v: res[index].checkResults,
+                    m: res[index].checkResults,
+                    fc: 'red' //字体颜色为 "#990000"
+                  });
+                }
+                item[validIndex].ct = {
+                  fa: 'General',
+                  t: 'g'
+                };
+              });
+              // sheetData.map((item, index) => {
+              //   luckysheet.setCellValue(index + 1, 4, 345)
+              // })
+              luckysheet.create(_this.setConfig(luckysheet.transToCellData(sheetData)));
+              _this.setState({
+                data: luckysheet.transToCellData(sheetData),
+                errorListCheck: false,
+                resultData: res
+              });
+              console.log(setExportData);
+              setExportData([123123]);
+            }).catch(function (err) {});
+          case 3:
+            return _context.a(2);
+        }
+      }, _callee);
+    }));
     _this.filterData = function (type) {
       var _this$state = _this.state,
         showErrorData = _this$state.showErrorData,
@@ -3209,8 +3068,8 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         if (!(res === null || res === void 0 ? void 0 : res[index])) return item;
         var rowItem = res[index];
         item === null || item === void 0 ? void 0 : item.forEach(function (element, colIndex) {
-          var _ref4;
-          var colKey = (_ref4 = Object.keys(rowItem) || []) === null || _ref4 === void 0 ? void 0 : _ref4[colIndex];
+          var _ref5;
+          var colKey = (_ref5 = Object.keys(rowItem) || []) === null || _ref5 === void 0 ? void 0 : _ref5[colIndex];
           if (!(rowItem === null || rowItem === void 0 ? void 0 : rowItem[colKey])) return element;
           element.m = rowItem[colKey];
           element.v = rowItem[colKey];
@@ -3286,10 +3145,10 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
         notExcelImport = _this$props6.notExcelImport,
         excelImportConfig = _this$props6.excelImportConfig,
         getTemplate = _this$props6.getTemplate;
-      var _ref5 = excelImportConfig || {},
-        size = _ref5.size,
-        accept = _ref5.accept,
-        suffixRule = _ref5.suffixRule;
+      var _ref6 = excelImportConfig || {},
+        size = _ref6.size,
+        accept = _ref6.accept,
+        suffixRule = _ref6.suffixRule;
       var totalSummary = this.getCount();
       var sheetMap = this.getSheetMap();
       var callBackFun = this.importExcelToLuckySheet;
@@ -3315,9 +3174,9 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
           var _Object$keys;
           if (!(sheetMap && ((_Object$keys = Object.keys(sheetMap)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length))) return;
           if (info.file.status !== 'uploading') {
-            var _ref6 = info || {},
-              file = _ref6.file,
-              fileList = _ref6.fileList;
+            var _ref7 = info || {},
+              file = _ref7.file,
+              fileList = _ref7.fileList;
             readerXlsxToList(file, fileList, null, null, {
               callback: function callback(excelData) {
                 callBackFun(excelData);
@@ -4124,7 +3983,8 @@ var QueryMutipleInput = function QueryMutipleInput(_ref) {
     setIsModalVisible(true);
     //弹窗打开时 默认搜索内容换行显示
     setPopValue(function (data) {
-      return data.replace(/,/g, '\n');
+      var _data$replace;
+      return data === null || data === void 0 ? void 0 : (_data$replace = data.replace) === null || _data$replace === void 0 ? void 0 : _data$replace.call(data, /,/g, '\n');
     });
   };
   var handleOk = function handleOk() {
@@ -4616,11 +4476,13 @@ var maxTagPlaceholder = function maxTagPlaceholder(selectedValues, _ref4) {
 };
 // 弹窗数据表头处理
 var handleTableColumns = function handleTableColumns(tableColumns) {
+  var _showTableColumns, _showTableColumns2;
   // 按照默认设置排序 > 没有排序字段的展示所有列表头 > 没有表头列不展示
   var showTableColumns = (tableColumns === null || tableColumns === void 0 ? void 0 : tableColumns.filter(function (s) {
     return typeof s.defaultSort == 'number';
   })) || tableColumns || [];
-  return (showTableColumns === null || showTableColumns === void 0 ? void 0 : showTableColumns.sort(function (a, b) {
+  showTableColumns = ((_showTableColumns = showTableColumns) === null || _showTableColumns === void 0 ? void 0 : _showTableColumns.length) ? showTableColumns : tableColumns;
+  return ((_showTableColumns2 = showTableColumns) === null || _showTableColumns2 === void 0 ? void 0 : _showTableColumns2.sort(function (a, b) {
     return a.defaultSort - b.defaultSort;
   })) || [];
 };
@@ -4738,27 +4600,27 @@ var QueryMutipleSearchSelect = function QueryMutipleSearchSelect(_ref) {
     popvalue = _useState8[0],
     setPopValue = _useState8[1];
   var _useState9 = React$1.useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    source = _useState10[0],
-    setSource = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    source = _useState0[0],
+    setSource = _useState0[1];
   var _useDebounceFn = ahooks.useDebounceFn(function () {
       getData();
     }, {
       wait: 1000
     }),
     run = _useDebounceFn.run;
-  var _useState11 = React$1.useState(false),
+  var _useState1 = React$1.useState(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    fetching = _useState10[0],
+    setFetching = _useState10[1];
+  var _useState11 = React$1.useState(''),
     _useState12 = _slicedToArray(_useState11, 2),
-    fetching = _useState12[0],
-    setFetching = _useState12[1];
-  var _useState13 = React$1.useState(''),
+    searchValue = _useState12[0],
+    setSearchValue = _useState12[1];
+  var _useState13 = React$1.useState(resultSourceKey),
     _useState14 = _slicedToArray(_useState13, 2),
-    searchValue = _useState14[0],
-    setSearchValue = _useState14[1];
-  var _useState15 = React$1.useState(resultSourceKey),
-    _useState16 = _slicedToArray(_useState15, 2),
-    uniqueValue = _useState16[0],
-    setUniqueValue = _useState16[1];
+    uniqueValue = _useState14[0],
+    setUniqueValue = _useState14[1];
   React$1.useEffect(function () {
     setPopValue(value);
     onValueChange(value);
@@ -5175,21 +5037,21 @@ var PropertySelector = function PropertySelector(_ref) {
     notCommonProperty = _useState8[0],
     setNotCommonProperty = _useState8[1];
   var _useState9 = React$1.useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    visible = _useState10[0],
-    setVisible = _useState10[1];
-  var _useState11 = React$1.useState(false),
+    _useState0 = _slicedToArray(_useState9, 2),
+    visible = _useState0[0],
+    setVisible = _useState0[1];
+  var _useState1 = React$1.useState(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    showNotCommon = _useState10[0],
+    setShowNotCommon = _useState10[1]; // 是否展示非常用属性
+  var _useState11 = React$1.useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    showNotCommon = _useState12[0],
-    setShowNotCommon = _useState12[1]; // 是否展示非常用属性
-  var _useState13 = React$1.useState([]),
+    classifyOptionList = _useState12[0],
+    setClassifyOptionList = _useState12[1];
+  var _useState13 = React$1.useState('1'),
     _useState14 = _slicedToArray(_useState13, 2),
-    classifyOptionList = _useState14[0],
-    setClassifyOptionList = _useState14[1];
-  var _useState15 = React$1.useState('1'),
-    _useState16 = _slicedToArray(_useState15, 2),
-    listKey = _useState16[0],
-    setListKey = _useState16[1];
+    listKey = _useState14[0],
+    setListKey = _useState14[1];
   React$1.useEffect(function () {
     requestUtil({
       url: '/items/class/withProperty?pageSize=500&currentPage=1',
@@ -5453,6 +5315,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     highestPopContainer = _props$highestPopCont === void 0 ? undefined : _props$highestPopCont,
     fieldComponent = props.fieldComponent,
     onSaveCallback = props.onSaveCallback,
+    _props$returnFormat = props.returnFormat,
+    returnFormat = _props$returnFormat === void 0 ? [] : _props$returnFormat,
     selectBusinessType = props.selectBusinessType;
   var _ref = rCTemp || {},
     url = _ref.url,
@@ -5511,14 +5375,16 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   var currentPage = 1;
   var selectParamsKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filter) || 'qp-codeAndName-like';
   var selectParamsInitKey = (requestConfig === null || requestConfig === void 0 ? void 0 : requestConfig.filterInit) || selectParamsKey;
-  var currentSelectProps = _objectSpread2(_objectSpread2({}, selectProps), {}, {
+  var currentSelectProps = _objectSpread2(_objectSpread2({
+    // 回显字段可自定义
+    optionLabelProp: "label"
+  }, selectProps), {}, {
     // 以下属性不可更改----设计配置项
     showArrow: true,
     showSearch: true,
     filterOption: false,
     allowClear: true,
     listHeight: 160,
-    optionLabelProp: "label",
     autoClearSearchValue: false,
     placement: 'bottomRight'
   });
@@ -5535,7 +5401,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   };
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
-    current: 1
+    current: 1,
+    pageSizeOptions: [10, 20, 50, 100, 500, 1000]
   });
   var disabled = !!noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
   var isHaveDependency = fixedparameter && fieldValToParam && ctx;
@@ -5567,29 +5434,29 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     scrollPage = _useState8[0],
     setScrollPage = _useState8[1];
   var _useState9 = React$1.useState(0),
-    _useState10 = _slicedToArray(_useState9, 2),
-    itemsTotal = _useState10[0],
-    setItemsTotal = _useState10[1];
-  var _useState11 = React$1.useState(false),
+    _useState0 = _slicedToArray(_useState9, 2),
+    itemsTotal = _useState0[0],
+    setItemsTotal = _useState0[1];
+  var _useState1 = React$1.useState(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    fetching = _useState10[0],
+    setFetching = _useState10[1];
+  var _useState11 = React$1.useState(''),
     _useState12 = _slicedToArray(_useState11, 2),
-    fetching = _useState12[0],
-    setFetching = _useState12[1];
-  var _useState13 = React$1.useState(''),
+    searchValue = _useState12[0],
+    setSearchValue = _useState12[1];
+  var _useState13 = React$1.useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    searchValue = _useState14[0],
-    setSearchValue = _useState14[1];
-  var _useState15 = React$1.useState(false),
+    isModalVisible = _useState14[0],
+    setIsModalVisible = _useState14[1];
+  var _useState15 = React$1.useState(initVal),
     _useState16 = _slicedToArray(_useState15, 2),
-    isModalVisible = _useState16[0],
-    setIsModalVisible = _useState16[1];
-  var _useState17 = React$1.useState(initVal),
+    popvalue = _useState16[0],
+    setPopValue = _useState16[1];
+  var _useState17 = React$1.useState(resultSourceKey),
     _useState18 = _slicedToArray(_useState17, 2),
-    popvalue = _useState18[0],
-    setPopValue = _useState18[1];
-  var _useState19 = React$1.useState(resultSourceKey),
-    _useState20 = _slicedToArray(_useState19, 2),
-    uniqueValue = _useState20[0],
-    setUniqueValue = _useState20[1];
+    uniqueValue = _useState18[0],
+    setUniqueValue = _useState18[1];
   var _useDebounceFn = ahooks.useDebounceFn(function (v) {
       // 优化搜索参数 支持传多个
       var searchParams = {};
@@ -5618,58 +5485,58 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   var _Form$useForm = antd.Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  var _useState19 = React$1.useState(true),
+    _useState20 = _slicedToArray(_useState19, 2),
+    collapsed = _useState20[0],
+    setCollapsed = _useState20[1];
   var _useState21 = React$1.useState(true),
     _useState22 = _slicedToArray(_useState21, 2),
-    collapsed = _useState22[0],
-    setCollapsed = _useState22[1];
-  var _useState23 = React$1.useState(true),
+    caretLeftFlag = _useState22[0],
+    setCaretLeftFlag = _useState22[1];
+  var _useState23 = React$1.useState([]),
     _useState24 = _slicedToArray(_useState23, 2),
-    caretLeftFlag = _useState24[0],
-    setCaretLeftFlag = _useState24[1];
-  var _useState25 = React$1.useState([]),
+    tableData = _useState24[0],
+    setTableData = _useState24[1];
+  var _useState25 = React$1.useState(tableInitPagination),
     _useState26 = _slicedToArray(_useState25, 2),
-    tableData = _useState26[0],
-    setTableData = _useState26[1];
-  var _useState27 = React$1.useState(tableInitPagination),
+    tablePagination = _useState26[0],
+    setTablePagination = _useState26[1];
+  var _useState27 = React$1.useState([]),
     _useState28 = _slicedToArray(_useState27, 2),
-    tablePagination = _useState28[0],
-    setTablePagination = _useState28[1];
+    selectedRowKeys = _useState28[0],
+    setSelectedRowKeys = _useState28[1];
   var _useState29 = React$1.useState([]),
     _useState30 = _slicedToArray(_useState29, 2),
-    selectedRowKeys = _useState30[0],
-    setSelectedRowKeys = _useState30[1];
-  var _useState31 = React$1.useState([]),
+    selectedRows = _useState30[0],
+    setSelectedRows = _useState30[1];
+  var _useState31 = React$1.useState(false),
     _useState32 = _slicedToArray(_useState31, 2),
-    selectedRows = _useState32[0],
-    setSelectedRows = _useState32[1];
+    checkedAll = _useState32[0],
+    setCheckedAll = _useState32[1];
   var _useState33 = React$1.useState(false),
     _useState34 = _slicedToArray(_useState33, 2),
-    checkedAll = _useState34[0],
-    setCheckedAll = _useState34[1];
-  var _useState35 = React$1.useState(false),
+    indeterminate = _useState34[0],
+    setIndeterminate = _useState34[1];
+  var _useState35 = React$1.useState({}),
     _useState36 = _slicedToArray(_useState35, 2),
-    indeterminate = _useState36[0],
-    setIndeterminate = _useState36[1];
-  var _useState37 = React$1.useState({}),
+    tableFormParams = _useState36[0],
+    setTableFormParams = _useState36[1];
+  var _useState37 = React$1.useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    tableFormParams = _useState38[0],
-    setTableFormParams = _useState38[1];
-  var _useState39 = React$1.useState(false),
+    tooltipVisible = _useState38[0],
+    setTooltipVisible = _useState38[1];
+  var _useState39 = React$1.useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
     _useState40 = _slicedToArray(_useState39, 2),
-    tooltipVisible = _useState40[0],
-    setTooltipVisible = _useState40[1];
-  var _useState41 = React$1.useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
+    tableShowColumns = _useState40[0],
+    setTabletShowColumns = _useState40[1]; // 默认展示表头-modalTableProps?.tableColumns
+  var _useState41 = React$1.useState(false),
     _useState42 = _slicedToArray(_useState41, 2),
-    tableShowColumns = _useState42[0],
-    setTabletShowColumns = _useState42[1]; // 默认展示表头-modalTableProps?.tableColumns
+    confirmLoading = _useState42[0],
+    setConfirmLoading = _useState42[1];
   var _useState43 = React$1.useState(false),
     _useState44 = _slicedToArray(_useState43, 2),
-    confirmLoading = _useState44[0],
-    setConfirmLoading = _useState44[1];
-  var _useState45 = React$1.useState(false),
-    _useState46 = _slicedToArray(_useState45, 2),
-    modalSearched = _useState46[0],
-    setModalSearched = _useState46[1];
+    modalSearched = _useState44[0],
+    setModalSearched = _useState44[1];
   var setSelectDataSource = function setSelectDataSource(list, total) {
     setItems(list);
     setItemsTotal(total);
@@ -5899,6 +5766,29 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       removeListener();
     };
   }, [isModalVisible]);
+  var safeJSONParse = function safeJSONParse(str) {
+    try {
+      return JSON.parse(str);
+    } catch (error) {
+      console.warn('JSON解析失败:', error);
+      return null;
+    }
+  };
+  // 获取回显的value值 如果开启了搜索条件 则需要过滤掉搜索条件
+  var getShowValue = function getShowValue(value) {
+    var newValue = _.cloneDeep(value);
+    if (selectProps.useSearchCondition && newValue) {
+      // 回显的时候 把搜索项的内容去掉
+      if (selectMode) {
+        newValue = newValue.filter(function (item) {
+          var parsedItem = safeJSONParse(decodeURIComponent(item));
+          // 过滤掉JSON对象（搜索条件），保留非JSON数据（实际选择项）
+          return !parsedItem || !(parsedItem && _typeof(parsedItem) === 'object' && !Array.isArray(parsedItem));
+        });
+      }
+    }
+    return newValue;
+  };
   var showModal = function showModal() {
     if (sDisabled) return;
     setSelectOpen(false);
@@ -5908,12 +5798,13 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     // 回显
     if (value) {
       if (selectMode) {
-        setSelectedRowKeys(labelInValue ? value.map(function (i) {
+        var newValue = getShowValue(value);
+        setSelectedRowKeys(labelInValue ? newValue.map(function (i) {
           return i.key;
-        }) : value);
-        setSelectedRows(labelInValue ? value.map(function (i) {
+        }) : newValue);
+        setSelectedRows(labelInValue ? newValue.map(function (i) {
           return _defineProperty(_defineProperty(_defineProperty({}, mappingValueField, i.key), "value", i.key), "text", i.label);
-        }) : value.map(function (i) {
+        }) : newValue.map(function (i) {
           return _defineProperty(_defineProperty({}, mappingValueField, i), "value", i);
         }));
         setPopValue(labelInValue ? value.map(function (i) {
@@ -5950,7 +5841,24 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       formaData(selectedValue, source);
     } else {
       var formatResult = selectMode ? [] : null;
-      onChange(formatResult, selectedValue);
+      // 支持使用查询条件 筛选
+      if (selectProps.useSearchCondition) {
+        var formValue = form.getFieldsValue();
+        // 一次性处理数据转换和过滤
+        var processedFormValue = Object.keys(formValue).reduce(function (acc, key) {
+          var value = formValue[key];
+          // 过滤空值（确保trim函数存在）
+          var trimmedValue = typeof value === 'string' ? value.trim() : value;
+          if (trimmedValue && trimmedValue !== '') {
+            acc[key] = trimmedValue;
+          }
+          return acc;
+        }, {});
+        var result = JSON.stringify(processedFormValue);
+        onChange(_.isEmpty(processedFormValue) ? formatResult : selectMode ? [result] : result, selectedValue);
+      } else {
+        onChange(formatResult, selectedValue);
+      }
     }
   };
   var handleOk = function handleOk() {
@@ -5980,18 +5888,25 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
         setConfirmLoading(false);
       });
     } else {
-      handleSelectOver(popvalue);
+      handleSelectOver(selectedRows.length ? popvalue : []);
       handleCancel();
     }
   };
   var formaData = function formaData(value, source) {
     if (labelInValue) {
+      var getFromat = function getFromat(format, val) {
+        return format.map(function (_ref8) {
+          var key = _ref8.key,
+            value = _ref8.value;
+          return _defineProperty({}, key, val[value]);
+        });
+      };
       var formatResult = value.map(function (i) {
-        return {
+        return Object.assign.apply(Object, [{
           key: i[mappingValueField] || i.key,
           label: i[mappingTextField] || i.label,
           value: i[mappingValueField] || i.value
-        };
+        }].concat(_toConsumableArray(getFromat(returnFormat, i))));
       });
       onChange(selectMode ? formatResult : formatResult[0], value, source);
     } else {
@@ -6139,7 +6054,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       })) || [];
       var searchList = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.noEmptySearchField) ? list : list === null || list === void 0 ? void 0 : list.concat(addKong);
       return searchList.map(function (i, index) {
-        var _i$field, _i$field3, _i$field5, _i$field7, _i$field9, _i$field10, _i$field11, _i$field12, _i$field14, _i$field15;
+        var _i$field, _i$field3, _i$field5, _i$field7, _i$field9, _i$field0, _i$field1, _i$field10, _i$field12, _i$field13;
         if ((i === null || i === void 0 ? void 0 : i.type) === 'kong') return /*#__PURE__*/React__default['default'].createElement(antd.Col, {
           span: ColSpan,
           key: i
@@ -6237,7 +6152,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
             disabled: setDisabled(i.name)
           }))));
         }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'multipleQueryInput' || (i === null || i === void 0 ? void 0 : (_i$field10 = i.field) === null || _i$field10 === void 0 ? void 0 : _i$field10.type) === 'multipleQueryInput') {
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'multipleQueryInput' || (i === null || i === void 0 ? void 0 : (_i$field0 = i.field) === null || _i$field0 === void 0 ? void 0 : _i$field0.type) === 'multipleQueryInput') {
           return /*#__PURE__*/React__default['default'].createElement(antd.Col, {
             span: ColSpan,
             key: i.name
@@ -6251,7 +6166,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
             }
           })));
         }
-        if ((i === null || i === void 0 ? void 0 : (_i$field11 = i.field) === null || _i$field11 === void 0 ? void 0 : _i$field11.type) === 'proppertySelector') {
+        if ((i === null || i === void 0 ? void 0 : (_i$field1 = i.field) === null || _i$field1 === void 0 ? void 0 : _i$field1.type) === 'proppertySelector') {
           return /*#__PURE__*/React__default['default'].createElement(antd.Col, {
             span: ColSpan,
             key: i.name
@@ -6261,8 +6176,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
             key: i.name
           }, /*#__PURE__*/React__default['default'].createElement(PropertySelector, null)));
         }
-        if ((i === null || i === void 0 ? void 0 : i.type) === 'itemPropertySelector' || (i === null || i === void 0 ? void 0 : (_i$field12 = i.field) === null || _i$field12 === void 0 ? void 0 : _i$field12.type) === 'itemPropertySelector') {
-          var _i$field13;
+        if ((i === null || i === void 0 ? void 0 : i.type) === 'itemPropertySelector' || (i === null || i === void 0 ? void 0 : (_i$field10 = i.field) === null || _i$field10 === void 0 ? void 0 : _i$field10.type) === 'itemPropertySelector') {
+          var _i$field11;
           return /*#__PURE__*/React__default['default'].createElement(antd.Col, {
             span: ColSpan,
             key: i.name
@@ -6275,9 +6190,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
               width: '100%'
             },
             placeholder: "\u8BF7\u9009\u62E9"
-          }, i === null || i === void 0 ? void 0 : (_i$field13 = i.field) === null || _i$field13 === void 0 ? void 0 : _i$field13.props))));
+          }, i === null || i === void 0 ? void 0 : (_i$field11 = i.field) === null || _i$field11 === void 0 ? void 0 : _i$field11.props))));
         }
-        if ((i === null || i === void 0 ? void 0 : (_i$field14 = i.field) === null || _i$field14 === void 0 ? void 0 : _i$field14.type) === 'multipleQuerySearchSelect') {
+        if ((i === null || i === void 0 ? void 0 : (_i$field12 = i.field) === null || _i$field12 === void 0 ? void 0 : _i$field12.type) === 'multipleQuerySearchSelect') {
           return /*#__PURE__*/React__default['default'].createElement(antd.Col, {
             span: ColSpan,
             key: i.name
@@ -6306,7 +6221,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
           placeholder: "\u8BF7\u8F93\u5165",
           allowClear: true,
           maxLength: 100
-        }, i === null || i === void 0 ? void 0 : (_i$field15 = i.field) === null || _i$field15 === void 0 ? void 0 : _i$field15.props), {}, {
+        }, i === null || i === void 0 ? void 0 : (_i$field13 = i.field) === null || _i$field13 === void 0 ? void 0 : _i$field13.props), {}, {
           disabled: setDisabled(i.name)
         }))));
       });
@@ -6599,9 +6514,25 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     confirmLoading: confirmLoading,
     onOk: handleOk,
     onCancel: handleCancel,
-    footer: selectMode || (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter) ? [/*#__PURE__*/React__default['default'].createElement(antd.Button, {
+    footer: selectMode || (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter) ? [selectProps.useSearchCondition ? (/*#__PURE__*/React__default['default'].createElement("div", {
+      key: "instructions",
+      style: {
+        position: 'absolute',
+        width: 'calc(100% - 500px)',
+        textAlign: 'left'
+      }
+    }, /*#__PURE__*/React__default['default'].createElement("div", null, "\u64CD\u4F5C\u8BF4\u660E\uFF1A\u7ED3\u679C\u96C6\u8FC7\u591A\u65F6\uFF0C\u53EF\u65E0\u9700\u9009\u62E9\u5177\u4F53\u6570\u636E\uFF0C\u7CFB\u7EDF\u5C06\u76F4\u63A5\u6309\u5DF2\u8BBE\u7B5B\u9009\u6761\u4EF6\u67E5\u8BE2"), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+      style: {
+        marginTop: '3px',
+        height: '22px'
+      },
+      value: value
+    }))) : /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
       key: "back",
-      onClick: handleCancel
+      onClick: handleCancel,
+      style: {
+        margin: selectProps.useSearchCondition ? '10px 0' : 0
+      }
     }, "\u53D6\u6D88"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
       key: "submit",
       type: "primary",
@@ -7626,135 +7557,132 @@ var AddSelect = function AddSelect(props) {
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var _useState9 = React$1.useState(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableSearchForm),
-    _useState10 = _slicedToArray(_useState9, 2),
-    tableSearchForm = _useState10[0],
-    setTableSearchForm = _useState10[1];
-  var _useState11 = React$1.useState(true),
+    _useState0 = _slicedToArray(_useState9, 2),
+    tableSearchForm = _useState0[0],
+    setTableSearchForm = _useState0[1];
+  var _useState1 = React$1.useState(true),
+    _useState10 = _slicedToArray(_useState1, 2),
+    caretLeftFlag = _useState10[0],
+    setCaretLeftFlag = _useState10[1];
+  var _useState11 = React$1.useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    caretLeftFlag = _useState12[0],
-    setCaretLeftFlag = _useState12[1];
-  var _useState13 = React$1.useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    tableData = _useState14[0],
-    setTableData = _useState14[1];
-  var _useState15 = React$1.useState(_objectSpread2({
+    tableData = _useState12[0],
+    setTableData = _useState12[1];
+  var _useState13 = React$1.useState(_objectSpread2({
       total: 0,
       size: "small",
       current: 1,
       pageSize: tableInitPageSize
     }, modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.topTablePagination)),
+    _useState14 = _slicedToArray(_useState13, 2),
+    tablePagination = _useState14[0],
+    setTablePagination = _useState14[1];
+  var _useState15 = React$1.useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    tablePagination = _useState16[0],
-    setTablePagination = _useState16[1];
-  var _useState17 = React$1.useState([]),
+    selectedRowKeys = _useState16[0],
+    setSelectedRowKeys = _useState16[1];
+  var _useState17 = React$1.useState({}),
     _useState18 = _slicedToArray(_useState17, 2),
-    selectedRowKeys = _useState18[0],
-    setSelectedRowKeys = _useState18[1];
-  var _useState19 = React$1.useState({}),
+    tableFormParams = _useState18[0],
+    setTableFormParams = _useState18[1];
+  var _useState19 = React$1.useState(false),
     _useState20 = _slicedToArray(_useState19, 2),
-    tableFormParams = _useState20[0],
-    setTableFormParams = _useState20[1];
+    confirmLoading = _useState20[0],
+    setConfirmLoading = _useState20[1];
   var _useState21 = React$1.useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    confirmLoading = _useState22[0],
-    setConfirmLoading = _useState22[1];
-  var _useState23 = React$1.useState(false),
+    confirmContinueLoading = _useState22[0],
+    setConfirmContinueLoading = _useState22[1];
+  var _useState23 = React$1.useState([]),
     _useState24 = _slicedToArray(_useState23, 2),
-    confirmContinueLoading = _useState24[0],
-    setConfirmContinueLoading = _useState24[1];
+    selectColumns = _useState24[0],
+    setSelectColumns = _useState24[1];
   var _useState25 = React$1.useState([]),
     _useState26 = _slicedToArray(_useState25, 2),
-    selectColumns = _useState26[0],
-    setSelectColumns = _useState26[1];
+    showColumns = _useState26[0],
+    setShowColumns = _useState26[1];
   var _useState27 = React$1.useState([]),
     _useState28 = _slicedToArray(_useState27, 2),
-    showColumns = _useState28[0],
-    setShowColumns = _useState28[1];
+    tableColumns = _useState28[0],
+    setTableColumns = _useState28[1];
   var _useState29 = React$1.useState([]),
     _useState30 = _slicedToArray(_useState29, 2),
-    tableColumns = _useState30[0],
-    setTableColumns = _useState30[1];
-  var _useState31 = React$1.useState([]),
-    _useState32 = _slicedToArray(_useState31, 2),
-    showToChooseColumns = _useState32[0],
-    setShowToChooseColumns = _useState32[1];
+    showToChooseColumns = _useState30[0],
+    setShowToChooseColumns = _useState30[1];
   var codeToChoose = tableCodeList[0] || initTableCode[businessType][0];
   var codeSelected = tableCodeList[1] || initTableCode[businessType][1];
   // FIXME: 特殊业务逻辑
   var checkSelectChange = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
-      var result;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(bType, tList, recordKey, recordItem, selectItem, changeValue) {
+      var result, _t;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.p = _context.n) {
           case 0:
             if (!(bType == 'skc' && tList.some(function (i) {
               return i[recordKey] == recordItem[recordKey] && i[selectItem.dataIndex] == changeValue;
             }))) {
-              _context.next = 3;
+              _context.n = 1;
               break;
             }
             antd.message.warning('相同skc配码不可设置相同哦');
-            return _context.abrupt("return", false);
-          case 3:
+            return _context.a(2, false);
+          case 1:
             if (!(bType == 'spu')) {
-              _context.next = 26;
+              _context.n = 9;
               break;
             }
             if (!(selectItem.dataIndex == 'colorName' && tList.some(function (i) {
               return i[recordKey] == recordItem[recordKey] && i.selectPropertyGroupCode == recordItem.selectPropertyGroupCode && i[selectItem.dataIndex] == changeValue;
             }))) {
-              _context.next = 7;
+              _context.n = 2;
               break;
             }
             antd.message.warning('相同商品相同配码颜色不可设置相同哦');
-            return _context.abrupt("return", false);
-          case 7:
+            return _context.a(2, false);
+          case 2:
             if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && !recordItem.colorName)) {
-              _context.next = 10;
+              _context.n = 3;
               break;
             }
             antd.message.warning('请先选择颜色！');
-            return _context.abrupt("return", false);
-          case 10:
+            return _context.a(2, false);
+          case 3:
             if (!(selectItem.dataIndex == 'selectPropertyGroupCode' && tList.some(function (i) {
               return i[recordKey] == recordItem[recordKey] && i.colorName == recordItem.colorName && i[selectItem.dataIndex] == changeValue;
             }))) {
-              _context.next = 13;
+              _context.n = 4;
               break;
             }
             antd.message.warning('相同商品相同颜色配码不可设置相同哦');
-            return _context.abrupt("return", false);
-          case 13:
+            return _context.a(2, false);
+          case 4:
             if (!(selectItem.dataIndex == 'selectPropertyGroupCode')) {
-              _context.next = 26;
+              _context.n = 9;
               break;
             }
             result = true;
-            _context.prev = 15;
-            _context.next = 18;
+            _context.p = 5;
+            _context.n = 6;
             return checkSpuMatchCode({
               skcCode: recordItem[recordKey],
               matchingCode: changeValue,
               ext1: recordItem.colorName
             });
-          case 18:
-            result = _context.sent;
+          case 6:
+            result = _context.v;
             result = true;
-            _context.next = 25;
+            _context.n = 8;
             break;
-          case 22:
-            _context.prev = 22;
-            _context.t0 = _context["catch"](15);
-            result = typeof _context.t0 == 'boolean' ? _context.t0 : false;
-          case 25:
-            return _context.abrupt("return", result);
-          case 26:
-            return _context.abrupt("return", true);
-          case 27:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[15, 22]]);
+          case 7:
+            _context.p = 7;
+            _t = _context.v;
+            result = typeof _t == 'boolean' ? _t : false;
+          case 8:
+            return _context.a(2, result);
+          case 9:
+            return _context.a(2, true);
+        }
+      }, _callee, null, [[5, 7]]);
     }));
     return function checkSelectChange(_x, _x2, _x3, _x4, _x5, _x6) {
       return _ref2.apply(this, arguments);
@@ -7832,6 +7760,115 @@ var AddSelect = function AddSelect(props) {
               acc[key] = typeof value === 'function' ? value === null || value === void 0 ? void 0 : value(record) : value;
               return acc;
             }, {});
+            // 可输入非数字字符
+            if (item.canInputString) {
+              return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2(_objectSpread2({
+                min: 0,
+                precision: 0,
+                controls: false
+              }, inputProps), {}, {
+                value: text || '',
+                keyboard: false,
+                onPressEnter: function onPressEnter(e) {
+                  e.target.blur();
+                },
+                onBlur: function () {
+                  var _onBlur = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(e) {
+                    var value;
+                    return _regenerator().w(function (_context2) {
+                      while (1) switch (_context2.n) {
+                        case 0:
+                          value = e.target.value;
+                          record[item.dataIndex] = value;
+                          editRecord(record);
+                        case 1:
+                          return _context2.a(2);
+                      }
+                    }, _callee2);
+                  }));
+                  function onBlur(_x7) {
+                    return _onBlur.apply(this, arguments);
+                  }
+                  return onBlur;
+                }(),
+                onKeyDown: function onKeyDown(e) {
+                  if (e.keyCode === 13 && e.ctrlKey) {
+                    var _document$getElementB;
+                    handleOk(true);
+                    (_document$getElementB = document.getElementById("first-query")) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
+                  }
+                  if (e.keyCode === 8 && e.ctrlKey) {
+                    var _e$nativeEvent$path$;
+                    antd.message.success('删除当前行');
+                    e.stopPropagation();
+                    e.preventDefault();
+                    var dom = (_e$nativeEvent$path$ = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$ === void 0 ? void 0 : _e$nativeEvent$path$.getElementsByTagName('input')[currentIndex];
+                    if (dom) {
+                      dom.select();
+                      dom.focus();
+                      dom.scrollIntoView(false);
+                    }
+                    dom = null;
+                    deleteRecord(record);
+                  }
+                  if (e.keyCode === 37 && e.shiftKey) {
+                    var _e$nativeEvent$path$2;
+                    // 左滑动
+                    e.stopPropagation();
+                    e.preventDefault();
+                    var _dom = (_e$nativeEvent$path$2 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$2 === void 0 ? void 0 : _e$nativeEvent$path$2.getElementsByTagName('input')[currentIndex - 1];
+                    if (_dom) {
+                      _dom.select();
+                      _dom.focus();
+                      _dom.scrollIntoView(false);
+                    }
+                    _dom = null;
+                  }
+                  if (e.keyCode === 39 && e.shiftKey) {
+                    var _e$nativeEvent$path$3;
+                    //  右滑
+                    e.stopPropagation();
+                    e.preventDefault();
+                    var _dom2 = (_e$nativeEvent$path$3 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$3 === void 0 ? void 0 : _e$nativeEvent$path$3.getElementsByTagName('input')[currentIndex + 1];
+                    if (_dom2) {
+                      _dom2.select();
+                      _dom2.focus();
+                      _dom2.scrollIntoView(false);
+                    }
+                    _dom2 = null;
+                  }
+                  if (e.keyCode === 40) {
+                    var _e$nativeEvent$path$4;
+                    e.stopPropagation();
+                    e.preventDefault();
+                    var _dom3 = (_e$nativeEvent$path$4 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$4 === void 0 ? void 0 : _e$nativeEvent$path$4.getElementsByTagName('input')[currentIndex];
+                    if (_dom3) {
+                      _dom3.select();
+                      _dom3.focus();
+                      _dom3.scrollIntoView(false);
+                    }
+                    _dom3 = null;
+                  } else if (e.keyCode === 38) {
+                    var _e$nativeEvent$path$5;
+                    e.stopPropagation();
+                    e.preventDefault();
+                    var dom1 = (_e$nativeEvent$path$5 = e.nativeEvent.path[5].children[index]) === null || _e$nativeEvent$path$5 === void 0 ? void 0 : _e$nativeEvent$path$5.getElementsByTagName('input')[currentIndex];
+                    if (dom1) {
+                      // dom1.value=""
+                      // dom1.setSelectionRange(100, 0);
+                      dom1.select();
+                      dom1.focus();
+                      dom1.scrollIntoViewIfNeeded(false);
+                      // dom1.value=record['count']
+                    }
+                    dom1 = null;
+                  } else if (e.keyCode === 9 && index === selectedRowKeys.length - 1 && currentIndex === inputLength - 1) {
+                    e.stopPropagation();
+                    e.preventDefault();
+                  }
+                }
+              }));
+            }
             return /*#__PURE__*/React__default['default'].createElement(antd.InputNumber, _objectSpread2(_objectSpread2(_objectSpread2({}, inputProps), {}, {
               value: text || '',
               min: 0,
@@ -7849,16 +7886,16 @@ var AddSelect = function AddSelect(props) {
               // }}
               onKeyDown: function onKeyDown(e) {
                 if (e.keyCode === 13 && e.ctrlKey) {
-                  var _document$getElementB;
+                  var _document$getElementB2;
                   handleOk(true);
-                  (_document$getElementB = document.getElementById("first-query")) === null || _document$getElementB === void 0 ? void 0 : _document$getElementB.focus();
+                  (_document$getElementB2 = document.getElementById("first-query")) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.focus();
                 }
                 if (e.keyCode === 8 && e.ctrlKey) {
-                  var _e$nativeEvent$path$;
+                  var _e$nativeEvent$path$6;
                   antd.message.success('删除当前行');
                   e.stopPropagation();
                   e.preventDefault();
-                  var dom = (_e$nativeEvent$path$ = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$ === void 0 ? void 0 : _e$nativeEvent$path$.getElementsByTagName('input')[currentIndex];
+                  var dom = (_e$nativeEvent$path$6 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$6 === void 0 ? void 0 : _e$nativeEvent$path$6.getElementsByTagName('input')[currentIndex];
                   if (dom) {
                     dom.select();
                     dom.focus();
@@ -7868,47 +7905,47 @@ var AddSelect = function AddSelect(props) {
                   deleteRecord(record);
                 }
                 if (e.keyCode === 37 && e.shiftKey) {
-                  var _e$nativeEvent$path$2;
+                  var _e$nativeEvent$path$7;
                   // 左滑动
                   e.stopPropagation();
                   e.preventDefault();
-                  var _dom = (_e$nativeEvent$path$2 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$2 === void 0 ? void 0 : _e$nativeEvent$path$2.getElementsByTagName('input')[currentIndex - 1];
-                  if (_dom) {
-                    _dom.select();
-                    _dom.focus();
-                    _dom.scrollIntoView(false);
+                  var _dom4 = (_e$nativeEvent$path$7 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$7 === void 0 ? void 0 : _e$nativeEvent$path$7.getElementsByTagName('input')[currentIndex - 1];
+                  if (_dom4) {
+                    _dom4.select();
+                    _dom4.focus();
+                    _dom4.scrollIntoView(false);
                   }
-                  _dom = null;
+                  _dom4 = null;
                 }
                 if (e.keyCode === 39 && e.shiftKey) {
-                  var _e$nativeEvent$path$3;
+                  var _e$nativeEvent$path$8;
                   //  右滑
                   e.stopPropagation();
                   e.preventDefault();
-                  var _dom2 = (_e$nativeEvent$path$3 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$3 === void 0 ? void 0 : _e$nativeEvent$path$3.getElementsByTagName('input')[currentIndex + 1];
-                  if (_dom2) {
-                    _dom2.select();
-                    _dom2.focus();
-                    _dom2.scrollIntoView(false);
+                  var _dom5 = (_e$nativeEvent$path$8 = e.nativeEvent.path[5].children[index + 1]) === null || _e$nativeEvent$path$8 === void 0 ? void 0 : _e$nativeEvent$path$8.getElementsByTagName('input')[currentIndex + 1];
+                  if (_dom5) {
+                    _dom5.select();
+                    _dom5.focus();
+                    _dom5.scrollIntoView(false);
                   }
-                  _dom2 = null;
+                  _dom5 = null;
                 }
                 if (e.keyCode === 40) {
-                  var _e$nativeEvent$path$4;
+                  var _e$nativeEvent$path$9;
                   e.stopPropagation();
                   e.preventDefault();
-                  var _dom3 = (_e$nativeEvent$path$4 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$4 === void 0 ? void 0 : _e$nativeEvent$path$4.getElementsByTagName('input')[currentIndex];
-                  if (_dom3) {
-                    _dom3.select();
-                    _dom3.focus();
-                    _dom3.scrollIntoView(false);
+                  var _dom6 = (_e$nativeEvent$path$9 = e.nativeEvent.path[5].children[index + 2]) === null || _e$nativeEvent$path$9 === void 0 ? void 0 : _e$nativeEvent$path$9.getElementsByTagName('input')[currentIndex];
+                  if (_dom6) {
+                    _dom6.select();
+                    _dom6.focus();
+                    _dom6.scrollIntoView(false);
                   }
-                  _dom3 = null;
+                  _dom6 = null;
                 } else if (e.keyCode === 38) {
-                  var _e$nativeEvent$path$5;
+                  var _e$nativeEvent$path$0;
                   e.stopPropagation();
                   e.preventDefault();
-                  var dom1 = (_e$nativeEvent$path$5 = e.nativeEvent.path[5].children[index]) === null || _e$nativeEvent$path$5 === void 0 ? void 0 : _e$nativeEvent$path$5.getElementsByTagName('input')[currentIndex];
+                  var dom1 = (_e$nativeEvent$path$0 = e.nativeEvent.path[5].children[index]) === null || _e$nativeEvent$path$0 === void 0 ? void 0 : _e$nativeEvent$path$0.getElementsByTagName('input')[currentIndex];
                   if (dom1) {
                     // dom1.value=""
                     // dom1.setSelectionRange(100, 0);
@@ -7942,19 +7979,19 @@ var AddSelect = function AddSelect(props) {
               return /*#__PURE__*/React__default['default'].createElement(antd.Select, _objectSpread2(_objectSpread2({}, item.selectProps), {}, {
                 value: text || null,
                 onChange: function () {
-                  var _onChange = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
-                    var dataSourceSelectItem, _item$selectChangeCal, changeValue, isCheckPass, isConformToTheRules;
-                    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                      while (1) switch (_context2.prev = _context2.next) {
+                  var _onChange = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(value) {
+                    var dataSourceSelectItem, _item$selectChangeCal, changeValue, isCheckPass, isConformToTheRules, _t2;
+                    return _regenerator().w(function (_context3) {
+                      while (1) switch (_context3.p = _context3.n) {
                         case 0:
                           dataSourceSelectItem = (dataSourceList === null || dataSourceList === void 0 ? void 0 : dataSourceList.find(function (d) {
                             return d[selectKey] == value;
                           })) || {};
                           if (!(item === null || item === void 0 ? void 0 : item.selectChangeCallback)) {
-                            _context2.next = 6;
+                            _context3.n = 2;
                             break;
                           }
-                          _context2.next = 4;
+                          _context3.n = 1;
                           return item === null || item === void 0 ? void 0 : (_item$selectChangeCal = item.selectChangeCallback) === null || _item$selectChangeCal === void 0 ? void 0 : _item$selectChangeCal.call(item, popvalue, setPopValue, {
                             record: record,
                             index: index,
@@ -7964,10 +8001,10 @@ var AddSelect = function AddSelect(props) {
                             dataSourceSelectItem: dataSourceSelectItem,
                             editRecord: editRecord
                           });
-                        case 4:
-                          _context2.next = 25;
+                        case 1:
+                          _context3.n = 10;
                           break;
-                        case 6:
+                        case 2:
                           // 更新当前行数据函数
                           changeValue = function changeValue(v, dSSItem) {
                             var _item$dataSourceSelec;
@@ -7980,12 +8017,12 @@ var AddSelect = function AddSelect(props) {
                             }
                           }; // 处理校验，默认不校验
                           isCheckPass = true;
-                          _context2.prev = 8;
+                          _context3.p = 3;
                           if (!(item === null || item === void 0 ? void 0 : item.selectCheckCallback)) {
-                            _context2.next = 15;
+                            _context3.n = 5;
                             break;
                           }
-                          _context2.next = 12;
+                          _context3.n = 4;
                           return item === null || item === void 0 ? void 0 : item.selectCheckCallback(popvalue, {
                             record: record,
                             index: index,
@@ -7994,23 +8031,23 @@ var AddSelect = function AddSelect(props) {
                             changeValue: value,
                             dataSourceSelectItem: dataSourceSelectItem
                           });
-                        case 12:
-                          isCheckPass = _context2.sent;
-                          _context2.next = 19;
+                        case 4:
+                          isCheckPass = _context3.v;
+                          _context3.n = 7;
                           break;
-                        case 15:
-                          _context2.next = 17;
+                        case 5:
+                          _context3.n = 6;
                           return checkSelectChange(businessType, popvalue, mappingValueField, record, item, value);
-                        case 17:
-                          isConformToTheRules = _context2.sent;
+                        case 6:
+                          isConformToTheRules = _context3.v;
                           isCheckPass = !isConformToTheRules;
-                        case 19:
-                          _context2.next = 23;
+                        case 7:
+                          _context3.n = 9;
                           break;
-                        case 21:
-                          _context2.prev = 21;
-                          _context2.t0 = _context2["catch"](8);
-                        case 23:
+                        case 8:
+                          _context3.p = 8;
+                          _t2 = _context3.v;
+                        case 9:
                           if (isCheckPass) {
                             changeValue(value, dataSourceSelectItem);
                           } else {
@@ -8018,13 +8055,12 @@ var AddSelect = function AddSelect(props) {
                           }
                           // 更新已选表格函数
                           editRecord(record);
-                        case 25:
-                        case "end":
-                          return _context2.stop();
+                        case 10:
+                          return _context3.a(2);
                       }
-                    }, _callee2, null, [[8, 21]]);
+                    }, _callee3, null, [[3, 8]]);
                   }));
-                  function onChange(_x7) {
+                  function onChange(_x8) {
                     return _onChange.apply(this, arguments);
                   }
                   return onChange;
@@ -8284,8 +8320,8 @@ var AddSelect = function AddSelect(props) {
       }
     }
     setTimeout(function () {
-      var _document$getElementB2;
-      (_document$getElementB2 = document.getElementById("first-query")) === null || _document$getElementB2 === void 0 ? void 0 : _document$getElementB2.focus();
+      var _document$getElementB3;
+      (_document$getElementB3 = document.getElementById("first-query")) === null || _document$getElementB3 === void 0 ? void 0 : _document$getElementB3.focus();
     }, 50);
   };
   // 将格式化完的数据回显到 表格中
@@ -8315,7 +8351,7 @@ var AddSelect = function AddSelect(props) {
       handleLoading(isContinue, true);
       onSaveCallback(popvalue).then(function (res) {
         {
-          var _Object$keys2, _document$getElementB3;
+          var _Object$keys2, _document$getElementB4;
           // 成功信息可以在调用处处理 即resolve({messageSuccessBackInfo: { needThrowSuccess: false } })、resolve({messageSuccessBackInfo: { needThrowSuccess: true, successMessage: '已保存' } })
           var initSuccessMessage = '保存成功';
           var rmsbi = (res === null || res === void 0 ? void 0 : res.messageSuccessBackInfo) || {};
@@ -8325,7 +8361,7 @@ var AddSelect = function AddSelect(props) {
             antd.message.success(initSuccessMessage);
           }
           deleteSelectRows();
-          (_document$getElementB3 = document.getElementById('first-query')) === null || _document$getElementB3 === void 0 ? void 0 : _document$getElementB3.focus();
+          (_document$getElementB4 = document.getElementById('first-query')) === null || _document$getElementB4 === void 0 ? void 0 : _document$getElementB4.focus();
           !isContinue && handleCancel();
         }
         handleLoading(isContinue, false);
@@ -9413,29 +9449,29 @@ var BillEntry = function BillEntry(_ref3) {
     dataIndex: 'propertyNameAndValue'
   }];
   var _useState9 = React$1.useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    isModalVisible = _useState10[0],
-    setIsModalVisible = _useState10[1];
-  var _useState11 = React$1.useState([{
+    _useState0 = _slicedToArray(_useState9, 2),
+    isModalVisible = _useState0[0],
+    setIsModalVisible = _useState0[1];
+  var _useState1 = React$1.useState([{
       hovered: false
     }]),
-    _useState12 = _slicedToArray(_useState11, 2),
-    data = _useState12[0],
-    setData = _useState12[1];
+    _useState10 = _slicedToArray(_useState1, 2),
+    data = _useState10[0],
+    setData = _useState10[1];
   var tableRef = React$1.useRef(null);
   var codeSelected = tableCode;
-  var _useState13 = React$1.useState(false),
+  var _useState11 = React$1.useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    loading = _useState12[0],
+    setLoading = _useState12[1];
+  var _useState13 = React$1.useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    loading = _useState14[0],
-    setLoading = _useState14[1];
+    selectColumns = _useState14[0],
+    setSelectColumns = _useState14[1];
   var _useState15 = React$1.useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    selectColumns = _useState16[0],
-    setSelectColumns = _useState16[1];
-  var _useState17 = React$1.useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    showColumns = _useState18[0],
-    setShowColumns = _useState18[1];
+    showColumns = _useState16[0],
+    setShowColumns = _useState16[1];
   React$1.useEffect(function () {
     setSelectColumns([].concat(_toConsumableArray(columns.map(function (item) {
       var inputLength = columns.filter(function (item) {
@@ -9551,42 +9587,42 @@ var BillEntry = function BillEntry(_ref3) {
     });
   };
   var handleSubmit = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var canEntryObject, _canEntryObject$error, messageInfo;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             if (data === null || data === void 0 ? void 0 : data.length) {
-              _context.next = 3;
+              _context.n = 1;
               break;
             }
             antd.message.warning('至少录入一条数据');
-            return _context.abrupt("return");
-          case 3:
+            return _context.a(2);
+          case 1:
             if (data === null || data === void 0 ? void 0 : data.every(function (d) {
               return d.skuCode && d.name;
             })) {
-              _context.next = 6;
+              _context.n = 2;
               break;
             }
             antd.message.warning('录入商品不存在');
-            return _context.abrupt("return");
-          case 6:
+            return _context.a(2);
+          case 2:
             if (data === null || data === void 0 ? void 0 : data.every(function (d) {
               return d.count;
             })) {
-              _context.next = 9;
+              _context.n = 3;
               break;
             }
             antd.message.warning('请填写商品数量！');
-            return _context.abrupt("return");
-          case 9:
-            _context.next = 11;
+            return _context.a(2);
+          case 3:
+            _context.n = 4;
             return isSkuCanEntry(data);
-          case 11:
-            canEntryObject = _context.sent;
+          case 4:
+            canEntryObject = _context.v;
             if (!((canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.flag) === false)) {
-              _context.next = 16;
+              _context.n = 5;
               break;
             }
             messageInfo = (canEntryObject === null || canEntryObject === void 0 ? void 0 : (_canEntryObject$error = canEntryObject.errorList) === null || _canEntryObject$error === void 0 ? void 0 : _canEntryObject$error.length) && (canEntryObject === null || canEntryObject === void 0 ? void 0 : canEntryObject.errorList.map(function (i) {
@@ -9596,8 +9632,8 @@ var BillEntry = function BillEntry(_ref3) {
               content: messageInfo,
               duration: 6
             });
-            return _context.abrupt("return");
-          case 16:
+            return _context.a(2);
+          case 5:
             setLoading(true);
             onSaveCallback(data).then(function (res) {
               {
@@ -9615,9 +9651,8 @@ var BillEntry = function BillEntry(_ref3) {
               antd.message.error(Error);
               setLoading(false);
             });
-          case 18:
-          case "end":
-            return _context.stop();
+          case 6:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -10013,31 +10048,36 @@ function commonFun(type, prefixUrl, parentProps) {
     });
   };
   // 格式化树选择器数据源
-  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge) {
-    var haveChildren = Array.isArray(treeDataItem.children) && treeDataItem.children.length > 0;
+  var _mapSearchTree = function mapSearchTree(treeDataItem, resKeyValue, disabledJudge, childrenKey) {
+    var haveChildren = Array.isArray(treeDataItem[childrenKey]) && treeDataItem[childrenKey].length > 0;
     return {
       title: treeDataItem[resKeyValue[1]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
       data: _objectSpread2({}, treeDataItem),
       isLeaf: !haveChildren,
-      disabled: disabledJudge !== undefined ? disabledJudge : haveChildren,
-      children: haveChildren ? treeDataItem.children.map(function (i) {
-        return _mapSearchTree(i, resKeyValue, disabledJudge);
+      disabled: disabledJudge !== undefined ? _.isBoolean(disabledJudge) ? disabledJudge : disabledJudge(treeDataItem) : haveChildren,
+      children: haveChildren ? treeDataItem[childrenKey].map(function (i) {
+        return _mapSearchTree(i, resKeyValue, disabledJudge, childrenKey);
       }) : []
     };
   };
   var formatTreeDataSource = function formatTreeDataSource(reData, position, changePosition, changeSearchForm) {
     var _reData$position2;
     var resKeyValue = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : ['id', 'name'];
+    var childrenKey = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 'children';
+    var nodeDisabledJudge = arguments.length > 6 ? arguments[6] : undefined;
     var data = reData && ((_reData$position2 = reData[position]) === null || _reData$position2 === void 0 ? void 0 : _reData$position2.data);
     var disabledJudge;
     if (data && _typeof(data) === 'object' && !Array.isArray(data) && Object.keys(data).length > 0) {
       data = [data];
       disabledJudge = false;
     }
+    if (nodeDisabledJudge) {
+      disabledJudge = nodeDisabledJudge;
+    }
     var formatData = data && Array.isArray(data) && data.length && data.map(function (ites) {
-      return _mapSearchTree(ites, resKeyValue, disabledJudge);
+      return _mapSearchTree(ites, resKeyValue, disabledJudge, childrenKey);
     }) || [];
     changeSearchForm[changePosition].field.props.treeData = formatData;
   };
@@ -10498,10 +10538,10 @@ function commonFun(type, prefixUrl, parentProps) {
     selectProps = _objectSpread2({
       placeholder: '输入商品(SPU)编码或名称',
       renderTableColumns: [{
-        title: '商品编码(SPU)',
+        title: 'SPU编码',
         dataIndex: 'itemCode'
       }, {
-        title: '商品名称(SPU)',
+        title: 'SPU名称',
         dataIndex: 'name'
       }]
     }, selectConfigProps);
@@ -10518,11 +10558,11 @@ function commonFun(type, prefixUrl, parentProps) {
     }, requestConfigProp);
     tableSearchForm = [{
       name: 'itemCode*multiInput',
-      label: '商品编码(SPU)',
+      label: 'SPU编码',
       type: 'multipleQueryInput'
     }, {
       name: 'name*multiInput',
-      label: '商品名称(SPU)',
+      label: 'SPU名称',
       type: 'multipleQueryInput'
     }, {
       name: 'qp-brandId-in',
@@ -10616,11 +10656,11 @@ function commonFun(type, prefixUrl, parentProps) {
         dataIndex: 'keyIndex',
         defaultSort: 0
       }, {
-        title: '商品编码(SPU)',
+        title: 'SPU编码',
         dataIndex: 'itemCode',
         defaultSort: 1
       }, {
-        title: '商品名称(SPU) ',
+        title: 'SPU名称',
         dataIndex: 'name',
         defaultSort: 2
       }, {
@@ -10974,7 +11014,7 @@ function commonFun(type, prefixUrl, parentProps) {
       options: getQueryHeadersItem(_queryHeaderParams5, 'qp-brandId-in')
     }], ['colorName', 'categoryId', 'classId', 'brandId'], hiddenFields);
     var fieldLoadSource = fieldsRequest.map(function (i) {
-      return loadSelectSource$1(i.url, i.params, options);
+      return loadSelectSource$1(i.url, i.params, i.options);
     });
     requestConfig = _objectSpread2({
       url: "".concat(prefixUrl.selectPrefix, "/skc/skcSelect"),
@@ -11188,6 +11228,26 @@ function commonFun(type, prefixUrl, parentProps) {
       }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.addOtherParams) || {}),
       sourceName: 'warehouseIds'
     }, requestConfigProp);
+    var _queryHeaderParams7 = getQueryHeadersList({
+      querySelectHeadersList: querySelectHeadersList,
+      extralHeaders: extralHeaders
+    });
+    Promise.all([loadSelectSource$1("/channel-manage/channelInfo/tree", {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+      'qp-status-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-orgCode-in'))]).then(function (x) {
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 0, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 1, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+    });
     tableSearchForm = [{
       name: 'realWarehouseName*multiInput',
       label: '逻辑仓名称',
@@ -11211,6 +11271,70 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       label: '管理大区',
       initialSource: getDictionarySource$1('BUSINESS_belongArea')
+    }, {
+      name: 'qp-channelCode-in',
+      type: 'treeSelect',
+      label: '销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-refCode-in',
+      type: 'treeSelect',
+      label: '营销区域',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-type-in',
+      type: 'select',
+      label: '店铺性质',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      },
+      initialSource: getDictionarySource$1('BUSINESS_StoreType')
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-isEnable-eq',
       type: 'select',
@@ -11239,10 +11363,36 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00004', text);
         }
+      }, {
+        title: '运营组名称',
+        dataIndex: 'groupCode',
+        defaultSort: 7,
+        render: function render(text, record) {
+          return (record === null || record === void 0 ? void 0 : record.groupName) ? "\u3010".concat(text, "\u3011").concat(record === null || record === void 0 ? void 0 : record.groupName) : "";
+        },
+        width: 100
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 4,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '店铺性质',
+        dataIndex: 'type',
+        defaultSort: 6,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BUSINESS_StoreType', text);
+        },
+        width: 80
       }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
         title: '状态',
         dataIndex: 'isEnable',
-        defaultSort: 4,
+        defaultSort: 8,
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
@@ -11302,20 +11452,50 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-channelCode-in',
+      type: 'treeSelect',
+      label: '销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
     }].concat(_toConsumableArray((modalTableBusProps === null || modalTableBusProps === void 0 ? void 0 : modalTableBusProps.needStatusSearch) ? [{
       name: 'qp-status-eq',
       type: 'select',
       label: '运营仓状态',
       initialSource: getDictionarySource$1('SC00001')
     }] : []));
-    var _queryHeaderParams7 = getQueryHeadersList({
+    var _queryHeaderParams8 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/groupInfo/listNoPage"), {
       'qp-status-eq': 1
-    }, getQueryHeadersItem(_queryHeaderParams7, 'qp-groupCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-groupCode-in')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-orgCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm, ['groupCode', 'groupName']);
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      formatTreeDataSource(x, 1, 3, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择运营仓',
@@ -11343,7 +11523,12 @@ function commonFun(type, prefixUrl, parentProps) {
         render: function render(text) {
           return getDictionaryTextByValue$1('SC00001', text);
         }
-      }] : []))
+      }] : []), [{
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }])
     }, modalTableBusProps);
   }
   // 仓库选择器（虚拟、渠道仓）（无弹窗）
@@ -11492,7 +11677,7 @@ function commonFun(type, prefixUrl, parentProps) {
       label: '共享类型',
       initialSource: sharingTypeDataList
     }];
-    var _queryHeaderParams8 = getQueryHeadersList({
+    var _queryHeaderParams9 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -11500,14 +11685,14 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
+    }, getQueryHeadersItem(_queryHeaderParams9, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-accountingCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
+    }, getQueryHeadersItem(_queryHeaderParams9, 'qp-accountingCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
-    }, getQueryHeadersItem(_queryHeaderParams8, 'qp-sharingType-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams9, 'qp-sharingType-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 4, tableSearchForm);
@@ -11619,16 +11804,74 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-saleChannel-in',
+      type: 'treeSelect',
+      label: '销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-refCode-in',
+      type: 'treeSelect',
+      label: '营销区域',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
     }];
-    var _queryHeaderParams9 = getQueryHeadersList({
+    var _queryHeaderParams0 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
-    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams9, 'qp-createOrgCode-eq'))]).then(function (x) {
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/org/listNoPage"), {}, getQueryHeadersItem(_queryHeaderParams0, 'qp-createOrgCode-eq')), loadSelectSource$1("/channel-manage/channelInfo/tree", {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-orgCode-in')), loadSelectSource$1("/channel-manage/tagNode/getTree/10", {
+      'qp-status-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams0, 'qp-orgCode-in'))]).then(function (x) {
       var firstElement = x === null || x === void 0 ? void 0 : x[0];
       var allList = firstElement && [firstElement, firstElement];
       formatSource(allList, 0, 2, tableSearchForm);
       formatSource(allList, 1, 3, tableSearchForm);
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择客户',
@@ -11652,7 +11895,18 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '使用组织',
         dataIndex: 'salesOrgName',
-        defaultSort: 4
+        defaultSort: 4,
+        width: 100
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 6,
+        width: 100
       }]
     }, modalTableBusProps);
   }
@@ -11680,12 +11934,17 @@ function commonFun(type, prefixUrl, parentProps) {
       sourceName: 'code'
     }, requestConfigProp);
     tableSearchForm = [{
-      name: 'qp-name-like',
-      label: '店铺名称'
-    }, {
-      name: 'qp-code-like',
-      label: '店铺编码'
+      name: 'name*multiInput',
+      label: '店铺名称',
+      type: 'multipleQueryInput'
     }, {
+      name: 'code*multiInput',
+      label: '店铺编码',
+      type: 'multipleQueryInput'
+    },
+    // { name: 'qp-name-like', label: '店铺名称' },
+    // { name: 'qp-code-like', label: '店铺编码' },
+    {
       name: 'qp-conglomerateCode-in',
       type: 'select',
       label: '归属集团',
@@ -11786,7 +12045,7 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams10 = getQueryHeadersList({
+    var _queryHeaderParams1 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -11794,21 +12053,21 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '30'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
+    }, getQueryHeadersItem(_queryHeaderParams1, 'qp-conglomerateCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/company"), {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': '20'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-companyCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/platformRecord/getPlatformRecordList"), {
+    }, getQueryHeadersItem(_queryHeaderParams1, 'qp-companyCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/platformRecord/getPlatformRecordList"), {
       // pageSize: 5000,
       // currentPage: 1,
       'qp-status-eq': '1'
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-plateformCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/store"), {
+    }, getQueryHeadersItem(_queryHeaderParams1, 'qp-plateformCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/store"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-mainBrandCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
+    }, getQueryHeadersItem(_queryHeaderParams1, 'qp-mainBrandCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/accountingSubject"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-accountingCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams1, 'qp-accountingCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 3, tableSearchForm);
       formatSource(x, 2, 5, tableSearchForm);
@@ -11874,7 +12133,8 @@ function commonFun(type, prefixUrl, parentProps) {
       mappingTextField: 'name',
       mappingValueField: 'code',
       otherParams: _objectSpread2({
-        sorter: 'desc-id'
+        sorter: 'desc-id',
+        'qp-status-in': 10
       }, (requestConfigProp === null || requestConfigProp === void 0 ? void 0 : requestConfigProp.addOtherParams) || {}),
       sourceName: 'code'
     }, requestConfigProp);
@@ -11891,12 +12151,9 @@ function commonFun(type, prefixUrl, parentProps) {
       type: 'select',
       label: '商店类型',
       initialSource: shopFile2Type
-    }, {
-      name: 'qp-status-in',
-      type: 'select',
-      label: '商店状态',
-      initialSource: shopFile2Status
-    }, {
+    },
+    // { name: 'qp-status-in', type: 'select', label: '商店状态', initialSource: shopFile2Status },
+    {
       name: 'qp-orgCode-in',
       type: 'select',
       label: '所属销售组织',
@@ -11915,8 +12172,90 @@ function commonFun(type, prefixUrl, parentProps) {
           }
         }
       }
+    }, {
+      name: 'qp-channelCode-in',
+      type: 'treeSelect',
+      label: '所属销售渠道',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-commonRelationAreaCode-in',
+      type: 'treeSelect',
+      label: '营销区域',
+      field: {
+        type: 'treeSelect',
+        props: {
+          multiple: true,
+          treeData: [],
+          treeCheckable: false,
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          },
+          showCheckedStrategy: 'TreeSelect.SHOW_ALL'
+        }
+      }
+    }, {
+      name: 'qp-businessType-in',
+      type: 'select',
+      label: '店铺性质',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      },
+      initialSource: getDictionarySource$1('BUSINESS_StoreType')
+    }, {
+      name: "qp-brandCode-in",
+      label: "品牌",
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
     }];
-    var _queryHeaderParams11 = getQueryHeadersList({
+    var _queryHeaderParams10 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -11924,8 +12263,27 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-orgCode-in'))]).then(function (x) {
-      formatSource(x, 0, 4, tableSearchForm);
+    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/channelInfo/tree"), {
+      'qp-status-eq': 10,
+      'qp-isMain-eq': 1,
+      'qp-type-in': '1,2'
+    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/tagNode/getTree/10"), {
+      'qp-status-eq': 1
+    }, getQueryHeadersItem(_queryHeaderParams10, 'qp-orgCode-in')), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+      pageSize: 5000,
+      currentPage: 1,
+      'ctl-withAuth': true
+    }, getQueryHeadersItem(_queryHeaderParams10, 'ctl-withAuth'))]).then(function (x) {
+      var channelDisabledJude = function channelDisabledJude(data) {
+        return data['parentCode'] === '0';
+      }; // 所属销售渠道 树节点不能点判断
+      var areaDisabledJude = function areaDisabledJude(data) {
+        return data['parent'] === '0';
+      }; // 所属营销区域 树节点不能点判断
+      formatSource(x, 0, 3, tableSearchForm);
+      formatTreeDataSource(x, 1, 4, tableSearchForm, ['code', 'name'], 'channelInfoSon', channelDisabledJude);
+      formatTreeDataSource(x, 2, 5, tableSearchForm, ['code', 'name'], 'children', areaDisabledJude);
+      formatSource(x, 3, 7, tableSearchForm, ['brandCode', 'name']);
     });
     modalTableProps = _objectSpread2({
       modalTableTitle: '选择商店',
@@ -11933,19 +12291,23 @@ function commonFun(type, prefixUrl, parentProps) {
       tableColumns: [{
         title: '序号',
         dataIndex: 'keyIndex',
-        defaultSort: 0
+        defaultSort: 0,
+        width: 60
       }, {
         title: '商店编码',
         dataIndex: 'code',
-        defaultSort: 1
+        defaultSort: 1,
+        width: 100
       }, {
         title: '商店名称',
         dataIndex: 'name',
-        defaultSort: 2
+        defaultSort: 2,
+        width: 120
       }, {
         title: '商店类型',
         dataIndex: 'type',
         defaultSort: 3,
+        width: 100,
         render: function render(text) {
           var _shopFile2Type$find;
           return (_shopFile2Type$find = shopFile2Type.find(function (i) {
@@ -11955,6 +12317,7 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '启用状态',
         dataIndex: 'status',
+        width: 80,
         render: function render(text) {
           var _shopFile2Status$find;
           return (_shopFile2Status$find = shopFile2Status.find(function (i) {
@@ -11964,8 +12327,28 @@ function commonFun(type, prefixUrl, parentProps) {
       }, {
         title: '所属销售组织',
         dataIndex: 'orgName',
-        defaultSort: 4
-      }]
+        defaultSort: 4,
+        width: 95
+      }, {
+        title: '所属销售渠道',
+        dataIndex: 'channelName',
+        defaultSort: 5,
+        width: 100
+      }, {
+        title: '营销区域',
+        dataIndex: 'commonRelationAreaName',
+        defaultSort: 6,
+        width: 100
+      }, {
+        title: '店铺性质',
+        dataIndex: 'businessType',
+        defaultSort: 7,
+        render: function render(text) {
+          return getDictionaryTextByValue$1('BUSINESS_StoreType', text);
+        },
+        width: 80
+      }],
+      noEmptySearchField: true
     }, modalTableBusProps);
   }
   // 核算主体选择器（无弹窗）
@@ -12129,7 +12512,7 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-officeTelephone-like',
       label: '手机号'
     }];
-    var _queryHeaderParams12 = getQueryHeadersList({
+    var _queryHeaderParams11 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -12137,7 +12520,7 @@ function commonFun(type, prefixUrl, parentProps) {
       pageSize: 5000,
       currentPage: 1,
       'qp-companyType-eq': 20
-    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-companyCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams11, 'qp-companyCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -12243,16 +12626,16 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-email-like',
       label: '邮箱'
     }, {
-      name: 'qp-officeTelephone-like',
+      name: 'qp-phone-like',
       label: '手机号'
     }]);
-    var _queryHeaderParams13 = getQueryHeadersList({
+    var _queryHeaderParams12 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgViewNode/common/getTreeForOrgViewAndTenant"), {
       'orgViewCode': 'administrative-organization-view'
-    }, getQueryHeadersItem(_queryHeaderParams13, 'qp-code-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams12, 'qp-code-in'))]).then(function (x) {
       formatTreeDataSource(x, 0, 2, tableSearchForm, ['code', 'name']);
     });
     modalTableProps = _objectSpread2({
@@ -12303,7 +12686,7 @@ function commonFun(type, prefixUrl, parentProps) {
         dataIndex: 'email'
       }, {
         title: '手机号',
-        dataIndex: 'officeTelephone',
+        dataIndex: 'phone',
         defaultSort: 4,
         render: function render(text, record) {
           return handleTextOverflow(text || (record === null || record === void 0 ? void 0 : record.phone));
@@ -12399,17 +12782,17 @@ function commonFun(type, prefixUrl, parentProps) {
       name: 'qp-remark-like',
       label: '备注'
     }];
-    var _queryHeaderParams14 = getQueryHeadersList({
+    var _queryHeaderParams13 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/logisCompany"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams14, logisCompanyCodeSingleSearchName)), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/printTemplate"), {
+    }, getQueryHeadersItem(_queryHeaderParams13, logisCompanyCodeSingleSearchName)), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/printTemplate"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams14, 'qp-sheetTemplateCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams13, 'qp-sheetTemplateCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
       formatSource(x, 1, 5, tableSearchForm);
     });
@@ -12579,14 +12962,14 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams15 = getQueryHeadersList({
+    var _queryHeaderParams14 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/permissionCategory"), {
       pageSize: 5000,
       currentPage: 1
-    }, getQueryHeadersItem(_queryHeaderParams15, 'qp-categoryCode-eq'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams14, 'qp-categoryCode-eq'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -12683,7 +13066,7 @@ function commonFun(type, prefixUrl, parentProps) {
         }
       }
     }];
-    var _queryHeaderParams16 = getQueryHeadersList({
+    var _queryHeaderParams15 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
@@ -12691,7 +13074,7 @@ function commonFun(type, prefixUrl, parentProps) {
       'qp-employeeCode-eq': getEmployeeCode(),
       'qp-realOrg-eq': true,
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams16, 'qp-salesOrgCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams15, 'qp-salesOrgCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -12797,13 +13180,13 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       initialSource: nodeType
     }];
-    var _queryHeaderParams17 = getQueryHeadersList({
+    var _queryHeaderParams16 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getOrgViewListNoPage"), {
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams17, 'qp-orgViewCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams16, 'qp-orgViewCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -13129,13 +13512,13 @@ function commonFun(type, prefixUrl, parentProps) {
       },
       initialSource: nodeType
     }];
-    var _queryHeaderParams18 = getQueryHeadersList({
+    var _queryHeaderParams17 = getQueryHeadersList({
       querySelectHeadersList: querySelectHeadersList,
       extralHeaders: extralHeaders
     });
     Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/orgView/getOrgViewListNoPage"), {
       'qp-status-eq': 10
-    }, getQueryHeadersItem(_queryHeaderParams18, 'qp-orgViewCode-in'))]).then(function (x) {
+    }, getQueryHeadersItem(_queryHeaderParams17, 'qp-orgViewCode-in'))]).then(function (x) {
       formatSource(x, 0, 2, tableSearchForm);
     });
     modalTableProps = _objectSpread2({
@@ -14080,9 +14463,9 @@ var AddSpuSelect = function AddSpuSelect(parProps) {
     value = _useState8[0],
     setValue = _useState8[1];
   var _useState9 = React$1.useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    propertyList = _useState10[0],
-    setPropertyList = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    propertyList = _useState0[0],
+    setPropertyList = _useState0[1];
   React$1.useEffect(function () {
     if (parProps === null || parProps === void 0 ? void 0 : parProps.isSingleColor) {
       // type: 1 尺码组; 2 配码组
@@ -14505,7 +14888,7 @@ function getStorageVale(storageKeyString) {
   var _storageKeyString$spl = storageKeyString.split('.'),
     _storageKeyString$spl2 = _toArray(_storageKeyString$spl),
     localstorage = _storageKeyString$spl2[0],
-    restKeyArrays = _storageKeyString$spl2.slice(1);
+    restKeyArrays = _arrayLikeToArray(_storageKeyString$spl2).slice(1);
   var localStorageInfo = window.localStorage.getItem(localstorage);
   if (!restKeyArrays.length) return localStorageInfo;
   var returnVal = JSON.parse(localStorageInfo || '{}');
@@ -14606,46 +14989,45 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     requestUtil.get("".concat(url, "?").concat(querystring.stringify(paramsData)), {
       headers: headers
     }).then(/*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(res) {
         var _ctx$form;
         var resData, coverData, data, dataList;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
             case 0:
               resData = (res === null || res === void 0 ? void 0 : res.data) || [];
               if (!judgeIsRequestSuccess(resData)) {
-                _context.next = 13;
+                _context.n = 4;
                 break;
               }
               data = resData.data;
               if (!remoteSource.converter) {
-                _context.next = 9;
+                _context.n = 2;
                 break;
               }
-              _context.next = 6;
+              _context.n = 1;
               return remoteSource.converter({
                 data: [data]
               });
-            case 6:
-              coverData = _context.sent;
-              _context.next = 11;
+            case 1:
+              coverData = _context.v;
+              _context.n = 3;
               break;
-            case 9:
+            case 2:
               dataList = data && Array.isArray(data) ? data : data && [data] || [];
               coverData = dataList.length && dataList.map(function (ites) {
                 return _mapSearchTree(ites);
               }) || [];
-            case 11:
-              _context.next = 14;
+            case 3:
+              _context.n = 5;
               break;
-            case 13:
+            case 4:
               coverData = [];
-            case 14:
+            case 5:
               setTreeData(coverData);
               ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setFieldSource(ctx.name, coverData);
-            case 16:
-            case "end":
-              return _context.stop();
+            case 6:
+              return _context.a(2);
           }
         }, _callee);
       }));
@@ -17048,7 +17430,9 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
     title = _ref.title,
     pathToRegexp = _ref.pathToRegexp,
     backHistoryPath = _ref.backHistoryPath,
-    onBack = _ref.onBack;
+    onBack = _ref.onBack,
+    tradeType = _ref.tradeType,
+    fromStatus = _ref.fromStatus;
   var _useState3 = React$1.useState(false),
     _useState4 = _slicedToArray(_useState3, 2),
     isFullScreen = _useState4[0],
@@ -17131,14 +17515,50 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
       }
     }
   };
+  var getFlowButtons = function getFlowButtons() {
+    try {
+      return JSON.parse(localStorage.getItem('BUSINESS_FLOW_BUTTONS') || '[]');
+    } catch (e) {
+      return [];
+    }
+  };
+  var filterByFlowRules = function filterByFlowRules(list, ctx) {
+    var _find;
+    var flowList = getFlowButtons();
+    if (!(flowList === null || flowList === void 0 ? void 0 : flowList.length) || typeof ctx.tradeType !== 'number') return list;
+    var entry = flowList.find(function (i) {
+      return (i === null || i === void 0 ? void 0 : i.tradeType) === ctx.tradeType;
+    });
+    if (!entry) return list;
+    var ctrlSet = new Set(((entry === null || entry === void 0 ? void 0 : entry.controlButtons) || []).filter(Boolean));
+    var statButtons = ((_find = ((entry === null || entry === void 0 ? void 0 : entry.config) || []).find(function (c) {
+      return (c === null || c === void 0 ? void 0 : c.fromStatus) === ctx.status;
+    })) === null || _find === void 0 ? void 0 : _find.buttons) || [];
+    var allowedSet = new Set((statButtons || []).filter(Boolean).filter(function (b) {
+      return ctrlSet.size ? ctrlSet.has(b) : true;
+    }));
+    return list.filter(function (ui) {
+      var _ui$props3, _ui$props4;
+      var uiCode = ui.code || ui.buttonCode || (ui === null || ui === void 0 ? void 0 : (_ui$props3 = ui.props) === null || _ui$props3 === void 0 ? void 0 : _ui$props3.code) || (ui === null || ui === void 0 ? void 0 : (_ui$props4 = ui.props) === null || _ui$props4 === void 0 ? void 0 : _ui$props4.buttonCode);
+      if (!uiCode) return true;
+      if (ctrlSet.size && !ctrlSet.has(uiCode)) return true; // 非流程控制按钮不处理
+      return allowedSet.has(uiCode);
+    });
+  };
   var renderPageActionList = function renderPageActionList(actionLists) {
     var _actionLists$;
     var authButton = localStorage.getItem(getMenuAuthDataKey()) ? JSON.parse(localStorage.getItem(getMenuAuthDataKey())) : [];
     var visibleActions = actionLists.filter(function (action) {
-      return (action.visible && action.visible !== 'false' || judgeIsEmpty$1(action.visible)) && (!shouldUseAuth() || judgeIsEmpty$1(action.code) || authButton.filter(function (item) {
+      return (action.visible && action.visible !== 'false' || judgeIsEmpty$1(action.visible)) && (!shouldUseAuth() || judgeIsEmpty$1(action.code) || authButton.some(function (item) {
         return item === action.code;
       }));
     });
+    if (typeof tradeType === 'number') {
+      visibleActions = filterByFlowRules(visibleActions, {
+        tradeType: tradeType,
+        status: fromStatus
+      });
+    }
     var renderButton = function renderButton(item, type) {
       return /*#__PURE__*/React__default['default'].createElement(antd.Button, _objectSpread2({
         type: type || 'primary',
@@ -17251,6 +17671,68 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
   }
   return true;
 });
+var processDetailButtonsVisible = function processDetailButtonsVisible(buttons, params) {
+  var _ref4 = params || {},
+    tradeType = _ref4.tradeType,
+    fromStatus = _ref4.fromStatus;
+  var getFlowButtons = function getFlowButtons() {
+    try {
+      return JSON.parse(localStorage.getItem('BUSINESS_FLOW_BUTTONS') || '[]');
+    } catch (e) {
+      return [];
+    }
+  };
+  var evalVisible = function evalVisible(v, ctx) {
+    if (typeof v === 'string') {
+      var expr = v.replace(/^#\{|\}$/g, '');
+      try {
+        var keys = Object.keys(ctx || {});
+        var vals = keys.map(function (k) {
+          return ctx[k];
+        });
+        // eslint-disable-next-line no-new-func
+        return Function.apply(void 0, keys.concat(["return (".concat(expr, ");")])).apply(void 0, _toConsumableArray(vals));
+      } catch (e) {
+        return true;
+      }
+    }
+    if (v === undefined) return true;
+    return !!v;
+  };
+  var ctrlSet = new Set();
+  var allowedSet = new Set();
+  if (typeof tradeType === 'number') {
+    var flowList = getFlowButtons();
+    var entry = flowList.find(function (i) {
+      return (i === null || i === void 0 ? void 0 : i.tradeType) === tradeType;
+    });
+    if (entry) {
+      var _find2;
+      ctrlSet = new Set(((entry === null || entry === void 0 ? void 0 : entry.controlButtons) || []).filter(Boolean));
+      var statButtons = ((_find2 = ((entry === null || entry === void 0 ? void 0 : entry.config) || []).find(function (c) {
+        return (c === null || c === void 0 ? void 0 : c.fromStatus) === fromStatus;
+      })) === null || _find2 === void 0 ? void 0 : _find2.buttons) || [];
+      allowedSet = new Set((statButtons || []).filter(Boolean).filter(function (b) {
+        return ctrlSet.size ? ctrlSet.has(b) : true;
+      }));
+    }
+  }
+  var processed = (buttons || []).map(function (btn) {
+    var visBase = evalVisible(btn === null || btn === void 0 ? void 0 : btn.visible, params);
+    var vis = visBase;
+    if (typeof tradeType === 'number' && ctrlSet && allowedSet && (btn === null || btn === void 0 ? void 0 : btn.code)) {
+      if (ctrlSet.size === 0 || !ctrlSet.has(btn.code)) {
+        vis = visBase;
+      } else {
+        vis = visBase && allowedSet.has(btn.code);
+      }
+    }
+    return _objectSpread2(_objectSpread2({}, btn), {}, {
+      visible: vis
+    });
+  });
+  return processed;
+};
 
 var css_248z$h = ".bs_home_page_head_wrapper {\n  position: sticky;\n  background: #fff;\n  width: 100%;\n  top: 0px;\n  z-index: 10;\n}\n.home_page_head {\n  display: flex;\n  justify-content: space-between;\n  align-items: center;\n  background-color: #FFFFFF;\n  border-bottom: 1px solid #f0f0f0;\n  padding: 6px 16px 5px;\n  font-weight: 500;\n}\n.home_page_head .home_page_title_wrapper {\n  display: flex;\n  align-items: center;\n  height: 20px;\n  line-height: 20px;\n}\n.home_page_head .home_page_title {\n  font-family: PingFangSC-Medium;\n  font-weight: 600;\n  font-size: 16px;\n  color: #000000;\n  letter-spacing: 0;\n  flex-grow: 1;\n  padding-right: 10px;\n  display: none;\n}\n.home_page_head .ant-breadcrumb {\n  display: block !important;\n}\n.home_page_head .ant-breadcrumb .ant-breadcrumb-separator {\n  margin: 0 2px;\n}\n.home_page_head .ant-breadcrumb li .bread_name {\n  color: #8B8B8B;\n  font-size: 12px;\n  line-height: 16px;\n  cursor: pointer;\n}\n.home_page_head .ant-breadcrumb li .bread_name_last {\n  color: #282828;\n}\n";
 styleInject(css_248z$h);
@@ -17544,6 +18026,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       title: '列首',
       dataIndex: 'fixedLeft',
       render: function render(text, record) {
+        if (_this.props.disableColumnFixed) {
+          return null;
+        }
         return /*#__PURE__*/React__default['default'].createElement("span", {
           onClick: function onClick() {
             var sortDataSource = _this.state.sortDataSource;
@@ -17620,6 +18105,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       title: '列尾',
       dataIndex: 'fixedRight',
       render: function render(text, record) {
+        if (_this.props.disableColumnFixed) {
+          return null;
+        }
         return /*#__PURE__*/React__default['default'].createElement("span", {
           onClick: function onClick() {
             var sortDataSource = _this.state.sortDataSource;
@@ -18869,7 +19357,7 @@ var ResizeableTitle$2 = function ResizeableTitle(props) {
   }, /*#__PURE__*/React__default['default'].createElement("th", _objectSpread2({}, restProps)));
 };
 var BsSulaQueryTable = (function (props) {
-  var _rowsRef$current5, _props$expandable, _sortTableRef$current3, _value$exportConfig6;
+  var _rowsRef$current5, _props$expandable, _sortTableRef$current3, _props$tableProps, _value$exportConfig6;
   var bsTableCode = (props === null || props === void 0 ? void 0 : props.tableCode) || window.location.hash; //设置列字段的唯一标识
   var rowsRef = React$1.useRef(null);
   // 获取 table columns中所有的 key  防止有的地方是 dataindex
@@ -18947,38 +19435,38 @@ var BsSulaQueryTable = (function (props) {
   };
   var refs = React$1.useRef(null);
   var _useState9 = React$1.useState(''),
-    _useState10 = _slicedToArray(_useState9, 2),
-    pagePath = _useState10[0],
-    setPagePath = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    pagePath = _useState0[0],
+    setPagePath = _useState0[1];
   var _useLocation = umi.useLocation(),
     pathname = _useLocation.pathname,
     _useLocation$state = _useLocation.state,
     state = _useLocation$state === void 0 ? {} : _useLocation$state;
-  var _useState11 = React$1.useState(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isFullScreen = _useState12[0],
-    setIsFnllScreen = _useState12[1];
+  var _useState1 = React$1.useState(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    isFullScreen = _useState10[0],
+    setIsFnllScreen = _useState10[1];
   // @ts-nocheck
   var value = props;
   var _props$fields = props.fields,
     fields = _props$fields === void 0 ? [] : _props$fields;
-  var _useState13 = React$1.useState([]),
-    _useState14 = _slicedToArray(_useState13, 2),
-    showColumn = _useState14[0],
-    setShowColumns = _useState14[1]; // 列字段
+  var _useState11 = React$1.useState([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    showColumn = _useState12[0],
+    setShowColumns = _useState12[1]; // 列字段
   var originSearchFields = getSettingFieldOrColumn(getConfigFromlocalstorage(ENUM$1.BROWSER_CACHE.SEARCH_FIELDS_CONDITION), fields, 'searchFields');
-  var _useState15 = React$1.useState(originSearchFields),
+  var _useState13 = React$1.useState(originSearchFields),
+    _useState14 = _slicedToArray(_useState13, 2),
+    showSearchFields = _useState14[0],
+    setShowSearchFields = _useState14[1]; //搜索项字段
+  var _useState15 = React$1.useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    showSearchFields = _useState16[0],
-    setShowSearchFields = _useState16[1]; //搜索项字段
-  var _useState17 = React$1.useState([]),
+    showExportColumn = _useState16[0],
+    setShowExportColumns = _useState16[1]; // 导出列字段
+  var _useState17 = React$1.useState(''),
     _useState18 = _slicedToArray(_useState17, 2),
-    showExportColumn = _useState18[0],
-    setShowExportColumns = _useState18[1]; // 导出列字段
-  var _useState19 = React$1.useState(''),
-    _useState20 = _slicedToArray(_useState19, 2),
-    height = _useState20[0],
-    setHeight = _useState20[1];
+    height = _useState18[0],
+    setHeight = _useState18[1];
   var sortTableRef = React$1.useRef(null);
   var searchTableRef = React$1.useRef(null);
   var exportTableRef = React$1.useRef(null);
@@ -19231,10 +19719,22 @@ var BsSulaQueryTable = (function (props) {
         };
       }
     }, (value === null || value === void 0 ? void 0 : value.tableProps) || {});
-    // @ts-ignore
     if (tableProps === null || tableProps === void 0 ? void 0 : (_tableProps$initialPa = tableProps.initialPaging) === null || _tableProps$initialPa === void 0 ? void 0 : _tableProps$initialPa.pagination) {
-      // @ts-ignore
       tableProps.initialPaging.pagination.showSizeChanger = true;
+      // 分页大小改变时，更新本地存储
+      var onShowSizeChange = function onShowSizeChange(current, size) {
+        var allPaginationData = JSON.parse(localStorage.getItem('paginationData') || "{}");
+        allPaginationData[bsTableCode] = size;
+        localStorage.setItem('paginationData', JSON.stringify(allPaginationData || {}));
+      };
+      tableProps.initialPaging.pagination.onShowSizeChange = onShowSizeChange;
+      // 从本地存储中获取分页大小
+      var pageSize = JSON.parse(localStorage.getItem('paginationData') || "{}")[bsTableCode];
+      if (pageSize) {
+        tableProps.initialPaging.pagination.pageSize = pageSize;
+        tableProps.pageSize = pageSize;
+        tableProps.defaultPageSize = pageSize;
+      }
     }
     return tableProps;
   };
@@ -19319,13 +19819,124 @@ var BsSulaQueryTable = (function (props) {
     if (value.rowSelection) {
       value.rowSelection.columnWidth = 50;
     }
+    if (typeof props.tradeType !== 'number') {
+      return _objectSpread2(_objectSpread2({}, value), {}, {
+        actionsRender: actionsRender
+      });
+    }
+    try {
+      var raw = JSON.parse(localStorage.getItem('BUSINESS_FLOW_BUTTONS') || '[]');
+      var entry = raw.find(function (i) {
+        return (i === null || i === void 0 ? void 0 : i.tradeType) === props.tradeType;
+      });
+      if (entry) {
+        var ctrlSet = new Set(((entry === null || entry === void 0 ? void 0 : entry.controlButtons) || []).filter(Boolean));
+        var allowedTopSet = new Set();
+        ((entry === null || entry === void 0 ? void 0 : entry.config) || []).forEach(function (c) {
+          ((c === null || c === void 0 ? void 0 : c.buttons) || []).filter(Boolean).forEach(function (b) {
+            if (!ctrlSet.size || ctrlSet.has(b)) allowedTopSet.add(b);
+          });
+        });
+        console.debug('[FlowCtrl:top]', {
+          ctrlSize: ctrlSet.size,
+          allowedTopSize: allowedTopSet.size
+        });
+        actionsRender = actionsRender.filter(function (ui) {
+          var code = ui === null || ui === void 0 ? void 0 : ui.code;
+          if (!code) return true;
+          if (ctrlSet.size && !ctrlSet.has(code)) return true; // 非流程控制按钮不处理
+          var keep = allowedTopSet.has(code);
+          if (code) console.debug('[FlowCtrl:top-element]', {
+            code: code,
+            keep: keep
+          });
+          return keep;
+        });
+      }
+    } catch (e) {}
+    var remoteDataSource = value === null || value === void 0 ? void 0 : value.remoteDataSource;
+    if (remoteDataSource) {
+      var _ctrlSet = new Set();
+      var btnStatusMap = new Map();
+      try {
+        var _raw = JSON.parse(localStorage.getItem('BUSINESS_FLOW_BUTTONS') || '[]');
+        var _entry = _raw.find(function (i) {
+          return (i === null || i === void 0 ? void 0 : i.tradeType) === props.tradeType;
+        });
+        if (_entry) {
+          _ctrlSet = new Set(((_entry === null || _entry === void 0 ? void 0 : _entry.controlButtons) || []).filter(Boolean));
+          ((_entry === null || _entry === void 0 ? void 0 : _entry.config) || []).forEach(function (c) {
+            ((c === null || c === void 0 ? void 0 : c.buttons) || []).filter(Boolean).forEach(function (b) {
+              if (!_ctrlSet.size || _ctrlSet.has(b)) {
+                var set = btnStatusMap.get(b) || new Set();
+                set.add(c === null || c === void 0 ? void 0 : c.fromStatus);
+                btnStatusMap.set(b, set);
+              }
+            });
+          });
+        }
+      } catch (e) {}
+      var getByPath = function getByPath(obj, path) {
+        if (!obj || !path) return undefined;
+        var parts = path.split('.');
+        var cur = obj;
+        for (var i = 0; i < parts.length; i++) {
+          var _cur;
+          cur = (_cur = cur) === null || _cur === void 0 ? void 0 : _cur[parts[i]];
+          if (cur === undefined) return undefined;
+        }
+        return cur;
+      };
+      var statusPath = props === null || props === void 0 ? void 0 : props.statusFieldPath;
+      var augment = function augment(result) {
+        if (!btnStatusMap || btnStatusMap.size === 0) return result;
+        if (result && Array.isArray(result.list)) {
+          result.list = result.list.map(function (rec) {
+            var _ref2, _ref3, _ref4, _rec$status;
+            var status = statusPath ? getByPath(rec, statusPath) : (_ref2 = (_ref3 = (_ref4 = (_rec$status = rec === null || rec === void 0 ? void 0 : rec.status) !== null && _rec$status !== void 0 ? _rec$status : rec === null || rec === void 0 ? void 0 : rec.orderStatus) !== null && _ref4 !== void 0 ? _ref4 : rec === null || rec === void 0 ? void 0 : rec.flowStatus) !== null && _ref3 !== void 0 ? _ref3 : rec === null || rec === void 0 ? void 0 : rec.tradeStatus) !== null && _ref2 !== void 0 ? _ref2 : rec === null || rec === void 0 ? void 0 : rec.currentStatus;
+            var map = {};
+            btnStatusMap.forEach(function (set, code) {
+              map[code] = set.has(status) ? true : undefined;
+            });
+            return _objectSpread2(_objectSpread2({}, rec), {}, {
+              __flowAllowedMap: map
+            });
+          });
+        }
+        return result;
+      };
+      if (Array.isArray(remoteDataSource.converter)) {
+        var stages = remoteDataSource.converter;
+        var pipeline = function pipeline(args) {
+          var res = args;
+          for (var i = 0; i < stages.length; i++) {
+            res = stages[i](res);
+          }
+          res = augment(res);
+          return res;
+        };
+        remoteDataSource = _objectSpread2(_objectSpread2({}, remoteDataSource), {}, {
+          converter: pipeline
+        });
+      } else if (typeof remoteDataSource.converter === 'function') {
+        var orig = remoteDataSource.converter;
+        var wrap = function wrap(args) {
+          var res = orig(args);
+          return augment(res);
+        };
+        remoteDataSource = _objectSpread2(_objectSpread2({}, remoteDataSource), {}, {
+          converter: wrap
+        });
+      }
+    }
     return _objectSpread2(_objectSpread2({}, value), {}, {
-      actionsRender: actionsRender
+      actionsRender: actionsRender,
+      remoteDataSource: remoteDataSource
     });
   };
   var handleResize = function handleResize(index) {
-    return function (e, _ref2) {
-      var size = _ref2.size;
+    return function (e, _ref5) {
+      var size = _ref5.size;
       setShowColumns(function (columns) {
         var newColumns = _toConsumableArray(columns);
         newColumns[index] = _objectSpread2(_objectSpread2({}, newColumns[index]), {}, {
@@ -19353,11 +19964,66 @@ var BsSulaQueryTable = (function (props) {
     // 优化一下 减少复杂度
     var titleMap = toMapByKey(value.columns, 'title');
     // 加上排序
+    var hasFlowEntry = typeof props.tradeType === 'number' && function () {
+      try {
+        var raw = JSON.parse(localStorage.getItem('BUSINESS_FLOW_BUTTONS') || '[]');
+        return !!raw.find(function (i) {
+          return (i === null || i === void 0 ? void 0 : i.tradeType) === props.tradeType;
+        });
+      } catch (e) {
+        return false;
+      }
+    }();
+    var hasControlRange = typeof props.tradeType === 'number' && function () {
+      try {
+        var raw = JSON.parse(localStorage.getItem('BUSINESS_FLOW_BUTTONS') || '[]');
+        var entry = raw.find(function (i) {
+          return (i === null || i === void 0 ? void 0 : i.tradeType) === props.tradeType;
+        });
+        if (!entry) return false;
+        var _ctrlSet2 = new Set(((entry === null || entry === void 0 ? void 0 : entry.controlButtons) || []).filter(Boolean));
+        return _ctrlSet2.size > 0;
+      } catch (e) {
+        return false;
+      }
+    }();
+    var toExpr = function toExpr(v) {
+      if (typeof v === 'string') return v.replace(/^#\{|\}$/g, '');
+      if (v === undefined) return 'true';
+      return v ? 'true' : 'false';
+    };
+    // 读取当前 tradeType 的控制范围，用于只在控制按钮上追加流程表达式
+    var ctrlSet = new Set();
+    if (hasFlowEntry) {
+      try {
+        var raw = JSON.parse(localStorage.getItem('BUSINESS_FLOW_BUTTONS') || '[]');
+        var entry = raw.find(function (i) {
+          return (i === null || i === void 0 ? void 0 : i.tradeType) === props.tradeType;
+        });
+        if (entry) ctrlSet = new Set(((entry === null || entry === void 0 ? void 0 : entry.controlButtons) || []).filter(Boolean));
+      } catch (e) {}
+    }
+    var augmentPermissionRender = function augmentPermissionRender(arr, set) {
+      return arr.map(function (el) {
+        var code = el === null || el === void 0 ? void 0 : el.code;
+        if (!code) return el;
+        // 非控制范围按钮不追加流程控制，保持原 visible
+        if (!set || set.size === 0 || !set.has(code)) return el;
+        var base = toExpr(el.visible);
+        var flow = "record.__flowAllowedMap['".concat(code, "'] == true");
+        return _objectSpread2(_objectSpread2({}, el), {}, {
+          visible: "#{(".concat(base, ") && (").concat(flow, ")}")
+        });
+      });
+    };
     var cols = showColumn.map(function (i) {
-      var _titleMap$renderToStr, _titleMap$renderToStr2;
+      var orig = titleMap[renderToString(i.title)] || {};
+      var origRender = orig.render;
+      var isPerm = orig.isPermissionColumn;
+      var newRender = Array.isArray(origRender) && isPerm && hasFlowEntry && hasControlRange ? augmentPermissionRender(origRender, ctrlSet) : origRender;
       return _objectSpread2(_objectSpread2({}, i), {}, {
-        isPermissionColumn: (_titleMap$renderToStr = titleMap[renderToString(i.title)]) === null || _titleMap$renderToStr === void 0 ? void 0 : _titleMap$renderToStr.isPermissionColumn,
-        render: (_titleMap$renderToStr2 = titleMap[renderToString(i.title)]) === null || _titleMap$renderToStr2 === void 0 ? void 0 : _titleMap$renderToStr2.render
+        isPermissionColumn: isPerm,
+        render: newRender
       });
     });
     cols.forEach(function (i) {
@@ -19530,6 +20196,7 @@ var BsSulaQueryTable = (function (props) {
     id: "bs-sula-query-table"
   }, /*#__PURE__*/React__default['default'].createElement(MemoQueryTable, _objectSpread2({}, memoConfig)), /*#__PURE__*/React__default['default'].createElement(SortableTable$1, {
     ref: sortTableRef,
+    disableColumnFixed: (_props$tableProps = props.tableProps) === null || _props$tableProps === void 0 ? void 0 : _props$tableProps.isVirtualTable,
     setShowColumns: setResizeShowColumns,
     showColumn: showColumn,
     setInitialTableInfo: setInitialTableInfo,
@@ -19606,7 +20273,7 @@ var matchPath = function matchPath(pathname) {
     if (!match) return null;
     var _match = _toArray(match),
       url = _match[0],
-      values = _match.slice(1);
+      values = _arrayLikeToArray(_match).slice(1);
     var isExact = pathname === url;
     if (exact && !isExact) return null;
     return {
@@ -20026,22 +20693,19 @@ function outLogin(_x) {
   return _outLogin.apply(this, arguments);
 }
 function _outLogin() {
-  _outLogin = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+  _outLogin = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
     var res;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
-          _context.next = 2;
+          _context.n = 1;
           return requestUtil({
             url: '/user/web/loginOut',
             method: 'GET'
           });
-        case 2:
-          res = _context.sent;
-          return _context.abrupt("return", res);
-        case 4:
-        case "end":
-          return _context.stop();
+        case 1:
+          res = _context.v;
+          return _context.a(2, res);
       }
     }, _callee);
   }));
@@ -20168,20 +20832,20 @@ var GlobalHeaderRight = function GlobalHeaderRight(_ref) {
     });
   };
   var loginOut = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var sessionId;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
-            _context.next = 2;
+            _context.n = 1;
             return getSessionId();
-          case 2:
-            sessionId = _context.sent;
-            _context.next = 5;
+          case 1:
+            sessionId = _context.v;
+            _context.n = 2;
             return outLogin({
               sessionId: sessionId
             });
-          case 5:
+          case 2:
             // @ts-ignore
             if (BUILD_TYPE) {
               antd.message.success('退出登录成功');
@@ -20191,9 +20855,8 @@ var GlobalHeaderRight = function GlobalHeaderRight(_ref) {
             } else {
               setLoginOutPath();
             }
-          case 6:
-          case "end":
-            return _context.stop();
+          case 3:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -20280,18 +20943,15 @@ function getStoreByName(_x) {
   return _getStoreByName.apply(this, arguments);
 }
 function _getStoreByName() {
-  _getStoreByName = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  _getStoreByName = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
-          return _context.abrupt("return", requestUtil({
+          return _context.a(2, requestUtil({
             url: '/store-house/orgViewNode/listNoPage',
             method: 'GET',
             params: _objectSpread2({}, params)
           }));
-        case 1:
-        case "end":
-          return _context.stop();
       }
     }, _callee);
   }));
@@ -20326,33 +20986,33 @@ var ChooseStore = function ChooseStore(props) {
     openSelect = _useState8[0],
     setOpenSelect = _useState8[1];
   var _useState9 = React$1.useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    options = _useState10[0],
-    setOptions = _useState10[1];
-  var _useState11 = React$1.useState([]),
+    _useState0 = _slicedToArray(_useState9, 2),
+    options = _useState0[0],
+    setOptions = _useState0[1];
+  var _useState1 = React$1.useState([]),
+    _useState10 = _slicedToArray(_useState1, 2),
+    rescouse = _useState10[0],
+    setRescouse = _useState10[1];
+  var _useState11 = React$1.useState(''),
     _useState12 = _slicedToArray(_useState11, 2),
-    rescouse = _useState12[0],
-    setRescouse = _useState12[1];
-  var _useState13 = React$1.useState(''),
-    _useState14 = _slicedToArray(_useState13, 2),
-    searchValue = _useState14[0],
-    setSearchValue = _useState14[1];
-  var _useState15 = React$1.useState([{
+    searchValue = _useState12[0],
+    setSearchValue = _useState12[1];
+  var _useState13 = React$1.useState([{
       label: name,
       value: code
     }]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    store = _useState16[0],
-    setStore = _useState16[1];
+    _useState14 = _slicedToArray(_useState13, 2),
+    store = _useState14[0],
+    setStore = _useState14[1];
   function fetchUserList(_x, _x2) {
     return _fetchUserList.apply(this, arguments);
   }
   function _fetchUserList() {
-    _fetchUserList = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(storeName, init) {
-      return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    _fetchUserList = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(storeName, init) {
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
-            return _context3.abrupt("return", getStoreByName({
+            return _context3.a(2, getStoreByName({
               orgName: storeName ? storeName : undefined,
               platCompanyCode: init ? undefined : key,
               'qp-employeeCode-eq': employeeCode || 'EMP231011000002',
@@ -20371,9 +21031,6 @@ var ChooseStore = function ChooseStore(props) {
                 };
               });
             }));
-          case 1:
-          case "end":
-            return _context3.stop();
         }
       }, _callee3);
     }));
@@ -20396,20 +21053,19 @@ var ChooseStore = function ChooseStore(props) {
     return debounce__default['default'](loadOptions, debounceTimeout);
   }, [debounceTimeout, key]);
   var changeInput = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(str) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(str) {
       var res;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
-            _context.next = 2;
+            _context.n = 1;
             return debounceFetcher(str);
-          case 2:
-            res = _context.sent;
+          case 1:
+            res = _context.v;
             setOptions(res);
             setRescouse(res);
-          case 5:
-          case "end":
-            return _context.stop();
+          case 2:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -20418,15 +21074,15 @@ var ChooseStore = function ChooseStore(props) {
     };
   }();
   React$1.useEffect(function () {
-    _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
       var res;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
           case 0:
-            _context2.next = 2;
+            _context2.n = 1;
             return fetchUserList(undefined, true);
-          case 2:
-            res = _context2.sent;
+          case 1:
+            res = _context2.v;
             res.map(function (item, indexNumber) {
               if (item.label === name) {
                 setIndex(indexNumber);
@@ -20442,9 +21098,8 @@ var ChooseStore = function ChooseStore(props) {
             });
             setOptions(res);
             setRescouse(res);
-          case 6:
-          case "end":
-            return _context2.stop();
+          case 2:
+            return _context2.a(2);
         }
       }, _callee2);
     }))();
@@ -21493,25 +22148,25 @@ var DrawContent$1 = function DrawContent(_ref) {
     currentOneLevel = _useState8[0],
     setCurrentOneLevel = _useState8[1];
   var _useState9 = React$1.useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    SearhData = _useState10[0],
-    setSearchMenuData = _useState10[1];
-  var _useState11 = React$1.useState(600),
+    _useState0 = _slicedToArray(_useState9, 2),
+    SearhData = _useState0[0],
+    setSearchMenuData = _useState0[1];
+  var _useState1 = React$1.useState(600),
+    _useState10 = _slicedToArray(_useState1, 2),
+    rightMenuHeight = _useState10[0],
+    setHeight = _useState10[1];
+  var _useState11 = React$1.useState(900),
     _useState12 = _slicedToArray(_useState11, 2),
-    rightMenuHeight = _useState12[0],
-    setHeight = _useState12[1];
-  var _useState13 = React$1.useState(900),
+    drawHeight = _useState12[0],
+    setDrawHeight = _useState12[1];
+  var _useState13 = React$1.useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    drawHeight = _useState14[0],
-    setDrawHeight = _useState14[1];
+    moreBtnShow = _useState14[0],
+    setMoreBtnShow = _useState14[1];
   var _useState15 = React$1.useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    moreBtnShow = _useState16[0],
-    setMoreBtnShow = _useState16[1];
-  var _useState17 = React$1.useState(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    showScroll = _useState18[0],
-    setShowScroll = _useState18[1];
+    showScroll = _useState16[0],
+    setShowScroll = _useState16[1];
   React$1.useEffect(function () {
     var _originRoutes$find;
     getMenuContentHeight();
@@ -23122,14 +23777,11 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         },
         menu: {
           request: function () {
-            var _request = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-              return _regeneratorRuntime().wrap(function _callee$(_context) {
-                while (1) switch (_context.prev = _context.next) {
+            var _request = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+              return _regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
                   case 0:
-                    return _context.abrupt("return", JSON.parse(localStorage.getItem("customerMenu_".concat(itemPath, "_front")) || '[]'));
-                  case 1:
-                  case "end":
-                    return _context.stop();
+                    return _context.a(2, JSON.parse(localStorage.getItem("customerMenu_".concat(itemPath, "_front")) || '[]'));
                 }
               }, _callee);
             }));
@@ -23534,31 +24186,31 @@ var index$6 = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     multiTableData = _useState8[0],
     setMmultiTableData = _useState8[1]; //多表头数据
   var _useState9 = React$1.useState(10),
-    _useState10 = _slicedToArray(_useState9, 2),
-    viewCount = _useState10[0],
-    setViewCount = _useState10[1]; //虚拟表格每次渲染数量
+    _useState0 = _slicedToArray(_useState9, 2),
+    viewCount = _useState0[0],
+    setViewCount = _useState0[1]; //虚拟表格每次渲染数量
   var itemWidth = 100; // 表格每一项宽度
-  var _useState11 = React$1.useState((props === null || props === void 0 ? void 0 : props.colHeaderWidth) || 400),
-    _useState12 = _slicedToArray(_useState11, 2),
-    realColHeaderWidth = _useState12[0],
-    setLeftWidth = _useState12[1];
+  var _useState1 = React$1.useState((props === null || props === void 0 ? void 0 : props.colHeaderWidth) || 400),
+    _useState10 = _slicedToArray(_useState1, 2),
+    realColHeaderWidth = _useState10[0],
+    setLeftWidth = _useState10[1];
   var viewPort = React$1.useRef(null);
   var topScrollBar = React$1.useRef(null);
   var leftTableRef = React$1.useRef(null);
   //起始渲染item
-  var _useState13 = React$1.useState(0),
-    _useState14 = _slicedToArray(_useState13, 2),
-    startIndex = _useState14[0],
-    setStartIndex = _useState14[1];
+  var _useState11 = React$1.useState(0),
+    _useState12 = _slicedToArray(_useState11, 2),
+    startIndex = _useState12[0],
+    setStartIndex = _useState12[1];
   //结束渲染item
   var endIndex = React$1.useMemo(function () {
     return startIndex + viewCount;
   }, [startIndex, viewCount]);
   //表格偏移量
-  var _useState15 = React$1.useState(0),
-    _useState16 = _slicedToArray(_useState15, 2),
-    offsetWidth = _useState16[0],
-    setOffset = _useState16[1];
+  var _useState13 = React$1.useState(0),
+    _useState14 = _slicedToArray(_useState13, 2),
+    offsetWidth = _useState14[0],
+    setOffset = _useState14[1];
   React$1.useEffect(function () {
     setTimeout(function () {
       var realLeftTableWidth = leftTableRef.current.clientWidth;
@@ -30862,11 +31514,11 @@ var valueType = {
 };
 
 var getDynamicDict = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(dictionaryCode) {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(dictionaryCode) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
-          _context.next = 2;
+          _context.n = 1;
           return bssula.request({
             url: "/basic/dictDynamicItem/getDynamicData/".concat(dictionaryCode),
             converter: function converter(_ref2) {
@@ -30879,11 +31531,8 @@ var getDynamicDict = /*#__PURE__*/function () {
               });
             }
           });
-        case 2:
-          return _context.abrupt("return", _context.sent);
-        case 3:
-        case "end":
-          return _context.stop();
+        case 1:
+          return _context.a(2, _context.v);
       }
     }, _callee);
   }));
@@ -30930,12 +31579,12 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
     value: false
   }];
   var ref = React$1.useRef();
-  ahooks.useMount(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _ref$current, source;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  ahooks.useMount(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+    var _ref$current, source, _t, _t2;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
-          _context.next = 2;
+          _context.n = 1;
           return setIsShowAndType(function (prev) {
             if (record.inputType === 20 || record.inputType === 30) {
               return {
@@ -30946,40 +31595,39 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
             }
             return prev;
           });
-        case 2:
+        case 1:
           if (!record.dictionaryCode) {
-            _context.next = 17;
+            _context.n = 7;
             break;
           }
           if (!(record.choiceType == 20)) {
-            _context.next = 7;
+            _context.n = 2;
             break;
           }
-          _context.t0 = getDictionarySource(record.dictionaryCode);
-          _context.next = 15;
+          _t = getDictionarySource(record.dictionaryCode);
+          _context.n = 6;
           break;
-        case 7:
+        case 2:
           if (!(record.choiceType == 30)) {
-            _context.next = 13;
+            _context.n = 4;
             break;
           }
-          _context.next = 10;
+          _context.n = 3;
           return getDynamicDict(record.dictionaryCode);
-        case 10:
-          _context.t1 = _context.sent;
-          _context.next = 14;
+        case 3:
+          _t2 = _context.v;
+          _context.n = 5;
           break;
-        case 13:
-          _context.t1 = [];
-        case 14:
-          _context.t0 = _context.t1;
-        case 15:
-          source = _context.t0;
+        case 4:
+          _t2 = [];
+        case 5:
+          _t = _t2;
+        case 6:
+          source = _t;
           // @ts-ignore
           ref === null || ref === void 0 ? void 0 : (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.setFieldSource('defaultValue', source);
-        case 17:
-        case "end":
-          return _context.stop();
+        case 7:
+          return _context.a(2);
       }
     }, _callee);
   })));
@@ -31044,10 +31692,10 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
           source: {
             relates: ['dictionaryCode', 'dictionaryCode_dynamic', 'choiceType'],
             type: function () {
-              var _type = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref3) {
+              var _type = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(_ref3) {
                 var form, values, name, relates, source;
-                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
+                return _regenerator().w(function (_context2) {
+                  while (1) switch (_context2.n) {
                     case 0:
                       form = _ref3.form, values = _ref3.values, name = _ref3.name, relates = _ref3.relates;
                       if (values[0]) {
@@ -31056,19 +31704,18 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
                         form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], getDictionarySource(values[0]));
                       }
                       if (!values[1]) {
-                        _context2.next = 9;
+                        _context2.n = 2;
                         break;
                       }
-                      _context2.next = 5;
+                      _context2.n = 1;
                       return getDynamicDict(record.dictionaryCode || values[1]);
-                    case 5:
-                      source = _context2.sent;
+                    case 1:
+                      source = _context2.v;
                       form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], []);
                       form === null || form === void 0 ? void 0 : form.setFieldValue(name[0], undefined);
                       form === null || form === void 0 ? void 0 : form.setFieldSource(name[0], source);
-                    case 9:
-                    case "end":
-                      return _context2.stop();
+                    case 2:
+                      return _context2.a(2);
                   }
                 }, _callee2);
               }));
@@ -31524,25 +32171,25 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
         source: {
           relates: ['choiceType', 'inputType'],
           type: function () {
-            var _type2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref10) {
+            var _type2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(_ref0) {
               var values, name, form, source;
-              return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
+              return _regenerator().w(function (_context3) {
+                while (1) switch (_context3.n) {
                   case 0:
-                    values = _ref10.values, name = _ref10.name, form = _ref10.form;
+                    values = _ref0.values, name = _ref0.name, form = _ref0.form;
                     if (values[1] === 40) {
                       form === null || form === void 0 ? void 0 : form.setFieldValue(name, null);
                       form.setFieldVisible(name, false);
                     }
                     if (!(values[0] === 30)) {
-                      _context3.next = 10;
+                      _context3.n = 2;
                       break;
                     }
-                    _context3.next = 5;
+                    _context3.n = 1;
                     return bssula.request({
                       url: '/basic/dictDynamicItem/queryList',
-                      converter: function converter(_ref11) {
-                        var data = _ref11.data;
+                      converter: function converter(_ref1) {
+                        var data = _ref1.data;
                         return data === null || data === void 0 ? void 0 : data.map(function (d) {
                           return {
                             text: d.dictCode,
@@ -31551,17 +32198,16 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
                         });
                       }
                     });
-                  case 5:
-                    source = _context3.sent;
+                  case 1:
+                    source = _context3.v;
                     form === null || form === void 0 ? void 0 : form.setFieldSource(name, source);
                     form.setFieldVisible(name, true);
-                    _context3.next = 11;
+                    _context3.n = 3;
                     break;
-                  case 10:
+                  case 2:
                     form.setFieldVisible(name, false);
-                  case 11:
-                  case "end":
-                    return _context3.stop();
+                  case 3:
+                    return _context3.a(2);
                 }
               }, _callee3);
             }));
@@ -31576,8 +32222,8 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
       name: 'enumeration',
       label: '维护自定义选项',
       field: {
-        type: function type(_ref12) {
-          var form = _ref12.form;
+        type: function type(_ref10) {
+          var form = _ref10.form;
           return /*#__PURE__*/React__default['default'].createElement(antd.Button, {
             type: 'link',
             onClick: function onClick() {
@@ -31603,10 +32249,10 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
       dependency: {
         source: {
           relates: ['choiceType'],
-          type: function type(_ref13) {
-            var values = _ref13.values,
-              name = _ref13.name,
-              form = _ref13.form;
+          type: function type(_ref11) {
+            var values = _ref11.values,
+              name = _ref11.name,
+              form = _ref11.form;
             if (values[0] === 10) {
               form.setFieldVisible(name, true);
             } else {
@@ -31622,10 +32268,10 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
       dependency: {
         visible: {
           relates: ['choiceType'],
-          type: function type(_ref14) {
-            var name = _ref14.name,
-              values = _ref14.values,
-              form = _ref14.form;
+          type: function type(_ref12) {
+            var name = _ref12.name,
+              values = _ref12.values,
+              form = _ref12.form;
             if (values[0] == 330) {
               form.setFieldVisible(name, true);
             } else {
@@ -31649,8 +32295,8 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
         params: {
           'qp-businessType-eq': record.businessType
         },
-        converter: function converter(_ref15) {
-          var data = _ref15.data;
+        converter: function converter(_ref13) {
+          var data = _ref13.data;
           return (data === null || data === void 0 ? void 0 : data.map(function (d) {
             return {
               text: d.name,
@@ -31690,8 +32336,8 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
           'qp-businessType-eq': record.businessType,
           'qp-status-eq': 1
         },
-        converter: function converter(_ref16) {
-          var data = _ref16.data;
+        converter: function converter(_ref14) {
+          var data = _ref14.data;
           return (data === null || data === void 0 ? void 0 : data.map(function (d) {
             var _d$code;
             return {
@@ -31719,8 +32365,8 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
       remoteSource: {
         url: lineDetail.moduleType == 1 ? "/basic/planModelField/listNoPage?qp-modelCode-eq=".concat(lineDetail === null || lineDetail === void 0 ? void 0 : lineDetail.moduleRelationId) : "/basic/flow/businessField/metaFieldMapping?metaEntityCode=".concat(lineDetail === null || lineDetail === void 0 ? void 0 : lineDetail.moduleRelationId, "&fieldMapping=").concat(record === null || record === void 0 ? void 0 : record.fieldMapping),
         method: 'get',
-        converter: function converter(_ref17) {
-          var data = _ref17.data;
+        converter: function converter(_ref15) {
+          var data = _ref15.data;
           if (lineDetail.moduleType == 1) {
             return (data === null || data === void 0 ? void 0 : data.map(function (d) {
               return {
@@ -31746,16 +32392,16 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
     width: 900,
     maskClosable: false,
     onOk: function () {
-      var _onOk = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _onOk = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
         var _ref$current4, _res$editableStatus;
         var res, _res$defaultValue;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
             case 0:
-              _context4.next = 2;
+              _context4.n = 1;
               return ref === null || ref === void 0 ? void 0 : (_ref$current4 = ref.current) === null || _ref$current4 === void 0 ? void 0 : _ref$current4.validateFields();
-            case 2:
-              res = _context4.sent;
+            case 1:
+              res = _context4.v;
               res.editableStatus = (_res$editableStatus = res.editableStatus) === null || _res$editableStatus === void 0 ? void 0 : _res$editableStatus.join(',');
               res.fieldGroup = record.fieldGroup;
               res.businessType = record.businessType;
@@ -31782,7 +32428,7 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
               delete res.formula;
               delete res.showValue;
               if (!(mode === 'create')) {
-                _context4.next = 18;
+                _context4.n = 2;
                 break;
               }
               bssula.request({
@@ -31794,8 +32440,8 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
                   onParentOk();
                 }
               });
-              return _context4.abrupt("return");
-            case 18:
+              return _context4.a(2);
+            case 2:
               bssula.request({
                 url: "/basic/flow/businessField/".concat(record.id),
                 method: 'PATCH',
@@ -31805,9 +32451,8 @@ var FieldsModifyModal = function FieldsModifyModal(props) {
                   onParentOk();
                 }
               });
-            case 19:
-            case "end":
-              return _context4.stop();
+            case 3:
+              return _context4.a(2);
           }
         }, _callee4);
       }));
@@ -32263,21 +32908,21 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
     jsonEditorVal = _useState8[0],
     setJsonEditorVal = _useState8[1];
   var _useState9 = React$1.useState({}),
-    _useState10 = _slicedToArray(_useState9, 2),
-    moduleParams = _useState10[0],
-    setModuleParams = _useState10[1];
-  var _useState11 = React$1.useState('main'),
+    _useState0 = _slicedToArray(_useState9, 2),
+    moduleParams = _useState0[0],
+    setModuleParams = _useState0[1];
+  var _useState1 = React$1.useState('main'),
+    _useState10 = _slicedToArray(_useState1, 2),
+    activeKey = _useState10[0],
+    setActiveKey = _useState10[1]; //默认详情页配置
+  var _useState11 = React$1.useState({}),
     _useState12 = _slicedToArray(_useState11, 2),
-    activeKey = _useState12[0],
-    setActiveKey = _useState12[1]; //默认详情页配置
-  var _useState13 = React$1.useState({}),
+    tablesConfigParams = _useState12[0],
+    setTablesConfigParams = _useState12[1];
+  var _useState13 = React$1.useState([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    tablesConfigParams = _useState14[0],
-    setTablesConfigParams = _useState14[1];
-  var _useState15 = React$1.useState([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    tableJsonEditorValsArr = _useState16[0],
-    setTableJsonEditorValsArr = _useState16[1];
+    tableJsonEditorValsArr = _useState14[0],
+    setTableJsonEditorValsArr = _useState14[1];
   React$1.useEffect(function () {
     Promise.all([requestUtil.get("/basic/flow/businessFieldGroup/one?moduleType=2&layoutPoint=".concat(pageType))]).then(function (_ref2) {
       var _ref3 = _slicedToArray(_ref2, 1),
@@ -32308,7 +32953,7 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
     });
     Promise.all(axiosArr).then(function (_ref5) {
       var _ref6 = _toArray(_ref5),
-        resArr = _ref6.slice(0);
+        resArr = _arrayLikeToArray(_ref6).slice(0);
       var configParams = {};
       detailTablesSetting.map(function (item, index) {
         var _resArr$index;
@@ -32653,11 +33298,11 @@ function getMetaData(_x) {
 
 // 获取数据
 function _getMetaData() {
-  _getMetaData = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(id) {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  _getMetaData = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(id) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
-          return _context.abrupt("return", new Promise(function (resolve, reject) {
+          return _context.a(2, new Promise(function (resolve, reject) {
             umi.request('/basic/entityProperty/listNoPage', {
               params: {
                 'qp-entityId-eq': id
@@ -32669,9 +33314,6 @@ function _getMetaData() {
               reject([]);
             });
           }));
-        case 1:
-        case "end":
-          return _context.stop();
       }
     }, _callee);
   }));
@@ -32875,11 +33517,11 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
     tableState = _useState4[0],
     setTableState = _useState4[1];
   var handleOpen = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var _props$customSelector, _props$customSelector2, _props$ctx4, _props$value, _props$value$map, _props$ctx5, _props$ctx5$form, _props$selectProps;
       var requestConfigNew, metaDataId, metaData, realMetaData, columns, fields, initValue, _queryTableRef$curren, _queryTableRef$curren2, _queryTableRef$curren3;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
             requestConfigNew = assembleRequest(props.customSelectorConfig, {
               isSearchForm: props.isSearchForm,
@@ -32887,16 +33529,16 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
               searchFormData: searchFormData
             });
             if (requestConfigNew) {
-              _context.next = 3;
+              _context.n = 1;
               break;
             }
-            return _context.abrupt("return");
-          case 3:
+            return _context.a(2);
+          case 1:
             metaDataId = (_props$customSelector = props.customSelectorConfig) === null || _props$customSelector === void 0 ? void 0 : (_props$customSelector2 = _props$customSelector.targetMetaData) === null || _props$customSelector2 === void 0 ? void 0 : _props$customSelector2.id;
-            _context.next = 6;
+            _context.n = 2;
             return getMetaData(metaDataId);
-          case 6:
-            metaData = _context.sent;
+          case 2:
+            metaData = _context.v;
             realMetaData = (metaData === null || metaData === void 0 ? void 0 : metaData.filter(function (item) {
               return (item === null || item === void 0 ? void 0 : item.inputType) != 1;
             })) || [];
@@ -32936,9 +33578,8 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
               // @ts-ignore
               queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren = queryTableRef.current) === null || _queryTableRef$curren === void 0 ? void 0 : (_queryTableRef$curren2 = _queryTableRef$curren.tableRef) === null || _queryTableRef$curren2 === void 0 ? void 0 : (_queryTableRef$curren3 = _queryTableRef$curren2.current) === null || _queryTableRef$curren3 === void 0 ? void 0 : _queryTableRef$curren3.bsSetSelectInfo(initValue);
             }
-          case 14:
-          case "end":
-            return _context.stop();
+          case 3:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -33041,7 +33682,7 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
   }, [requestConfig, tableState.columns]);
   var rowKey = (_ref3 = (_fieldMappingItem$cod = fieldMappingItem === null || fieldMappingItem === void 0 ? void 0 : fieldMappingItem.codeMappingFrom) !== null && _fieldMappingItem$cod !== void 0 ? _fieldMappingItem$cod : 'id') !== null && _ref3 !== void 0 ? _ref3 : 'code';
   var handleOk = function handleOk(rowData) {
-    var _props$selectProps2, _props$customSelector6, _props$customSelector7, _queryTableRef$curren13, _queryTableRef$curren14, _queryTableRef$curren15;
+    var _props$selectProps2, _props$customSelector6, _props$customSelector7, _queryTableRef$curren11, _queryTableRef$curren12, _queryTableRef$curren13;
     var setSource = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     //多选数据处理
     if (props === null || props === void 0 ? void 0 : (_props$selectProps2 = props.selectProps) === null || _props$selectProps2 === void 0 ? void 0 : _props$selectProps2.multipleForQuery) {
@@ -33052,9 +33693,9 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
       var selectedRows = (queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren7 = queryTableRef.current) === null || _queryTableRef$curren7 === void 0 ? void 0 : (_queryTableRef$curren8 = _queryTableRef$curren7.tableRef) === null || _queryTableRef$curren8 === void 0 ? void 0 : (_queryTableRef$curren9 = _queryTableRef$curren8.current) === null || _queryTableRef$curren9 === void 0 ? void 0 : _queryTableRef$curren9.getSelectedRows()) || [];
       var realSelectedRows = selectedRows;
       if (!rowData && (selectedKesys === null || selectedKesys === void 0 ? void 0 : selectedKesys.length) !== (selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length)) {
-        var _queryTableRef$curren10, _queryTableRef$curren11, _queryTableRef$curren12;
+        var _queryTableRef$curren0, _queryTableRef$curren1, _queryTableRef$curren10;
         // @ts-ignore
-        var dataSource = (queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren10 = queryTableRef.current) === null || _queryTableRef$curren10 === void 0 ? void 0 : (_queryTableRef$curren11 = _queryTableRef$curren10.tableRef) === null || _queryTableRef$curren11 === void 0 ? void 0 : (_queryTableRef$curren12 = _queryTableRef$curren11.current) === null || _queryTableRef$curren12 === void 0 ? void 0 : _queryTableRef$curren12.getDataSource()) || [];
+        var dataSource = (queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren0 = queryTableRef.current) === null || _queryTableRef$curren0 === void 0 ? void 0 : (_queryTableRef$curren1 = _queryTableRef$curren0.tableRef) === null || _queryTableRef$curren1 === void 0 ? void 0 : (_queryTableRef$curren10 = _queryTableRef$curren1.current) === null || _queryTableRef$curren10 === void 0 ? void 0 : _queryTableRef$curren10.getDataSource()) || [];
         realSelectedRows = dataSource === null || dataSource === void 0 ? void 0 : dataSource.filter(function (s) {
           return selectedKesys.includes(s[rowKey]);
         });
@@ -33087,10 +33728,10 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
       });
     }
     mappings.map(function (item) {
-      var _props$customSelector10, _props$customSelector11, _props$customSelector12, _props$customSelector13;
-      if (((_props$customSelector10 = props.customSelectorConfig) === null || _props$customSelector10 === void 0 ? void 0 : (_props$customSelector11 = _props$customSelector10.extraData) === null || _props$customSelector11 === void 0 ? void 0 : _props$customSelector11.echoLabel) && item.codeMappingTo === prop && rowData[(_props$customSelector12 = props.customSelectorConfig) === null || _props$customSelector12 === void 0 ? void 0 : (_props$customSelector13 = _props$customSelector12.extraData) === null || _props$customSelector13 === void 0 ? void 0 : _props$customSelector13.echoLabel]) {
-        var _props$customSelector14, _props$customSelector15;
-        values["".concat(item.codeMappingTo, "Name")] = rowData[(_props$customSelector14 = props.customSelectorConfig) === null || _props$customSelector14 === void 0 ? void 0 : (_props$customSelector15 = _props$customSelector14.extraData) === null || _props$customSelector15 === void 0 ? void 0 : _props$customSelector15.echoLabel];
+      var _props$customSelector0, _props$customSelector1, _props$customSelector10, _props$customSelector11;
+      if (((_props$customSelector0 = props.customSelectorConfig) === null || _props$customSelector0 === void 0 ? void 0 : (_props$customSelector1 = _props$customSelector0.extraData) === null || _props$customSelector1 === void 0 ? void 0 : _props$customSelector1.echoLabel) && item.codeMappingTo === prop && rowData[(_props$customSelector10 = props.customSelectorConfig) === null || _props$customSelector10 === void 0 ? void 0 : (_props$customSelector11 = _props$customSelector10.extraData) === null || _props$customSelector11 === void 0 ? void 0 : _props$customSelector11.echoLabel]) {
+        var _props$customSelector12, _props$customSelector13;
+        values["".concat(item.codeMappingTo, "Name")] = rowData[(_props$customSelector12 = props.customSelectorConfig) === null || _props$customSelector12 === void 0 ? void 0 : (_props$customSelector13 = _props$customSelector12.extraData) === null || _props$customSelector13 === void 0 ? void 0 : _props$customSelector13.echoLabel];
       }
       values[item.codeMappingTo] = rowData[item.codeMappingFrom];
     });
@@ -33145,10 +33786,10 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
     }
     props.onCancel();
     //@ts-ignore
-    queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren13 = queryTableRef.current) === null || _queryTableRef$curren13 === void 0 ? void 0 : (_queryTableRef$curren14 = _queryTableRef$curren13.tableRef) === null || _queryTableRef$curren14 === void 0 ? void 0 : (_queryTableRef$curren15 = _queryTableRef$curren14.current) === null || _queryTableRef$curren15 === void 0 ? void 0 : _queryTableRef$curren15.clearRowSelection();
+    queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren11 = queryTableRef.current) === null || _queryTableRef$curren11 === void 0 ? void 0 : (_queryTableRef$curren12 = _queryTableRef$curren11.tableRef) === null || _queryTableRef$curren12 === void 0 ? void 0 : (_queryTableRef$curren13 = _queryTableRef$curren12.current) === null || _queryTableRef$curren13 === void 0 ? void 0 : _queryTableRef$curren13.clearRowSelection();
   };
   var config = React$1.useMemo(function () {
-    var _props$selectProps3, _props$ctx9, _props$value2, _props$ctx10, _props$ctx10$form;
+    var _props$selectProps3, _props$ctx9, _props$value2, _props$ctx0, _props$ctx0$form;
     var returnConfig = {
       size: 'small',
       needPageHeader: false,
@@ -33157,7 +33798,7 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
       rowSelection: (props === null || props === void 0 ? void 0 : (_props$selectProps3 = props.selectProps) === null || _props$selectProps3 === void 0 ? void 0 : _props$selectProps3.multipleForQuery) && !isView ? {
         selectedRowKeys: !(props === null || props === void 0 ? void 0 : (_props$ctx9 = props.ctx) === null || _props$ctx9 === void 0 ? void 0 : _props$ctx9.form) && (props === null || props === void 0 ? void 0 : (_props$value2 = props.value) === null || _props$value2 === void 0 ? void 0 : _props$value2.map(function (v) {
           return v.key || v;
-        })) || (props === null || props === void 0 ? void 0 : (_props$ctx10 = props.ctx) === null || _props$ctx10 === void 0 ? void 0 : (_props$ctx10$form = _props$ctx10.form) === null || _props$ctx10$form === void 0 ? void 0 : _props$ctx10$form.getFieldValue(props.id))
+        })) || (props === null || props === void 0 ? void 0 : (_props$ctx0 = props.ctx) === null || _props$ctx0 === void 0 ? void 0 : (_props$ctx0$form = _props$ctx0.form) === null || _props$ctx0$form === void 0 ? void 0 : _props$ctx0$form.getFieldValue(props.id))
       } : false,
       remoteDataSource: remoteDataSource,
       fields: tableState.fields,
@@ -33165,8 +33806,8 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
       rowKey: rowKey,
       tableProps: !isView && {
         rowClassName: function rowClassName(record) {
-          var _props$ctx11, _props$value3, _props$ctx12, _props$ctx12$form;
-          return record[rowKey] == (!(props === null || props === void 0 ? void 0 : (_props$ctx11 = props.ctx) === null || _props$ctx11 === void 0 ? void 0 : _props$ctx11.form) && ((props === null || props === void 0 ? void 0 : (_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.key) || (props === null || props === void 0 ? void 0 : props.value)) || (props === null || props === void 0 ? void 0 : (_props$ctx12 = props.ctx) === null || _props$ctx12 === void 0 ? void 0 : (_props$ctx12$form = _props$ctx12.form) === null || _props$ctx12$form === void 0 ? void 0 : _props$ctx12$form.getFieldValue(props.id))) ? 'tableSelectedRow' : '';
+          var _props$ctx1, _props$value3, _props$ctx10, _props$ctx10$form;
+          return record[rowKey] == (!(props === null || props === void 0 ? void 0 : (_props$ctx1 = props.ctx) === null || _props$ctx1 === void 0 ? void 0 : _props$ctx1.form) && ((props === null || props === void 0 ? void 0 : (_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.key) || (props === null || props === void 0 ? void 0 : props.value)) || (props === null || props === void 0 ? void 0 : (_props$ctx10 = props.ctx) === null || _props$ctx10 === void 0 ? void 0 : (_props$ctx10$form = _props$ctx10.form) === null || _props$ctx10$form === void 0 ? void 0 : _props$ctx10$form.getFieldValue(props.id))) ? 'tableSelectedRow' : '';
         },
         onRow: function onRow(record) {
           return {
@@ -33211,10 +33852,10 @@ var CustomSelectorModal = /*#__PURE__*/React$1.forwardRef(function (props, ref)
   }, "\u63D0\u4EA4"), /*#__PURE__*/React__default['default'].createElement(antd.Button, {
     type: "default",
     onClick: function onClick() {
-      var _queryTableRef$curren16, _queryTableRef$curren17, _queryTableRef$curren18;
+      var _queryTableRef$curren14, _queryTableRef$curren15, _queryTableRef$curren16;
       props.onCancel();
       //@ts-ignore
-      queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren16 = queryTableRef.current) === null || _queryTableRef$curren16 === void 0 ? void 0 : (_queryTableRef$curren17 = _queryTableRef$curren16.tableRef) === null || _queryTableRef$curren17 === void 0 ? void 0 : (_queryTableRef$curren18 = _queryTableRef$curren17.current) === null || _queryTableRef$curren18 === void 0 ? void 0 : _queryTableRef$curren18.clearRowSelection();
+      queryTableRef === null || queryTableRef === void 0 ? void 0 : (_queryTableRef$curren14 = queryTableRef.current) === null || _queryTableRef$curren14 === void 0 ? void 0 : (_queryTableRef$curren15 = _queryTableRef$curren14.tableRef) === null || _queryTableRef$curren15 === void 0 ? void 0 : (_queryTableRef$curren16 = _queryTableRef$curren15.current) === null || _queryTableRef$curren16 === void 0 ? void 0 : _queryTableRef$curren16.clearRowSelection();
     }
   }, "\u53D6\u6D88"))));
 });
@@ -33438,19 +34079,19 @@ var BsCascader = function BsCascader(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     handSource = _useState2[0],
     setHandSource = _useState2[1];
-  React$1.useEffect(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  React$1.useEffect(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
     var resData, data;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
           if (!(!source && initRequestSource)) {
-            _context.next = 6;
+            _context.n = 2;
             break;
           }
-          _context.next = 3;
+          _context.n = 1;
           return initRequestSource();
-        case 3:
-          resData = _context.sent;
+        case 1:
+          resData = _context.v;
           data = (resData === null || resData === void 0 ? void 0 : resData.map(function (item) {
             return _objectSpread2(_objectSpread2({}, item), {}, {
               label: item.text,
@@ -33458,9 +34099,8 @@ var BsCascader = function BsCascader(_ref) {
             });
           })) || [];
           setHandSource(data);
-        case 6:
-        case "end":
-          return _context.stop();
+        case 2:
+          return _context.a(2);
       }
     }, _callee);
   })), []);
@@ -33590,20 +34230,17 @@ function getRegularThresholdRange(_x) {
   return _getRegularThresholdRange.apply(this, arguments);
 }
 function _getRegularThresholdRange() {
-  _getRegularThresholdRange = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  _getRegularThresholdRange = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(params) {
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
         case 0:
-          return _context.abrupt("return", requestUtil({
+          return _context.a(2, requestUtil({
             url: "/basic/regularThresholdRange/getVals/".concat(params.queryIdentify),
             method: 'POST',
             data: _objectSpread2(_objectSpread2({}, params), {}, {
               queryIdentify: undefined
             })
           }));
-        case 1:
-        case "end":
-          return _context.stop();
       }
     }, _callee);
   }));
@@ -33744,24 +34381,24 @@ var RuleField = /*#__PURE__*/function (_Component) {
     };
     //规则对象属性枚举值查询处理 queryIdentify有值是表示该属性有枚举选择
     _this.getRegularThresholdRange = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(queryIdentify, propertyCode, queryIdentifyType) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(queryIdentify, propertyCode, queryIdentifyType) {
         var thresholdQuery, extraRequestUrl, querParams, needQueryList, res;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+        return _regenerator().w(function (_context) {
+          while (1) switch (_context.n) {
             case 0:
               if (queryIdentify) {
-                _context.next = 2;
+                _context.n = 1;
                 break;
               }
-              return _context.abrupt("return");
-            case 2:
+              return _context.a(2);
+            case 1:
               thresholdQuery = _this.state.thresholdQuery;
               extraRequestUrl = '';
               querParams = setParams(propertyCode, thresholdQuery);
               if (!queryIdentityInfo.find(function (item) {
                 return item.identity == propertyCode;
               })) {
-                _context.next = 10;
+                _context.n = 3;
                 break;
               }
               //判断查询属性枚举时有没有必传参数，如果必传参数没有值则不调用查询接口
@@ -33775,15 +34412,15 @@ var RuleField = /*#__PURE__*/function (_Component) {
               if (!needQueryList.some(function (item) {
                 return !querParams[item] || !querParams[item].length;
               })) {
-                _context.next = 9;
+                _context.n = 2;
                 break;
               }
-              return _context.abrupt("return");
-            case 9:
+              return _context.a(2);
+            case 2:
               extraRequestUrl = queryIdentityInfo.find(function (item) {
                 return item.identity == propertyCode;
               }).requestUrl || '';
-            case 10:
+            case 3:
               if (queryIdentifyType === 'dictCodeIdentify') {
                 extraRequestUrl = "bscDictItem/selectDictItemsByDictCode"; // 字典接口
                 querParams = {
@@ -33794,7 +34431,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 // querParams = { dictCode: queryIdentify }
               }
               if (!extraRequestUrl) {
-                _context.next = 16;
+                _context.n = 4;
                 break;
               }
               if (queryIdentify == 'maintain_area_code') {
@@ -33833,43 +34470,42 @@ var RuleField = /*#__PURE__*/function (_Component) {
                   return handleData;
                 }
               });
-              _context.next = 29;
+              _context.n = 8;
               break;
-            case 16:
+            case 4:
               if (!(queryIdentifyType == 'objectPropertyListIdentify')) {
-                _context.next = 20;
+                _context.n = 5;
                 break;
               }
               _this.setState({
                 thresholdList: queryIdentify
               });
-              _context.next = 29;
+              _context.n = 8;
               break;
-            case 20:
+            case 5:
               if (!(queryIdentifyType == 'objectPropertyCodeIdentify')) {
-                _context.next = 24;
+                _context.n = 6;
                 break;
               }
               // TODO待处理
               _this.setState({
                 thresholdList: []
               });
-              _context.next = 29;
+              _context.n = 8;
               break;
-            case 24:
+            case 6:
               querParams.queryIdentify = queryIdentify;
-              _context.next = 27;
+              _context.n = 7;
               return getRegularThresholdRange(querParams);
-            case 27:
-              res = _context.sent;
+            case 7:
+              res = _context.v;
               if (handleError(res)) {
                 _this.setState({
                   thresholdList: (res === null || res === void 0 ? void 0 : res.data) || []
                 });
               }
-            case 29:
-            case "end":
-              return _context.stop();
+            case 8:
+              return _context.a(2);
           }
         }, _callee);
       }));
@@ -34701,11 +35337,11 @@ var RuleField = /*#__PURE__*/function (_Component) {
               isAll: true,
               needNameAndCode: true,
               notChangeOnSelect: true,
-              initRequestSource: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-                return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-                  while (1) switch (_context2.prev = _context2.next) {
+              initRequestSource: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+                return _regenerator().w(function (_context2) {
+                  while (1) switch (_context2.n) {
                     case 0:
-                      _context2.next = 2;
+                      _context2.n = 1;
                       return bssula.request({
                         url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
                         method: 'get',
@@ -34722,11 +35358,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
                           return handleData;
                         }
                       });
-                    case 2:
-                      return _context2.abrupt("return", _context2.sent);
-                    case 3:
-                    case "end":
-                      return _context2.stop();
+                    case 1:
+                      return _context2.a(2, _context2.v);
                   }
                 }, _callee2);
               })),
@@ -34750,11 +35383,11 @@ var RuleField = /*#__PURE__*/function (_Component) {
               isAll: true,
               needNameAndCode: true,
               notChangeOnSelect: true,
-              initRequestSource: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-                return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-                  while (1) switch (_context3.prev = _context3.next) {
+              initRequestSource: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+                return _regenerator().w(function (_context3) {
+                  while (1) switch (_context3.n) {
                     case 0:
-                      _context3.next = 2;
+                      _context3.n = 1;
                       return bssula.request({
                         url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
                         method: 'get',
@@ -34771,11 +35404,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
                           return handleData;
                         }
                       });
-                    case 2:
-                      return _context3.abrupt("return", _context3.sent);
-                    case 3:
-                    case "end":
-                      return _context3.stop();
+                    case 1:
+                      return _context3.a(2, _context3.v);
                   }
                 }, _callee3);
               })),
@@ -34801,11 +35431,11 @@ var RuleField = /*#__PURE__*/function (_Component) {
               isAll: true,
               needNameAndCode: true,
               notChangeOnSelect: true,
-              initRequestSource: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-                return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-                  while (1) switch (_context4.prev = _context4.next) {
+              initRequestSource: /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4() {
+                return _regenerator().w(function (_context4) {
+                  while (1) switch (_context4.n) {
                     case 0:
-                      _context4.next = 2;
+                      _context4.n = 1;
                       return bssula.request({
                         url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
                         method: 'get',
@@ -34822,11 +35452,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
                           return handleData;
                         }
                       });
-                    case 2:
-                      return _context4.abrupt("return", _context4.sent);
-                    case 3:
-                    case "end":
-                      return _context4.stop();
+                    case 1:
+                      return _context4.a(2, _context4.v);
                   }
                 }, _callee4);
               })),
@@ -35513,8 +36140,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values10;
-            var _currentValue9 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values10 = values) === null || _values10 === void 0 ? void 0 : _values10.map(function (s, vIndex) {
+            var _values0;
+            var _currentValue9 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values0 = values) === null || _values0 === void 0 ? void 0 : _values0.map(function (s, vIndex) {
               return {
                 key: s,
                 label: valueNames[vIndex],
@@ -35724,7 +36351,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
           }
         }
         // 配送方式选择器
-        if (dataChoiceBusinessType == 310) {
+        if (dataChoiceBusinessType == 310 || dataChoiceBusinessType == 311) {
           if (INTERVAL_TYPE.indexOf(selectOperation) > -1) {
             return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
               selectBusinessType: "deliveryMode",
@@ -35738,9 +36365,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
               disabled: disabled,
               labelInValue: true,
               value: values[0],
-              requestConfig: {
+              requestConfig: _objectSpread2(_objectSpread2({}, dataChoiceBusinessType === 311 ? {
+                otherParams: {
+                  // 配送方式只选择标准配送方式
+                  'qp-recordChannnelCode-eq': 80
+                }
+              } : {}), {}, {
                 filterInit: 'qp-code-in'
-              },
+              }),
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[0] = value.map(function (i) {
@@ -35770,9 +36402,14 @@ var RuleField = /*#__PURE__*/function (_Component) {
               disabled: disabled,
               labelInValue: true,
               value: values[1],
-              requestConfig: {
+              requestConfig: _objectSpread2(_objectSpread2({}, dataChoiceBusinessType === 311 ? {
+                otherParams: {
+                  // 配送方式只选择标准配送方式
+                  'qp-recordChannnelCode-eq': 80
+                }
+              } : {}), {}, {
                 filterInit: 'qp-code-in'
-              },
+              }),
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12) {
                   values[1] = value.map(function (i) {
@@ -35792,8 +36429,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values11;
-            var _currentValue10 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values11 = values) === null || _values11 === void 0 ? void 0 : _values11.map(function (s, vIndex) {
+            var _values1;
+            var _currentValue0 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values1 = values) === null || _values1 === void 0 ? void 0 : _values1.map(function (s, vIndex) {
               return {
                 key: s,
                 label: valueNames[vIndex],
@@ -35815,10 +36452,15 @@ var RuleField = /*#__PURE__*/function (_Component) {
               } : {}),
               disabled: disabled,
               labelInValue: true,
-              value: _currentValue10,
-              requestConfig: {
+              value: _currentValue0,
+              requestConfig: _objectSpread2(_objectSpread2({}, dataChoiceBusinessType === 311 ? {
+                otherParams: {
+                  // 配送方式只选择标准配送方式
+                  'qp-recordChannnelCode-eq': 80
+                }
+              } : {}), {}, {
                 filterInit: 'qp-code-in'
-              },
+              }),
               onChange: function onChange(value) {
                 if (dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1) {
                   values = value.map(function (i) {
@@ -35908,8 +36550,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values12;
-            var _currentValue11 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values12 = values) === null || _values12 === void 0 ? void 0 : _values12.map(function (s, vIndex) {
+            var _values10;
+            var _currentValue1 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values10 = values) === null || _values10 === void 0 ? void 0 : _values10.map(function (s, vIndex) {
               return {
                 key: s,
                 label: valueNames[vIndex],
@@ -35931,7 +36573,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
               } : {}),
               disabled: disabled,
               labelInValue: true,
-              value: _currentValue11,
+              value: _currentValue1,
               requestConfig: {
                 filterInit: 'qp-code-in'
               },
@@ -36024,8 +36666,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values13;
-            var _currentValue12 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values13 = values) === null || _values13 === void 0 ? void 0 : _values13.map(function (s, vIndex) {
+            var _values11;
+            var _currentValue10 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values11 = values) === null || _values11 === void 0 ? void 0 : _values11.map(function (s, vIndex) {
               return {
                 key: s,
                 label: valueNames[vIndex],
@@ -36047,7 +36689,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
               } : {}),
               disabled: disabled,
               labelInValue: true,
-              value: _currentValue12,
+              value: _currentValue10,
               requestConfig: {
                 filterInit: 'qp-brandCode-in'
               },
@@ -36238,8 +36880,8 @@ var RuleField = /*#__PURE__*/function (_Component) {
               }
             }));
           } else {
-            var _values14;
-            var _currentValue13 = dataInputBusinessType === 12 ? ((_values14 = values) === null || _values14 === void 0 ? void 0 : _values14.map(function (s, vIndex) {
+            var _values12;
+            var _currentValue11 = dataInputBusinessType === 12 ? ((_values12 = values) === null || _values12 === void 0 ? void 0 : _values12.map(function (s, vIndex) {
               return {
                 key: s,
                 label: valueNames[vIndex]
@@ -36267,7 +36909,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
               isSearchForm: true,
               customSelectorConfig: (others === null || others === void 0 ? void 0 : others.customSelectorConfig) || {},
               disabled: disabled,
-              value: _currentValue13,
+              value: _currentValue11,
               onChange: function onChange(value, sourceList) {
                 if (dataInputBusinessType === 12) {
                   var _value$map3, _sourceList$filter3;
@@ -36587,9 +37229,9 @@ var App$1 = function App(_ref) {
     UpdateState(res);
   };
   var _useState9 = React$1.useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    isModalVisible = _useState10[0],
-    setIsModalVisible = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    isModalVisible = _useState0[0],
+    setIsModalVisible = _useState0[1];
   var showModal = function showModal() {
     setIsModalVisible(true);
   };
@@ -37070,27 +37712,26 @@ function RenderCompItem(props) {
     dictData = _useState2[0],
     setDictData = _useState2[1];
   var getDictData = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var _data$map;
       var data;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
-            _context.next = 2;
+            _context.n = 1;
             return bssula.request({
               url: "/basic/bscDictItem/allItemList?qp-code-eq=".concat(ites.dictionaryCode)
             });
-          case 2:
-            data = _context.sent;
+          case 1:
+            data = _context.v;
             setDictData(data === null || data === void 0 ? void 0 : (_data$map = data.map) === null || _data$map === void 0 ? void 0 : _data$map.call(data, function (item) {
               return {
                 text: item.dictItemName,
                 value: item.dictItemCode
               };
             }));
-          case 4:
-          case "end":
-            return _context.stop();
+          case 2:
+            return _context.a(2);
         }
       }, _callee);
     }));
@@ -37331,11 +37972,11 @@ function RenderCompItem(props) {
     needNameAndCode: true,
     notChangeOnSelect: true,
     initRequestSource: function () {
-      var _initRequestSource = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
+      var _initRequestSource = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+        return _regenerator().w(function (_context2) {
+          while (1) switch (_context2.n) {
             case 0:
-              _context2.next = 2;
+              _context2.n = 1;
               return bssula.request({
                 url: '/basic/bscArea/getBscAreaList?qp-level-eq=1&qp-pid-eq=100000',
                 method: 'get',
@@ -37353,11 +37994,8 @@ function RenderCompItem(props) {
                   return handleData;
                 }
               });
-            case 2:
-              return _context2.abrupt("return", _context2.sent);
-            case 3:
-            case "end":
-              return _context2.stop();
+            case 1:
+              return _context2.a(2, _context2.v);
           }
         }, _callee2);
       }));
@@ -37522,7 +38160,7 @@ function RenderCompItem(props) {
     getPopupContainer: function getPopupContainer() {
       return document.body;
     }
-  })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 310 && (/*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
+  })) || null, ((ites === null || ites === void 0 ? void 0 : ites.inputType) === 20 || (ites === null || ites === void 0 ? void 0 : ites.inputType) === 30) && ((ites === null || ites === void 0 ? void 0 : ites.choiceType) === 310 || (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 311) && (/*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
     selectBusinessType: "deliveryMode",
     selectProps: _objectSpread2({
       style: styleCommon,
@@ -37534,9 +38172,14 @@ function RenderCompItem(props) {
     disabled: disabled,
     labelInValue: true,
     value: showValue(ites.code),
-    requestConfig: {
+    requestConfig: _objectSpread2(_objectSpread2({}, (ites === null || ites === void 0 ? void 0 : ites.choiceType) === 311 ? {
+      otherParams: {
+        // 配送方式只选择标准配送方式
+        'qp-recordChannnelCode-eq': 80
+      }
+    } : {}), {}, {
       filterInit: 'qp-code-in'
-    },
+    }),
     onChange: function onChange(value) {
       handleEdit(ites.code, value);
     },
@@ -38147,7 +38790,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           display: 'flex',
           marginBottom: '0px',
           padding: '10px 0px'
-        }
+        },
+        key: itemDetail.elementId
       }, /*#__PURE__*/React__default['default'].createElement("div", {
         className: 'logical_operate_content',
         style: {
@@ -39407,13 +40051,13 @@ var BaseRule = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     ruleTypeData = _useState8[0],
     setRuleTypeData = _useState8[1];
   var _useState9 = React$1.useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    ruleReturnConfig = _useState10[0],
-    setRuleReturnConfig = _useState10[1];
-  var _useState11 = React$1.useState({}),
-    _useState12 = _slicedToArray(_useState11, 2),
-    templateData = _useState12[0],
-    setTemplateData = _useState12[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    ruleReturnConfig = _useState0[0],
+    setRuleReturnConfig = _useState0[1];
+  var _useState1 = React$1.useState({}),
+    _useState10 = _slicedToArray(_useState1, 2),
+    templateData = _useState10[0],
+    setTemplateData = _useState10[1];
   var loadRuleReturnConfig = function loadRuleReturnConfig(currentSceneId) {
     bssula.request({
       url: "/basic/ruleTemplate/".concat(currentSceneId),
@@ -39749,25 +40393,25 @@ var index$7 = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     regularDataList = _useState8[0],
     setRegularDataList = _useState8[1];
   var _useState9 = React$1.useState([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    baseRuleDetailList = _useState10[0],
-    setBaseRuleDetailList = _useState10[1]; // 规则实例详情集合
-  var _useState11 = React$1.useState([]),
+    _useState0 = _slicedToArray(_useState9, 2),
+    baseRuleDetailList = _useState0[0],
+    setBaseRuleDetailList = _useState0[1]; // 规则实例详情集合
+  var _useState1 = React$1.useState([]),
+    _useState10 = _slicedToArray(_useState1, 2),
+    systemVariableList = _useState10[0],
+    setSystemVariableList = _useState10[1];
+  var _useState11 = React$1.useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    systemVariableList = _useState12[0],
-    setSystemVariableList = _useState12[1];
+    isGetDefRuleDataRes = _useState12[0],
+    setIsGetDefRuleDataRes = _useState12[1]; // 为了在回显的时候辨别异步查询是否已完成，防止提前认为为新增设置了模板数据，导致再渲染编辑时候 输入框defaultValue不再渲染问题
   var _useState13 = React$1.useState(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    isGetDefRuleDataRes = _useState14[0],
-    setIsGetDefRuleDataRes = _useState14[1]; // 为了在回显的时候辨别异步查询是否已完成，防止提前认为为新增设置了模板数据，导致再渲染编辑时候 输入框defaultValue不再渲染问题
+    isGetRuleDataRes = _useState14[0],
+    setIsGetRuleDataRes = _useState14[1];
   var _useState15 = React$1.useState(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    isGetRuleDataRes = _useState16[0],
-    setIsGetRuleDataRes = _useState16[1];
-  var _useState17 = React$1.useState(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    groupOtherPriorityList = _useState18[0],
-    setGroupOtherPriorityList = _useState18[1];
+    groupOtherPriorityList = _useState16[0],
+    setGroupOtherPriorityList = _useState16[1];
   var baseRuleRef = React$1.useRef();
   var currentSceneName = (datail === null || datail === void 0 ? void 0 : datail.name) || '';
   // 查询规则组下所有规则实例
@@ -40091,6 +40735,85 @@ var ParagraphCopier = function ParagraphCopier(props) {
   }, children));
 };
 
+//操作日志
+var SystemLog = function SystemLog(_ref) {
+  var modeType = _ref.modeType,
+    code = _ref.code,
+    containerName = _ref.containerName,
+    _ref$renderLogRef = _ref.renderLogRef,
+    renderLogRef = _ref$renderLogRef === void 0 ? {} : _ref$renderLogRef,
+    _ref$extraParams = _ref.extraParams,
+    extraParams = _ref$extraParams === void 0 ? {} : _ref$extraParams;
+  return _objectSpread2(_objectSpread2({}, formContainerAndItemLayout('table', '操作日志', containerName)), {}, {
+    initialVisible: modeType != 'create',
+    fields: [{
+      name: 'table',
+      label: false,
+      itemLayout: {
+        span: 24,
+        labelCol: {
+          span: 0
+        },
+        wrapperCol: {
+          span: 24
+        }
+      },
+      field: function field(ctx) {
+        return code && /*#__PURE__*/React__default['default'].createElement(bssula.Table, {
+          remoteDataSource: {
+            url: "/oms-ops/logInfo?qp-businessCode-eq=".concat(code),
+            convertParams: function convertParams(_ref2) {
+              var params = _ref2.params;
+              return _objectSpread2({
+                pageSize: params.pageSize,
+                currentPage: params.current
+              }, extraParams);
+            },
+            converter: function converter(_ref3) {
+              var data = _ref3.data;
+              return _objectSpread2({}, handleConvertResponse(data.list, data.total || data.totalCount));
+            }
+          },
+          columns: [{
+            title: '操作人',
+            dataIndex: 'handlerName'
+          }, {
+            title: '操作名称',
+            dataIndex: 'handlerType'
+          }, {
+            title: '操作时间',
+            dataIndex: 'handlerTime',
+            render: function render(_ref4) {
+              var text = _ref4.text;
+              return handleCommonTimeRender$1(text);
+            }
+          }, {
+            title: '操作内容',
+            dataIndex: 'logcontent'
+          }],
+          style: {
+            width: '100%',
+            marginTop: '-16px',
+            padding: '0px'
+          },
+          rowKey: "id",
+          scroll: {
+            x: 'max-content'
+          },
+          pagination: {
+            showTotal: function showTotal(total) {
+              return "\u5171 ".concat(total, " \u6761");
+            },
+            showQuickJumper: true,
+            hideOnSinglePage: true
+          },
+          ref: renderLogRef
+        });
+      }
+    }]
+  });
+};
+
 exports.AddSelect = AddSelect;
 exports.AddSkcSelect = AddSkcSelect;
 exports.AddSkuSelect = AddSkuSelect;
@@ -40123,12 +40846,14 @@ exports.ParagraphCopier = ParagraphCopier;
 exports.PropertySelector = PropertySelector;
 exports.QueryMutipleInput = QueryMutipleInput;
 exports.QueryMutipleSearchSelect = QueryMutipleSearchSelect;
+exports.RenderCompItem = RenderCompItem;
 exports.RuleComponent = RuleObjectComponent;
 exports.RuleSetter = index$7;
 exports.SearchSelect = SearchSelect;
 exports.Section = Section;
 exports.StateFlow = index$2;
 exports.SulaColumnSettingTable = ColumnSettingSulaTable;
+exports.SystemLog = SystemLog;
 exports.TableColumnSetting = TableColumnSetting;
 exports.TreeSearchSelect = TreeSearchSelect;
 exports.authFunc = authFunc;
@@ -40138,6 +40863,7 @@ exports.coverToParallel = _coverToParallel;
 exports.createUniqID = createUniqID;
 exports.downloadExcel = downloadExcel;
 exports.ergodicMenuRoutes = ergodicMenuRoutes;
+exports.formContainerAndItemLayout = formContainerAndItemLayout;
 exports.formatter = _formatter;
 exports.getAccountID = getAccountID;
 exports.getAccountId = getAccountId;
@@ -40198,6 +40924,7 @@ exports.noEmptyArray = noEmptyArray;
 exports.paramsControl = paramsControl;
 exports.parseWidth = parseWidth;
 exports.precisionQuantity = precisionQuantity;
+exports.processDetailButtonsVisible = processDetailButtonsVisible;
 exports.randomString = randomString;
 exports.readerXlsxToList = readerXlsxToList;
 exports.removeCurrentTenantId = removeCurrentTenantId;