@kmkf-fe-packages/basic-components 2.0.53 → 2.0.54-beta.0

package/dist/index.esm.js

@@ -1,372 +1,386 @@
 import React, { useRef, useState, useEffect, forwardRef, useImperativeHandle, useMemo, useCallback } from 'react';
-import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate, Form, Popover, Table, Tabs, ConfigProvider, Pagination, Typography } from 'antd';
+import { Cascader, DatePicker, InputNumber, Input, Select, Upload, Image, message, Radio, Space, Spin, Modal, Button, Checkbox, Row, Col, Slider, Rate, Form, Popover, Table, Tabs, ConfigProvider, Pagination, Typography, Skeleton } from 'antd';
 import { EyeOutlined, DeleteOutlined, CloseOutlined, CopyOutlined, CloseCircleOutlined, CaretUpOutlined, MinusCircleFilled } from '@ant-design/icons';
 import request, { extend as extend$1 } from 'umi-request';
 import { CopyToClipboard } from 'react-copy-to-clipboard';
 import { AddressData, BsAddressData, WdtAddressData, GyAddressData, request as request$1, ExpressData, uuid, columnsGoodsList, LogisticsAddressData, SendDataCenter, BS_E3_BOOLEAN_STATUS_MAP, isNull, filterWdtOrders, WDT_ORDER_TYPE_MAP, filterBsE3Orders, filterGyOrders, GY_DELIVERY_STATE_MAPPING, servers, filterJstOrders, filterKmOrders, getIsPlatformCodesIncludeOrderNos, BS_SYSTEM_ORDER_CONFIG, KM_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, updateWdtGoodsHandle, updateBsE3GoodsHandle, updateGyGoodsHandle, updateJstGoodsHandle, jstMergeIdenticalGoods, msgTypeCh, pushGyLog } from '@kmkf-fe-packages/kmkf-utils';
-import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
+import { debounce, isNaN as isNaN$1, isNumber as isNumber$1, cloneDeep, difference, differenceWith, isEqual, takeRight, reject, isEmpty, intersection, uniqBy } from 'lodash';
 import { useUpdateEffect, useDebounceEffect, useAntdTable } from 'ahooks';
 import zhCN from 'antd/lib/locale/zh_CN';
 import pubsub from 'pubsub-js';
 import BigNumber from 'bignumber.js';
 
-function _iterableToArrayLimit(arr, i) {
-  var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"];
-  if (null != _i) {
-    var _s,
-      _e,
-      _x,
-      _r,
-      _arr = [],
-      _n = !0,
-      _d = !1;
+function _iterableToArrayLimit(r, l) {
+  var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
+  if (null != t) {
+    var e,
+      n,
+      i,
+      u,
+      a = [],
+      f = !0,
+      o = !1;
     try {
-      if (_x = (_i = _i.call(arr)).next, 0 === i) {
-        if (Object(_i) !== _i) return;
-        _n = !1;
-      } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0);
-    } catch (err) {
-      _d = !0, _e = err;
+      if (i = (t = t.call(r)).next, 0 === l) {
+        if (Object(t) !== t) return;
+        f = !1;
+      } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0);
+    } catch (r) {
+      o = !0, n = r;
     } finally {
       try {
-        if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return;
+        if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return;
       } finally {
-        if (_d) throw _e;
+        if (o) throw n;
       }
     }
-    return _arr;
+    return a;
   }
 }
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
+function ownKeys(e, r) {
+  var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
   }
-  return keys;
-}
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+  return t;
+}
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
     });
   }
-  return target;
+  return e;
 }
 function _regeneratorRuntime() {
   _regeneratorRuntime = function () {
-    return exports;
+    return e;
   };
-  var exports = {},
-    Op = Object.prototype,
-    hasOwn = Op.hasOwnProperty,
-    defineProperty = Object.defineProperty || function (obj, key, desc) {
-      obj[key] = desc.value;
+  var t,
+    e = {},
+    r = Object.prototype,
+    n = r.hasOwnProperty,
+    o = Object.defineProperty || function (t, e, r) {
+      t[e] = r.value;
     },
-    $Symbol = "function" == typeof Symbol ? Symbol : {},
-    iteratorSymbol = $Symbol.iterator || "@@iterator",
-    asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator",
-    toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag";
-  function define(obj, key, value) {
-    return Object.defineProperty(obj, key, {
-      value: 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
-    }), obj[key];
+    }), t[e];
   }
   try {
     define({}, "");
-  } catch (err) {
-    define = function (obj, key, value) {
-      return obj[key] = value;
+  } catch (t) {
+    define = function (t, e, r) {
+      return t[e] = r;
     };
   }
-  function wrap(innerFn, outerFn, self, tryLocsList) {
-    var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator,
-      generator = Object.create(protoGenerator.prototype),
-      context = new Context(tryLocsList || []);
-    return defineProperty(generator, "_invoke", {
-      value: makeInvokeMethod(innerFn, self, context)
-    }), generator;
+  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(fn, obj, arg) {
+  function tryCatch(t, e, r) {
     try {
       return {
         type: "normal",
-        arg: fn.call(obj, arg)
+        arg: t.call(e, r)
       };
-    } catch (err) {
+    } catch (t) {
       return {
         type: "throw",
-        arg: err
+        arg: t
       };
     }
   }
-  exports.wrap = wrap;
-  var ContinueSentinel = {};
+  e.wrap = wrap;
+  var h = "suspendedStart",
+    l = "suspendedYield",
+    f = "executing",
+    s = "completed",
+    y = {};
   function Generator() {}
   function GeneratorFunction() {}
   function GeneratorFunctionPrototype() {}
-  var IteratorPrototype = {};
-  define(IteratorPrototype, iteratorSymbol, function () {
+  var p = {};
+  define(p, a, function () {
     return this;
   });
-  var getProto = Object.getPrototypeOf,
-    NativeIteratorPrototype = getProto && getProto(getProto(values([])));
-  NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype);
-  var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype);
-  function defineIteratorMethods(prototype) {
-    ["next", "throw", "return"].forEach(function (method) {
-      define(prototype, method, function (arg) {
-        return this._invoke(method, arg);
+  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(generator, PromiseImpl) {
-    function invoke(method, arg, resolve, reject) {
-      var record = tryCatch(generator[method], generator, arg);
-      if ("throw" !== record.type) {
-        var result = record.arg,
-          value = result.value;
-        return value && "object" == typeof value && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) {
-          invoke("next", value, resolve, reject);
-        }, function (err) {
-          invoke("throw", err, resolve, reject);
-        }) : PromiseImpl.resolve(value).then(function (unwrapped) {
-          result.value = unwrapped, resolve(result);
-        }, function (error) {
-          return invoke("throw", error, resolve, reject);
+  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);
         });
       }
-      reject(record.arg);
+      a(c.arg);
     }
-    var previousPromise;
-    defineProperty(this, "_invoke", {
-      value: function (method, arg) {
+    var r;
+    o(this, "_invoke", {
+      value: function (t, n) {
         function callInvokeWithMethodAndArg() {
-          return new PromiseImpl(function (resolve, reject) {
-            invoke(method, arg, resolve, reject);
+          return new e(function (e, r) {
+            invoke(t, n, e, r);
           });
         }
-        return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
+        return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg();
       }
     });
   }
-  function makeInvokeMethod(innerFn, self, context) {
-    var state = "suspendedStart";
-    return function (method, arg) {
-      if ("executing" === state) throw new Error("Generator is already running");
-      if ("completed" === state) {
-        if ("throw" === method) throw arg;
-        return doneResult();
+  function makeInvokeMethod(e, r, n) {
+    var o = h;
+    return function (i, a) {
+      if (o === f) throw new Error("Generator is already running");
+      if (o === s) {
+        if ("throw" === i) throw a;
+        return {
+          value: t,
+          done: !0
+        };
       }
-      for (context.method = method, context.arg = arg;;) {
-        var delegate = context.delegate;
-        if (delegate) {
-          var delegateResult = maybeInvokeDelegate(delegate, context);
-          if (delegateResult) {
-            if (delegateResult === ContinueSentinel) continue;
-            return delegateResult;
+      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" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) {
-          if ("suspendedStart" === state) throw state = "completed", context.arg;
-          context.dispatchException(context.arg);
-        } else "return" === context.method && context.abrupt("return", context.arg);
-        state = "executing";
-        var record = tryCatch(innerFn, self, context);
-        if ("normal" === record.type) {
-          if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue;
+        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: record.arg,
-            done: context.done
+            value: p.arg,
+            done: n.done
           };
         }
-        "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg);
+        "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg);
       }
     };
   }
-  function maybeInvokeDelegate(delegate, context) {
-    var methodName = context.method,
-      method = delegate.iterator[methodName];
-    if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel;
-    var record = tryCatch(method, delegate.iterator, context.arg);
-    if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel;
-    var info = record.arg;
-    return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel);
+  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(locs) {
-    var entry = {
-      tryLoc: locs[0]
+  function pushTryEntry(t) {
+    var e = {
+      tryLoc: t[0]
     };
-    1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry);
+    1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e);
   }
-  function resetTryEntry(entry) {
-    var record = entry.completion || {};
-    record.type = "normal", delete record.arg, entry.completion = record;
+  function resetTryEntry(t) {
+    var e = t.completion || {};
+    e.type = "normal", delete e.arg, t.completion = e;
   }
-  function Context(tryLocsList) {
+  function Context(t) {
     this.tryEntries = [{
       tryLoc: "root"
-    }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0);
+    }], t.forEach(pushTryEntry, this), this.reset(!0);
   }
-  function values(iterable) {
-    if (iterable) {
-      var iteratorMethod = iterable[iteratorSymbol];
-      if (iteratorMethod) return iteratorMethod.call(iterable);
-      if ("function" == typeof iterable.next) return iterable;
-      if (!isNaN(iterable.length)) {
-        var i = -1,
-          next = function next() {
-            for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next;
-            return next.value = undefined, next.done = !0, next;
+  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 next.next = next;
+        return i.next = i;
       }
     }
-    return {
-      next: doneResult
-    };
-  }
-  function doneResult() {
-    return {
-      value: undefined,
-      done: !0
-    };
+    throw new TypeError(typeof e + " is not iterable");
   }
-  return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", {
+  return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", {
     value: GeneratorFunctionPrototype,
     configurable: !0
-  }), defineProperty(GeneratorFunctionPrototype, "constructor", {
+  }), o(GeneratorFunctionPrototype, "constructor", {
     value: GeneratorFunction,
     configurable: !0
-  }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) {
-    var ctor = "function" == typeof genFun && genFun.constructor;
-    return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name));
-  }, exports.mark = function (genFun) {
-    return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun;
-  }, exports.awrap = function (arg) {
+  }), 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) {
     return {
-      __await: arg
+      __await: t
     };
-  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () {
+  }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () {
     return this;
-  }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) {
-    void 0 === PromiseImpl && (PromiseImpl = Promise);
-    var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl);
-    return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) {
-      return result.done ? result.value : iter.next();
+  }), 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(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () {
+  }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () {
     return this;
-  }), define(Gp, "toString", function () {
+  }), define(g, "toString", function () {
     return "[object Generator]";
-  }), exports.keys = function (val) {
-    var object = Object(val),
-      keys = [];
-    for (var key in object) keys.push(key);
-    return keys.reverse(), function next() {
-      for (; keys.length;) {
-        var key = keys.pop();
-        if (key in object) return next.value = key, next.done = !1, next;
+  }), 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;
     };
-  }, exports.values = values, Context.prototype = {
+  }, e.values = values, Context.prototype = {
     constructor: Context,
-    reset: function (skipTempReset) {
-      if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined);
+    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 rootRecord = this.tryEntries[0].completion;
-      if ("throw" === rootRecord.type) throw rootRecord.arg;
+      var t = this.tryEntries[0].completion;
+      if ("throw" === t.type) throw t.arg;
       return this.rval;
     },
-    dispatchException: function (exception) {
-      if (this.done) throw exception;
-      var context = this;
-      function handle(loc, caught) {
-        return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught;
+    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 i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i],
-          record = entry.completion;
-        if ("root" === entry.tryLoc) return handle("end");
-        if (entry.tryLoc <= this.prev) {
-          var hasCatch = hasOwn.call(entry, "catchLoc"),
-            hasFinally = hasOwn.call(entry, "finallyLoc");
-          if (hasCatch && hasFinally) {
-            if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
-            if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
-          } else if (hasCatch) {
-            if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0);
+      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 (!hasFinally) throw new Error("try statement without catch or finally");
-            if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc);
+            if (!u) throw new Error("try statement without catch or finally");
+            if (this.prev < i.finallyLoc) return handle(i.finallyLoc);
           }
         }
       }
     },
-    abrupt: function (type, arg) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) {
-          var finallyEntry = entry;
+    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;
         }
       }
-      finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null);
-      var record = finallyEntry ? finallyEntry.completion : {};
-      return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record);
+      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 (record, afterLoc) {
-      if ("throw" === record.type) throw record.arg;
-      return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel;
+    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 (finallyLoc) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel;
+    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 (tryLoc) {
-      for (var i = this.tryEntries.length - 1; i >= 0; --i) {
-        var entry = this.tryEntries[i];
-        if (entry.tryLoc === tryLoc) {
-          var record = entry.completion;
-          if ("throw" === record.type) {
-            var thrown = record.arg;
-            resetTryEntry(entry);
+    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 thrown;
+          return o;
         }
       }
       throw new Error("illegal catch attempt");
     },
-    delegateYield: function (iterable, resultName, nextLoc) {
+    delegateYield: function (e, r, n) {
       return this.delegate = {
-        iterator: values(iterable),
-        resultName: resultName,
-        nextLoc: nextLoc
-      }, "next" === this.method && (this.arg = undefined), ContinueSentinel;
-    }
-  }, exports;
+        iterator: values(e),
+        resultName: r,
+        nextLoc: n
+      }, "next" === this.method && (this.arg = t), y;
+    }
+  }, e;
+}
+function _toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : String(i);
 }
-function _typeof(obj) {
+function _typeof(o) {
   "@babel/helpers - typeof";
 
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) {
-    return typeof obj;
-  } : function (obj) {
-    return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
-  }, _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) {
+    return typeof o;
+  } : function (o) {
+    return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o;
+  }, _typeof(o);
 }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
   try {
@@ -473,20 +487,6 @@ function _nonIterableSpread() {
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _toPrimitive(input, hint) {
-  if (typeof input !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if (typeof res !== "object") return res;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (hint === "string" ? String : Number)(input);
-}
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, "string");
-  return typeof key === "symbol" ? key : String(key);
-}
 
 function ApaasCascader(props) {
   return /*#__PURE__*/React.createElement(Cascader, _objectSpread2({
@@ -12191,53 +12191,145 @@ var GoodsModal$1 = function GoodsModal(props, ref) {
 };
 var GoodsModal$2 = /*#__PURE__*/forwardRef(GoodsModal$1);
 
-var getTableData = function getTableData(_ref, formData) {
-  var _formData$brandIds;
-  var current = _ref.current,
-    pageSize = _ref.pageSize;
-  var data = {
-    brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
-    skuCode: formData.skuCode || null,
-    skuName: formData.skuName || null,
-    goodName: formData.goodName || null,
-    goodNo: formData.goodNo || null
-  };
-  return extendRequest('/qy/gdfw/product/product/page', {
-    method: 'post',
-    data: _objectSpread2({
-      pageSize: pageSize,
-      pageNo: current,
-      platform: 'WDT_ERP'
-    }, data)
-  }).then(function (res) {
-    var _res$data = res.data,
-      _res$data$productSkuL = _res$data.productSkuList,
-      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
-      _res$data$total = _res$data.total,
-      total = _res$data$total === void 0 ? 0 : _res$data$total;
-    var newProducts = productSkuList.map(function (item, index) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        index: index + 1
-      });
-    });
-    return {
-      total: total,
-      list: newProducts
-    };
-  });
-};
-var columns$1 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("div", {
+var gyColumns = [{
+  dataIndex: 'specName',
+  title: 'SKU名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'specNo',
+  title: 'SKU编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 250
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodPicUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
       style: {
-        width: 25
-      }
-    }, index + 1);
-  },
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u6807\u51C6\u552E\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  ellipsis: true,
   width: 100
+}];
+
+var jstColumns = [{
+  dataIndex: 'goodName',
+  title: '商品名称',
+  width: 250,
+  ellipsis: true
+}, {
+  dataIndex: 'goodNo',
+  title: '商品编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'styleCode',
+  title: '款式编码',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'propertiesValue',
+  title: '规格值',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'goodPicUrl',
+  title: '商品图片',
+  width: 100,
+  render: function render(picUrl) {
+    return /*#__PURE__*/React.createElement("img", {
+      style: {
+        width: '40px',
+        height: '40px',
+        objectFit: 'contain'
+      },
+      src: picUrl
+    });
+  }
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 250
+}, {
+  dataIndex: 'brandName',
+  title: '品牌名称',
+  width: 200,
+  ellipsis: true
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u9500\u552E\u4EF7\u683C",
+  ellipsis: true,
+  width: 100,
+  render: function render(price) {
+    return price || price === 0 ? Number(price).toFixed(2) : '';
+  }
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 100,
+  render: function render(price) {
+    return price || price === 0 ? Number(price).toFixed(2) : '';
+  }
+}, {
+  dataIndex: 'costPrice',
+  title: "\u6210\u672C\u4EF7",
+  ellipsis: true,
+  width: 100,
+  render: function render(price) {
+    return price || price === 0 ? Number(price).toFixed(2) : '';
+  }
 }, {
+  dataIndex: 'skuType',
+  title: "\u5546\u54C1\u7C7B\u578B",
+  ellipsis: true,
+  width: 100,
+  render: function render() {
+    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'normal';
+    return {
+      combine: '组合装商品',
+      normal: '普通商品'
+    }[type] || type;
+  }
+}];
+
+var wdtColumns = [{
   dataIndex: 'specName',
   title: 'SKU名称',
   width: 250,
@@ -12308,144 +12400,272 @@ var columns$1 = [{
     return Number(price).toFixed(2);
   }
 }];
-var GoodList = function GoodList(props, ref) {
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    selectList = _useState2[0],
-    setSelect = _useState2[1];
-  var _useState3 = useState([]),
-    _useState4 = _slicedToArray(_useState3, 2),
-    selectIds = _useState4[0],
-    setSelectIds = _useState4[1];
-  var _useState5 = useState([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    brandList = _useState6[0],
-    setBrandList = _useState6[1];
-  useImperativeHandle(ref, function () {
-    return {
-      getSelectGoodList: function getSelectGoodList() {
-        return selectList;
-      }
-    };
-  });
-  var _Form$useForm = Form.useForm(),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
-  var _useAntdTable = useAntdTable(getTableData, {
-      defaultPageSize: 10,
-      form: form
-    }),
-    tableProps = _useAntdTable.tableProps,
-    search = _useAntdTable.search,
-    params = _useAntdTable.params;
-  var submit = search.submit,
-    reset = search.reset;
-  var setGoodBrandList = function setGoodBrandList() {
-    var list = [];
-    var pageNo = 0;
-    var pageSize = 100;
-    var getMore = function getMore() {
-      extendRequest('/qy/gdfw/wdt/erp/goodBrand/list', {
-        method: 'post',
-        data: {
-          pageSize: pageSize,
-          pageNo: pageNo
-        }
-      }).then(function (res) {
-        var _res$data2;
-        if (res.success && (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.detailList)) {
-          var _res$data3, _res$data4;
-          list.push.apply(list, _toConsumableArray((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.detailList) || []));
-          if ((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.detailList.length) === pageSize) {
-            pageNo += 1;
-            getMore();
-          } else {
-            setBrandList(list);
-          }
-        } else {
-          reject(res);
-        }
-      }).catch(console.error);
-    };
-    getMore();
-  };
-  React.useEffect(function () {
-    setGoodBrandList();
+
+var bse3Columns = [{
+  dataIndex: 'specNo',
+  title: "SKU",
+  ellipsis: true,
+  width: 200
+}, {
+  dataIndex: 'specId',
+  title: "SKU ID",
+  ellipsis: true,
+  width: 80
+}, {
+  dataIndex: 'goodName',
+  title: "\u5546\u54C1\u540D\u79F0",
+  ellipsis: true,
+  width: 250
+}, {
+  dataIndex: 'goodShortName',
+  title: "\u5546\u54C1\u7B80\u79F0",
+  ellipsis: true,
+  width: 250
+},
+// {
+//   dataIndex: 'goodPicUrl',
+//   title: `商品图片`,
+//   ellipsis: true,
+//   width: 100,
+//   render: (picUrl: string) => {
+//     return (
+//       <img
+//         style={{
+//           width: '40px',
+//           height: '40px',
+//           objectFit: 'contain',
+//         }}
+//         src={picUrl}
+//       ></img>
+//     );
+//   },
+// },
+{
+  dataIndex: 'goodNo',
+  title: "\u8D27\u53F7",
+  ellipsis: true,
+  width: 150
+}, {
+  dataIndex: 'goodId',
+  title: "\u8D27\u53F7ID",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'colorName',
+  title: "\u989C\u8272\u540D\u79F0",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'colorCode',
+  title: "\u989C\u8272\u4EE3\u7801",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'sizeName',
+  title: "\u5C3A\u7801\u540D\u79F0",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'sizeCode',
+  title: "\u5C3A\u7801\u4EE3\u7801",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'brandName',
+  title: "\u54C1\u724C\u540D\u79F0",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'marketPrice',
+  title: "\u5E02\u573A\u4EF7",
+  ellipsis: true,
+  width: 100
+}, {
+  dataIndex: 'retailPrice',
+  title: "\u552E\u4EF7",
+  ellipsis: true,
+  width: 100
+}];
+
+var getColumnsMap = function getColumnsMap() {
+  return cloneDeep({
+    gy: gyColumns,
+    jst: jstColumns,
+    wdt: wdtColumns,
+    bse3: bse3Columns
+  });
+};
+var getColumnsBaseInfo = function getColumnsBaseInfo() {
+  var clone_columnsMap = cloneDeep(getColumnsMap());
+  var newColumns = {};
+  Object.keys(clone_columnsMap).forEach(function (key) {
+    newColumns[key] = clone_columnsMap[key].map(function (col) {
+      return {
+        title: col.title,
+        dataIndex: col.dataIndex
+      };
+    });
+  });
+  return newColumns;
+};
+var index$2 = getColumnsBaseInfo();
+
+var initNo = {
+  dataIndex: 'index',
+  title: 'NO',
+  render: function render(val, record, index) {
+    return /*#__PURE__*/React.createElement("div", {
+      style: {
+        width: 25
+      }
+    }, index + 1);
+  },
+  width: 80
+};
+var asyncGetData = function asyncGetData(type) {
+  return extendRequest('/qy/condition/list', {
+    method: 'get',
+    params: {
+      typeKey: "erp_select_modal_".concat(type),
+      configScope: 'company' //按企业查询
+    }
+  }).then(function (res) {
+    if (res && res.data && res.data[0] && res.data[0].queryInfo && res.data[0].queryInfo.length > 0) {
+      return JSON.parse(res.data[0].queryInfo);
+    } else {
+      return getColumnsMap()[type];
+    }
+  });
+};
+var useGetColumns = (function (type) {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    columns = _useState2[0],
+    setColumns = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
+  var showColumnsDataIndexList = useMemo(function () {
+    return columns.filter(function (item) {
+      return Object.hasOwn(item, 'dataIndex');
+    }).map(function (item) {
+      return item.dataIndex;
+    });
+  }, [columns]);
+  useEffect(function () {
+    _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var initColumns, requestSortColumns, list, initDataIndexList;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            initColumns = getColumnsMap()[type];
+            setLoading(true);
+            _context.next = 4;
+            return asyncGetData(type);
+          case 4:
+            requestSortColumns = _context.sent;
+            setLoading(false);
+            list = [initNo];
+            if (requestSortColumns && requestSortColumns.length > 0) {
+              initDataIndexList = initColumns.map(function (item) {
+                return item.dataIndex;
+              });
+              requestSortColumns.forEach(function (item) {
+                var dataIndex = item.dataIndex,
+                  show = item.show;
+                if (show !== false && initDataIndexList.includes(dataIndex)) {
+                  list.push(initColumns.find(function (item) {
+                    return item.dataIndex === dataIndex;
+                  }));
+                }
+              });
+            }
+            setColumns(list);
+          case 9:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }))();
   }, []);
-  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
+  return [columns, showColumnsDataIndexList, loading];
+});
+
+function SearchForm(_ref) {
+  var searchFormData = _ref.searchFormData,
+    form = _ref.form,
+    showColumnsDataIndexList = _ref.showColumnsDataIndexList,
+    submit = _ref.submit,
+    reset = _ref.reset;
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    searchData = _useState2[0],
+    setSearchData = _useState2[1];
+  var submitForm = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(submitBtnClickFlag) {
+      var values;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return form.getFieldsValue();
+          case 2:
+            values = _context.sent;
+            if (submitBtnClickFlag || !isEqual(values, searchData)) {
+              setSearchData(values);
+              submit();
+            }
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function submitForm(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/React.createElement(Form, {
     layout: "inline",
     form: form
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "SKU\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "SKU\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "brandIds",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Select, {
-    mode: "multiple",
-    showSearch: true,
-    allowClear: true,
-    filterOption: function filterOption(input, option) {
-      return option.label.includes(input);
-    },
-    style: {
-      width: 150
-    },
-    placeholder: "\u54C1\u724C",
-    options: brandList.filter(function (item) {
-      return !item.isDisabled;
-    }).map(function (_ref2) {
-      var value = _ref2.brandId,
-        label = _ref2.brandName;
-      return {
-        value: value,
-        label: label
-      };
-    })
-  })), /*#__PURE__*/React.createElement(Form.Item, {
+  }, searchFormData.map(function (item) {
+    var label = item.label,
+      name = item.name,
+      dataIndex = item.dataIndex,
+      type = item.type,
+      _item$formItemProps = item.formItemProps,
+      formItemProps = _item$formItemProps === void 0 ? {} : _item$formItemProps;
+    if (!showColumnsDataIndexList.includes(dataIndex || name)) return;
+    return /*#__PURE__*/React.createElement(Form.Item, {
+      name: name,
+      style: {
+        marginBottom: '12px'
+      }
+    }, type === 'select' ? /*#__PURE__*/React.createElement(Select, _objectSpread2({
+      placeholder: label,
+      showSearch: true,
+      allowClear: true,
+      style: {
+        width: 150
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      }
+    }, formItemProps)) : /*#__PURE__*/React.createElement(Input, _objectSpread2({
+      placeholder: label,
+      allowClear: true,
+      style: {
+        width: 150
+      },
+      onPressEnter: function onPressEnter() {
+        return submitForm();
+      },
+      onBlur: function onBlur() {
+        return submitForm();
+      }
+    }, formItemProps)));
+  }), /*#__PURE__*/React.createElement(Form.Item, {
     style: {
       marginBottom: '12px'
     }
@@ -12454,10 +12674,154 @@ var GoodList = function GoodList(props, ref) {
     style: {
       marginRight: '8px'
     },
-    onClick: submit
+    onClick: function onClick() {
+      return submitForm(true);
+    }
   }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
     onClick: reset
   }, "\u91CD\u7F6E")));
+}
+
+var getTableData = function getTableData(_ref, formData) {
+  var _formData$brandIds;
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  var data = {
+    brandIds: ((_formData$brandIds = formData.brandIds) === null || _formData$brandIds === void 0 ? void 0 : _formData$brandIds.length) ? formData.brandIds : null,
+    skuCode: formData.skuCode || null,
+    skuName: formData.skuName || null,
+    goodName: formData.goodName || null,
+    goodNo: formData.goodNo || null
+  };
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'WDT_ERP'
+    }, data)
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        index: index + 1
+      });
+    });
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var GoodList = function GoodList(props, ref) {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    selectList = _useState2[0],
+    setSelect = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectIds = _useState4[0],
+    setSelectIds = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    brandList = _useState6[0],
+    setBrandList = _useState6[1];
+  var _useGetColumns = useGetColumns('wdt'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
+  useImperativeHandle(ref, function () {
+    return {
+      getSelectGoodList: function getSelectGoodList() {
+        return selectList;
+      }
+    };
+  });
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useAntdTable = useAntdTable(getTableData, {
+      defaultPageSize: 10,
+      form: form
+    }),
+    tableProps = _useAntdTable.tableProps,
+    search = _useAntdTable.search,
+    params = _useAntdTable.params;
+  var submit = search.submit,
+    reset = search.reset;
+  var setGoodBrandList = function setGoodBrandList() {
+    var list = [];
+    var pageNo = 0;
+    var pageSize = 100;
+    var getMore = function getMore() {
+      extendRequest('/qy/gdfw/wdt/erp/goodBrand/list', {
+        method: 'post',
+        data: {
+          pageSize: pageSize,
+          pageNo: pageNo
+        }
+      }).then(function (res) {
+        var _res$data2;
+        if (res.success && (res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.detailList)) {
+          var _res$data3, _res$data4;
+          list.push.apply(list, _toConsumableArray((res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.detailList) || []));
+          if ((res === null || res === void 0 ? void 0 : (_res$data4 = res.data) === null || _res$data4 === void 0 ? void 0 : _res$data4.detailList.length) === pageSize) {
+            pageNo += 1;
+            getMore();
+          } else {
+            setBrandList(list);
+          }
+        } else {
+          reject(res);
+        }
+      }).catch(console.error);
+    };
+    getMore();
+  };
+  React.useEffect(function () {
+    setGoodBrandList();
+  }, []);
+  var searchFormData = [{
+    label: 'SKU名称',
+    name: 'skuName',
+    dataIndex: 'specName'
+  }, {
+    label: 'SKU编码',
+    name: 'skuCode',
+    dataIndex: 'specNo'
+  }, {
+    label: '商品名称',
+    name: 'goodName'
+  }, {
+    label: '商品编码',
+    name: 'goodNo'
+  }, {
+    label: '品牌',
+    name: 'brandIds',
+    dataIndex: 'brandName',
+    type: 'select',
+    formItemProps: {
+      mode: 'multiple',
+      filterOption: function filterOption(input, option) {
+        return option.label.includes(input);
+      },
+      options: brandList.filter(function (item) {
+        return !item.isDisabled;
+      }).map(function (_ref2) {
+        var value = _ref2.brandId,
+          label = _ref2.brandName;
+        return {
+          value: value,
+          label: label
+        };
+      })
+    }
+  }];
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -12513,7 +12877,7 @@ var GoodList = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(takeRight(columns$1, columns$1.length - 1));
+    }].concat(takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React.createElement("div", {
       style: {
         width: '100%',
@@ -12535,14 +12899,23 @@ var GoodList = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, advanceSearchForm, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "specNo",
-    columns: columns$1,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -12599,124 +12972,42 @@ var GoodsModal$3 = function GoodsModal(props, ref) {
     ref: wdtGoodListRef
   })));
 };
-var WdtGoodsModal = /*#__PURE__*/forwardRef(GoodsModal$3);
-
-var getTableData$1 = function getTableData(_ref, formData) {
-  var current = _ref.current,
-    pageSize = _ref.pageSize;
-  return extendRequest('/qy/gdfw/product/product/page', {
-    method: 'post',
-    data: _objectSpread2({
-      pageSize: pageSize,
-      pageNo: current,
-      platform: 'JST_ERP'
-    }, formData)
-  }).then(function (res) {
-    var _res$data = res.data,
-      _res$data$productSkuL = _res$data.productSkuList,
-      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
-      _res$data$total = _res$data.total,
-      total = _res$data$total === void 0 ? 0 : _res$data$total;
-    var newProducts = productSkuList.map(function (item, index) {
-      return _objectSpread2({}, item);
-    });
-    return {
-      total: total,
-      list: newProducts
-    };
-  });
-};
-var columns$2 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        width: 25
-      }
-    }, index + 1);
-  },
-  width: 80
-}, {
-  dataIndex: 'goodName',
-  title: '商品名称',
-  width: 250,
-  ellipsis: true
-}, {
-  dataIndex: 'goodNo',
-  title: '商品编码',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'styleCode',
-  title: '款式编码',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'propertiesValue',
-  title: '规格值',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'goodPicUrl',
-  title: '商品图片',
-  width: 100,
-  render: function render(picUrl) {
-    return /*#__PURE__*/React.createElement("img", {
-      style: {
-        width: '40px',
-        height: '40px',
-        objectFit: 'contain'
-      },
-      src: picUrl
+var WdtGoodsModal = /*#__PURE__*/forwardRef(GoodsModal$3);
+
+var getTableData$1 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'JST_ERP'
+    }, formData)
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2({}, item);
     });
-  }
-}, {
-  dataIndex: 'goodShortName',
-  title: "\u5546\u54C1\u7B80\u79F0",
-  ellipsis: true,
-  width: 250
-}, {
-  dataIndex: 'brandName',
-  title: '品牌名称',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'retailPrice',
-  title: "\u9500\u552E\u4EF7\u683C",
-  ellipsis: true,
-  width: 100,
-  render: function render(price) {
-    return price || price === 0 ? Number(price).toFixed(2) : '';
-  }
-}, {
-  dataIndex: 'marketPrice',
-  title: "\u5E02\u573A\u4EF7",
-  ellipsis: true,
-  width: 100,
-  render: function render(price) {
-    return price || price === 0 ? Number(price).toFixed(2) : '';
-  }
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var searchFormData = [{
+  label: '商品名称',
+  name: 'goodName'
 }, {
-  dataIndex: 'costPrice',
-  title: "\u6210\u672C\u4EF7",
-  ellipsis: true,
-  width: 100,
-  render: function render(price) {
-    return price || price === 0 ? Number(price).toFixed(2) : '';
-  }
+  label: '商品编码',
+  name: 'goodNo'
 }, {
-  dataIndex: 'skuType',
-  title: "\u5546\u54C1\u7C7B\u578B",
-  ellipsis: true,
-  width: 100,
-  render: function render() {
-    var type = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'normal';
-    return {
-      'combine': '组合装商品',
-      'normal': '普通商品'
-    }[type] || type;
-  }
+  label: '款式编码',
+  name: 'styleCode'
 }];
 var GoodList$1 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -12727,6 +13018,11 @@ var GoodList$1 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('jst'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
   useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -12746,55 +13042,6 @@ var GoodList$1 = function GoodList(props, ref) {
     params = _useAntdTable.params;
   var submit = search.submit,
     reset = search.reset;
-  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "styleCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u6B3E\u5F0F\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -12859,7 +13106,7 @@ var GoodList$1 = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(takeRight(columns$2, columns$2.length - 1));
+    }].concat(takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React.createElement("div", {
       style: {
         width: '100%',
@@ -12881,14 +13128,23 @@ var GoodList$1 = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, advanceSearchForm, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "goodNo",
-    columns: columns$2,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -12924,164 +13180,84 @@ var GyGoodsModal = function GyGoodsModal(props, ref) {
     setVisible = _useState2[1];
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    selectedRows = _useState4[0],
-    setSelectedRows = _useState4[1];
-  var gyGoodsListRef = useRef(null);
-  var _onCancel = function onCancel() {
-    setVisible(false);
-  };
-  var onOk = function onOk() {
-    var _gyGoodsListRef$curre;
-    var selectedList = ((_gyGoodsListRef$curre = gyGoodsListRef.current) === null || _gyGoodsListRef$curre === void 0 ? void 0 : _gyGoodsListRef$curre.getSelectGoodList()) || [];
-    onSubmit(selectedList);
-    _onCancel();
-  };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
-    title: '选择商品',
-    okText: '确认',
-    cancelText: '取消',
-    visible: visible,
-    width: width || 850,
-    onCancel: function onCancel() {
-      _onCancel();
-    },
-    onOk: onOk,
-    wrapClassName: "goodModal"
-  }, /*#__PURE__*/React.createElement(GyGoodsList, {
-    ref: gyGoodsListRef,
-    selectedRows: selectedRows
-  })));
-};
-var JstGoodsModal = /*#__PURE__*/forwardRef(GyGoodsModal);
-
-var getTableData$2 = function getTableData(_ref, formData) {
-  var current = _ref.current,
-    pageSize = _ref.pageSize;
-  var data = {
-    goodNo: formData.goodNo || null,
-    goodName: formData.goodName || null,
-    skuCode: formData.skuCode || null,
-    skuId: formData.skuId || null
-  };
-  return extendRequest('/qy/gdfw/product/product/page', {
-    method: 'post',
-    data: _objectSpread2({
-      pageSize: pageSize,
-      pageNo: current,
-      platform: 'BS_E3_ERP'
-    }, data)
-  }).then(function (res) {
-    var _res$data = res.data,
-      _res$data$productSkuL = _res$data.productSkuList,
-      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
-      _res$data$total = _res$data.total,
-      total = _res$data$total === void 0 ? 0 : _res$data$total;
-    var newProducts = productSkuList.map(function (item, index) {
-      return _objectSpread2(_objectSpread2({}, item), {}, {
-        index: index + 1
-      });
-    });
-    return {
-      total: total,
-      list: newProducts
-    };
-  });
-};
-var columns$3 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        width: 25
-      }
-    }, index + 1);
-  },
-  width: 80
-}, {
-  dataIndex: 'specNo',
-  title: "SKU",
-  ellipsis: true,
-  width: 200
-}, {
-  dataIndex: 'specId',
-  title: "SKU ID",
-  ellipsis: true,
-  width: 80
-}, {
-  dataIndex: 'goodName',
-  title: "\u5546\u54C1\u540D\u79F0",
-  ellipsis: true,
-  width: 250
-}, {
-  dataIndex: 'goodShortName',
-  title: "\u5546\u54C1\u7B80\u79F0",
-  ellipsis: true,
-  width: 250
-},
-// {
-//   dataIndex: 'goodPicUrl',
-//   title: `商品图片`,
-//   ellipsis: true,
-//   width: 100,
-//   render: (picUrl: string) => {
-//     return (
-//       <img
-//         style={{
-//           width: '40px',
-//           height: '40px',
-//           objectFit: 'contain',
-//         }}
-//         src={picUrl}
-//       ></img>
-//     );
-//   },
-// },
-{
-  dataIndex: 'goodNo',
-  title: "\u8D27\u53F7",
-  ellipsis: true,
-  width: 150
-}, {
-  dataIndex: 'goodId',
-  title: "\u8D27\u53F7ID",
-  ellipsis: true,
-  width: 100
-}, {
-  dataIndex: 'colorName',
-  title: "\u989C\u8272\u540D\u79F0",
-  ellipsis: true,
-  width: 100
-}, {
-  dataIndex: 'colorCode',
-  title: "\u989C\u8272\u4EE3\u7801",
-  ellipsis: true,
-  width: 100
-}, {
-  dataIndex: 'sizeName',
-  title: "\u5C3A\u7801\u540D\u79F0",
-  ellipsis: true,
-  width: 100
-}, {
-  dataIndex: 'sizeCode',
-  title: "\u5C3A\u7801\u4EE3\u7801",
-  ellipsis: true,
-  width: 100
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var gyGoodsListRef = useRef(null);
+  var _onCancel = function onCancel() {
+    setVisible(false);
+  };
+  var onOk = function onOk() {
+    var _gyGoodsListRef$curre;
+    var selectedList = ((_gyGoodsListRef$curre = gyGoodsListRef.current) === null || _gyGoodsListRef$curre === void 0 ? void 0 : _gyGoodsListRef$curre.getSelectGoodList()) || [];
+    onSubmit(selectedList);
+    _onCancel();
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, visible && /*#__PURE__*/React.createElement(Modal, {
+    title: '选择商品',
+    okText: '确认',
+    cancelText: '取消',
+    visible: visible,
+    width: width || 850,
+    onCancel: function onCancel() {
+      _onCancel();
+    },
+    onOk: onOk,
+    wrapClassName: "goodModal"
+  }, /*#__PURE__*/React.createElement(GyGoodsList, {
+    ref: gyGoodsListRef,
+    selectedRows: selectedRows
+  })));
+};
+var JstGoodsModal = /*#__PURE__*/forwardRef(GyGoodsModal);
+
+var getTableData$2 = function getTableData(_ref, formData) {
+  var current = _ref.current,
+    pageSize = _ref.pageSize;
+  var data = {
+    goodShortName: formData.goodShortName || null,
+    goodNo: formData.goodNo || null,
+    goodName: formData.goodName || null,
+    skuCode: formData.skuCode || null,
+    skuId: formData.skuId || null
+  };
+  return extendRequest('/qy/gdfw/product/product/page', {
+    method: 'post',
+    data: _objectSpread2({
+      pageSize: pageSize,
+      pageNo: current,
+      platform: 'BS_E3_ERP'
+    }, data)
+  }).then(function (res) {
+    var _res$data = res.data,
+      _res$data$productSkuL = _res$data.productSkuList,
+      productSkuList = _res$data$productSkuL === void 0 ? [] : _res$data$productSkuL,
+      _res$data$total = _res$data.total,
+      total = _res$data$total === void 0 ? 0 : _res$data$total;
+    var newProducts = productSkuList.map(function (item, index) {
+      return _objectSpread2(_objectSpread2({}, item), {}, {
+        index: index + 1
+      });
+    });
+    return {
+      total: total,
+      list: newProducts
+    };
+  });
+};
+var searchFormData$1 = [{
+  label: '商品货号',
+  name: 'goodNo'
 }, {
-  dataIndex: 'brandName',
-  title: "\u54C1\u724C\u540D\u79F0",
-  ellipsis: true,
-  width: 100
+  label: '商品名称',
+  name: 'goodName'
 }, {
-  dataIndex: 'marketPrice',
-  title: "\u5E02\u573A\u4EF7",
-  ellipsis: true,
-  width: 100
+  label: 'SKU',
+  name: 'skuCode',
+  dataIndex: 'specNo'
 }, {
-  dataIndex: 'retailPrice',
-  title: "\u552E\u4EF7",
-  ellipsis: true,
-  width: 100
+  label: 'SKU ID',
+  name: 'skuId',
+  dataIndex: 'specId'
 }];
 var GoodList$2 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -13092,6 +13268,11 @@ var GoodList$2 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('bse3'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
   useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -13111,66 +13292,6 @@ var GoodList$2 = function GoodList(props, ref) {
     params = _useAntdTable.params;
   var submit = search.submit,
     reset = search.reset;
-  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u8D27\u53F7",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "SKU",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuId",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "SKU ID",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -13226,7 +13347,7 @@ var GoodList$2 = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(takeRight(columns$3, columns$3.length - 1));
+    }].concat(takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React.createElement("div", {
       style: {
         width: '100%',
@@ -13248,14 +13369,23 @@ var GoodList$2 = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, advanceSearchForm, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData$1,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "specNo",
-    columns: columns$3,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -13346,71 +13476,23 @@ var getTableData$3 = function getTableData(_ref, formData) {
     };
   });
 };
-var columns$4 = [{
-  dataIndex: 'index',
-  title: 'NO',
-  render: function render(val, record, index) {
-    return /*#__PURE__*/React.createElement("div", {
-      style: {
-        width: 25
-      }
-    }, index + 1);
-  },
-  width: 80
-}, {
-  dataIndex: 'specName',
-  title: 'SKU名称',
-  width: 250,
-  ellipsis: true
-}, {
-  dataIndex: 'specNo',
-  title: 'SKU编码',
-  width: 200,
-  ellipsis: true
-}, {
-  dataIndex: 'goodName',
-  title: '商品名称',
-  width: 250,
-  ellipsis: true
-}, {
-  dataIndex: 'goodShortName',
-  title: "\u5546\u54C1\u7B80\u79F0",
-  ellipsis: true,
-  width: 250
-}, {
-  dataIndex: 'goodNo',
-  title: '商品编码',
-  width: 200,
-  ellipsis: true
+var searchFormData$2 = [{
+  label: '商品简称',
+  name: 'goodShortName'
 }, {
-  dataIndex: 'goodPicUrl',
-  title: '商品图片',
-  width: 100,
-  render: function render(picUrl) {
-    return /*#__PURE__*/React.createElement("img", {
-      style: {
-        width: '40px',
-        height: '40px',
-        objectFit: 'contain'
-      },
-      src: picUrl
-    });
-  }
+  label: '商品sku名称',
+  name: 'skuName',
+  dataIndex: 'specName'
 }, {
-  dataIndex: 'brandName',
-  title: '品牌名称',
-  width: 200,
-  ellipsis: true
+  label: '商品sku编码',
+  name: 'skuCode',
+  dataIndex: 'specNo'
 }, {
-  dataIndex: 'retailPrice',
-  title: "\u6807\u51C6\u552E\u4EF7",
-  ellipsis: true,
-  width: 100
+  label: '商品名称',
+  name: 'goodName'
 }, {
-  dataIndex: 'costPrice',
-  title: "\u6210\u672C\u4EF7",
-  ellipsis: true,
-  width: 100
+  label: '商品编码',
+  name: 'goodNo'
 }];
 var GoodList$3 = function GoodList(props, ref) {
   var _useState = useState([]),
@@ -13421,6 +13503,11 @@ var GoodList$3 = function GoodList(props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     selectIds = _useState4[0],
     setSelectIds = _useState4[1];
+  var _useGetColumns = useGetColumns('gy'),
+    _useGetColumns2 = _slicedToArray(_useGetColumns, 3),
+    columns = _useGetColumns2[0],
+    showColumnsDataIndexList = _useGetColumns2[1],
+    loading = _useGetColumns2[2];
   useImperativeHandle(ref, function () {
     return {
       getSelectGoodList: function getSelectGoodList() {
@@ -13440,77 +13527,6 @@ var GoodList$3 = function GoodList(props, ref) {
     params = _useAntdTable.params;
   var submit = search.submit,
     reset = search.reset;
-  var advanceSearchForm = /*#__PURE__*/React.createElement(Form, {
-    layout: "inline",
-    form: form
-  }, /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodShortName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7B80\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1sku\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "skuCode",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1sku\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodName",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u540D\u79F0",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    name: "goodNo",
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Input, {
-    placeholder: "\u5546\u54C1\u7F16\u7801",
-    allowClear: true,
-    style: {
-      width: 150
-    }
-  })), /*#__PURE__*/React.createElement(Form.Item, {
-    style: {
-      marginBottom: '12px'
-    }
-  }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
-    style: {
-      marginRight: '8px'
-    },
-    onClick: submit
-  }, "\u67E5\u8BE2"), /*#__PURE__*/React.createElement(Button, {
-    onClick: reset
-  }, "\u91CD\u7F6E")));
   var rowSelection = {
     selectedRowKeys: selectIds,
     fixed: true,
@@ -13566,7 +13582,7 @@ var GoodList$3 = function GoodList(props, ref) {
           }
         }, "\u5220\u9664");
       }
-    }].concat(takeRight(columns$4, columns$4.length - 1));
+    }].concat(takeRight(columns, columns.length - 1));
     return selectList.length ? /*#__PURE__*/React.createElement("div", {
       style: {
         width: '100%',
@@ -13588,14 +13604,23 @@ var GoodList$3 = function GoodList(props, ref) {
       }
     })) : null;
   };
-  return /*#__PURE__*/React.createElement(React.Fragment, null, advanceSearchForm, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement(Skeleton, {
+    active: true,
+    loading: loading
+  }, /*#__PURE__*/React.createElement(SearchForm, {
+    searchFormData: searchFormData$2,
+    form: form,
+    showColumnsDataIndexList: showColumnsDataIndexList,
+    submit: submit,
+    reset: reset
+  }), /*#__PURE__*/React.createElement("div", {
     style: {
       marginTop: '4px'
     }
   }, /*#__PURE__*/React.createElement(Table, _objectSpread2({
     rowSelection: rowSelection,
     rowKey: "id",
-    columns: columns$4,
+    columns: columns,
     scroll: {
       x: '100%',
       y: 250
@@ -14075,7 +14100,7 @@ var getWdtReissueGoodColumns = function getWdtReissueGoodColumns(_ref2) {
   var disabled = _ref2.disabled,
     updateHandle = _ref2.updateHandle,
     operate = _ref2.operate;
-  return getColumnsMap()['WDT_REISSUE_GOODS'].map(function (item) {
+  return getColumnsMap$1()['WDT_REISSUE_GOODS'].map(function (item) {
     var newItem = _objectSpread2({
       align: 'center',
       ellipsis: true
@@ -15598,7 +15623,7 @@ var getColumns$6 = function getColumns(_ref) {
   };
 };
 
-var getColumnsMap = function getColumnsMap(args) {
+var getColumnsMap$1 = function getColumnsMap(args) {
   var _ref = args || {},
     _ref$text = _ref.text,
     text = _ref$text === void 0 ? '' : _ref$text,
@@ -15638,8 +15663,8 @@ var getColumnsMap = function getColumnsMap(args) {
     })['default']
   });
 };
-var getColumnsBaseInfo = function getColumnsBaseInfo() {
-  var clone_columnsMap = cloneDeep(getColumnsMap());
+var getColumnsBaseInfo$1 = function getColumnsBaseInfo() {
+  var clone_columnsMap = cloneDeep(getColumnsMap$1());
   var newColumns = {};
   Object.keys(clone_columnsMap).forEach(function (key) {
     newColumns[key] = clone_columnsMap[key].map(function (col) {
@@ -15651,7 +15676,7 @@ var getColumnsBaseInfo = function getColumnsBaseInfo() {
   });
   return newColumns;
 };
-var columnsBaseInfoMap = getColumnsBaseInfo();
+var columnsBaseInfoMap = getColumnsBaseInfo$1();
 
 var renderFieldMap$1 = {
   goodsNumber: function goodsNumber(_ref) {
@@ -15718,7 +15743,7 @@ var getBsE3ReissueGoodColumns = function getBsE3ReissueGoodColumns(_ref4) {
   var disabled = _ref4.disabled,
     updateHandle = _ref4.updateHandle,
     operate = _ref4.operate;
-  return getColumnsMap()['BS_E3_REISSUE_GOODS'].map(function (item) {
+  return getColumnsMap$1()['BS_E3_REISSUE_GOODS'].map(function (item) {
     var newItem = _objectSpread2({
       align: 'center',
       ellipsis: true
@@ -15977,7 +16002,7 @@ var GoodItem$1 = function GoodItem(props) {
         case 'GY_REISSUE_GOODS':
         case 'GY_RETURN_GOODS':
           {
-            columns = getColumnsMap({
+            columns = getColumnsMap$1({
               text: text,
               disabled: disabled || columnsOptions.disabled,
               updateHandle: updateHandle,
@@ -16004,7 +16029,7 @@ var GoodItem$1 = function GoodItem(props) {
           }
           break;
         default:
-          columns = getColumnsMap({
+          columns = getColumnsMap$1({
             text: text,
             disabled: disabled || columnsOptions.disabled,
             updateHandle: updateHandle,
@@ -17141,7 +17166,7 @@ var rowKeyMap = {
   GY_SYSTEM_ORDER: 'billNo',
   JST_SYSTEM_ORDER: 'oId'
 };
-var index$2 = (function (props) {
+var index$3 = (function (props) {
   var value = props.value,
     _onChange = props.onChange,
     disabled = props.disabled,
@@ -19146,7 +19171,7 @@ var Goods$1 = function Goods(props, ref) {
     userNick: userNick
   }));
 };
-var index$3 = /*#__PURE__*/forwardRef(Goods$1);
+var index$4 = /*#__PURE__*/forwardRef(Goods$1);
 
 var _excluded$k = ["onChange", "value", "failValue"];
 function CommonStatus(props) {
@@ -19407,7 +19432,7 @@ var MsgStatus = function MsgStatus(props) {
       onClick: function onClick() {
         return setChangeIndex(index);
       }
-    }, msgTypeCh[key], item.ruleName);
+    }, msgTypeCh[key] || key, item.ruleName);
   }))) : null, type === 1 ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Select, _objectSpread2(_objectSpread2({}, other), {}, {
     showSearch: true,
     value: (_value$changeIndex = value[changeIndex]) === null || _value$changeIndex === void 0 ? void 0 : _value$changeIndex.status,
@@ -20244,4 +20269,4 @@ var GyReturnGoods = function GyReturnGoods(props) {
   })));
 };
 
-export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$2 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$3 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, getColumns$5 as getJstColumns, getColumns$3 as getWlnColumns };
+export { ApaasAddress as Address, AliPay, Province as ApaasAddress, ApaasCascader, ApaasCheckbox, ApaasDate, withFormItem as ApaasHoc, ApaasInput, ApaasInputNumber, ApaasLogistics, ApaasMultipleSelect, ApaasPosting, ApaasRadio, ApaasRate, ApaasSelect, ApaasSlider, ApaasTextArea, ApaasUpload, index as ApaasUploadAsync, ApaasUploadFile, index$1 as ApaasUploadProAsync, bsE3Reissue as BsE3Reissue, BsExchange, BsGoods, BsReissue, BsReturnGoods as BsReturn, index$3 as BsSystemOrder, BuyerNick, CalculationInput, ChooseBaby, CommonExchangeGoods, CommonGoods, CommonSystemOrder$1 as CommonMultiStatus, CommonReturnGoods, CommonStatus, CommonSystemOrder, CopyTextIcon, ExpressLogistics, Goods, index$4 as GoodsTable, GyReissue, GyReturnGoods as GyReturn, IdentifyAddress, Invoice, jstGoods as JstGoods, ItemList as JstItemList, LogisticsInterception, LogisticsMoreInterception, LogisticsMoreTrajectory, LogisticsTrajectory, MsgStatus, ParseLogistics, Payment, PublicReissue, RemarkInput as Remark, ExpressLogistics as ReturnLogistics, ShopNameSelect as ShopName, Status, SubForm, Supplier, TBGoodId, TBGoodSerial, TradeId, WdtGoodList, wdtReissue as WdtReissue, WlnGoods, columnsBaseInfoMap, index$2 as erpModalColumnsMap, getColumns$5 as getJstColumns, getColumns$3 as getWlnColumns };