cloud-business 0.1.124-1 → 0.1.124-11

package/cloud-business.js

@@ -3717,6 +3717,659 @@
     showPage: true
   };
 
+  var shuyunUtils = createCommonjsModule(function (module, exports) {
+  (function () {var b={};function p(o){return (p="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})(o)}var c=function(o,t){return JSON.stringify(o)===JSON.stringify(t)};var q=function(o,t){var e=-1;return o.some(function(o,r){return c(o,t)&&(e=r),c(o,t)}),e};var u=function(o){return JSON.parse(JSON.stringify(o))};var v=function(o){var t=!0;for(var e in o)o.hasOwnProperty(e)&&(t=!1);return t};var d=function(o){return {"[object String]":"string","[object Boolean]":"boolean","[object Undefined]":"undefined","[object Number]":"number","[object Object]":"object","[object Error]":"error","[object Function]":"function","[object Date]":"date","[object Array]":"array","[object RegExp]":"regexp","[object Null]":"null","[object NodeList]":"nodeList","[object Arguments]":"arguments","[object Window]":"window","[object HTMLDocument]":"document"}[Object.prototype.toString.call(o)]||(o instanceof Element?"element":"")};var w=function(o){return "string"==typeof o?o.trim():Object.keys(o).reduce(function(t,e){var r=o[e];return "undefined"===d(r)||"null"===d(r)?t:(t[e]=r,t)},{})};var x=function(o){var t="";for(var e in o){var r=o[e];r="object"===p(r)?JSON.stringify(r):r,t="".concat(t,"&").concat(e,"=").concat(r);}return t.replace("&","")};function f(r,e){var t=Object.keys(r);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(r);e&&(o=o.filter(function(e){return Object.getOwnPropertyDescriptor(r,e).enumerable})),t.push.apply(t,o);}return t}function g(r){for(var e=1;e<arguments.length;e++){var t=null!=arguments[e]?arguments[e]:{};e%2?f(Object(t),!0).forEach(function(e){h(r,e,t[e]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(t)):f(Object(t)).forEach(function(e){Object.defineProperty(r,e,Object.getOwnPropertyDescriptor(t,e));});}return r}function h(r,e,t){return e in r?Object.defineProperty(r,e,{value:t,enumerable:!0,configurable:!0,writable:!0}):r[e]=t,r}function y(r,e){return C(r)||B(r,e)||A(r,e)||z()}function z(){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 A(r,e){if(r){if("string"==typeof r)return j(r,e);var t=Object.prototype.toString.call(r).slice(8,-1);return "Object"===t&&r.constructor&&(t=r.constructor.name),"Map"===t||"Set"===t?Array.from(r):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?j(r,e):void 0}}function j(r,e){(null==e||e>r.length)&&(e=r.length);for(var t=0,o=new Array(e);t<e;t++)o[t]=r[t];return o}function B(r,e){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(r)){var t=[],o=!0,n=!1,a=void 0;try{for(var $,s=r[Symbol.iterator]();!(o=($=s.next()).done)&&(t.push($.value),!e||t.length!==e);o=!0);}catch(i){n=!0,a=i;}finally{try{o||null==s.return||s.return();}finally{if(n)throw a}}return t}}function C(r){if(Array.isArray(r))return r}var D=function(r){return r.replace(/-\w/g,function(r){return r.split("-")[1].toUpperCase()})};var E=function(r){return r.replace(/([A-Z])/g,"-$1").toLowerCase()};var F=function(r){return r.replace(/^\?/,"").split("&").reduce(function(r,e){var t=y(e.split("="),2),o=t[0],n=t[1],a=void 0===n?"":n;return g(g({},r),{},h({},o,a))},{})};var k=function(e,t,r,n){var o={percentile:{digits:100,sign:"%"},thousands:{digits:1e3,sign:"\u2030"}}[e],s=Math.pow(10,r),$=parseInt(t*o.digits*s,10)/s;return n?Number($).toFixed(r)+o.sign:$+o.sign},G=function(e,t){var r=!(arguments.length>2&&void 0!==arguments[2])||arguments[2];return k("percentile",e,t,r)};var H=function(e,t){var r=!(arguments.length>2&&void 0!==arguments[2])||arguments[2];return k("thousands",e,t,r)};var I=function(e){var t=document.createElement("input");t.style.cssText="position:absolute;top:0;z-index: -999;",t.value=e,document.body.appendChild(t),t.select();var o=document.execCommand("copy");return t.remove(),o};var J=function(e){var t=document.createElement("div");t.style.display="inline-block",t.style.opacity="0",t.innerText=e,document.body.appendChild(t);var o=window.getComputedStyle(t).width;return document.body.removeChild(t),parseInt(o,10)};var K=function(t,e){var o=Blob.prototype,n=null;if(Object.getPrototypeOf(t)===o&&(n=t),t.data&&Object.getPrototypeOf(t.data)===o&&(n=t.data),!n||Object.getPrototypeOf(n)!==o)return !1;var r=document.createElement("a");r.addEventListener("click",function(){r.download=e,r.href=Window.URL.createObjectURL(n);});var a=document.createEvent("MouseEvents");return a.initEvent("click",!1,!1),r.dispatchEvent(a),!0};function L(t){return (L="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function M(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){for(var r=0;r<e.length;r++){var a=e[r];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a);}}function N(t,e,r){return e&&l(t.prototype,e),r&&l(t,r),t}var O=function(){function t(e){switch(M(this,t),L(e)){case"number":if(13===e.toString().length)return void this.parseDate(new Date(e));this.parseStr(e.toString());break;case"string":this.parseStr(e);break;case"object":this.parseDate(e.constructor===Date?e:new Date);break;default:this.parseDate(new Date);}}return N(t,[{key:"parseStr",value:function(t){var e=t.replace(/\D/g,""),r={fullYear_str:e.substr(0,4),year_str:e.substr(2,4),month_str:e.substr(4,2),date_str:e.substr(6,2),hour_str:e.substr(8,2),minute_str:e.substr(10,2),second_str:e.substr(12,2)};if(r.fullYear_str&&r.month_str&&r.date_str){var a="".concat(r.fullYear_str,"/").concat(r.month_str,"/").concat(r.date_str," ").concat(r.hour_str||"00",":").concat(r.minute_str||"00",":").concat(r.second_str||"00");this.parseDate(new Date(a));}else this.parseDate(new Date);}},{key:"parseDate",value:function(t){this.fullYear=t.getFullYear(),this.year=parseInt(t.getFullYear().toString().substr(2,2)),this.month=t.getMonth()+1,this.date=t.getDate(),this.hour=t.getHours(),this.minute=t.getMinutes(),this.second=t.getSeconds(),this.day=t.getDay();}},{key:"format",value:function(t){return t.replace(/YYYY/i,this.fullYear).replace(/YY/i,this.year<10?"0".concat(this.year):this.year).replace(/MM/,this.month<10?"0".concat(this.month):this.month).replace(/DD/i,this.date<10?"0".concat(this.date):this.date).replace(/HH/i,this.hour<10?"0".concat(this.hour):this.hour).replace(/mm/,this.minute<10?"0".concat(this.minute):this.minute).replace(/ss/i,this.second<10?"0".concat(this.second):this.second)}}]),t}(),P=function(t){return new O(t)};var m={copyText:I,getTextWidth:J,moment:P,equal:c,index:q,clone:u,isEmpty:v,type:d,trim:w,toQueryString:x,toHump:D,toHyphen:E,toFormData:F,toPercentile:G,toThousands:H,download:K};b.default=m,b=m;{module.exports=b;}})();
+  });
+
+  var NULL_MAP = {
+    ISNULL: {
+      label: '为空',
+      value: 'ISNULL'
+    },
+    NONULL: {
+      label: '不为空',
+      value: 'NONULL'
+    }
+  };
+  var TAG_NULL_MAP = {
+    TAG_ISNULL: {
+      label: '为空',
+      value: 'TAG_ISNULL'
+    },
+    TAG_NONULL: {
+      label: '不为空',
+      value: 'TAG_NONULL'
+    }
+  };
+  var reg = new RegExp('\'', 'g');
+  var nullList = ['ISNULL', 'NONULL'];
+  function queryTypeMap(moduleType, type) {
+    switch (moduleType) {
+      case 'SELECT':
+        return {
+          operator: 'EQ',
+          operatorName: '等于',
+          rules: 'defalut'
+        };
+      case 'INPUT':
+        return {
+          operator: type === 'SINGLE' ? 'EQ' : 'LIKE',
+          operatorName: type === 'SINGLE' ? '等于' : '内容包含',
+          rules: type === 'SINGLE' ? 'defalut' : 'split'
+        };
+      case 'SELECT_TREE':
+        return {
+          operator: 'EQ',
+          operatorName: '等于',
+          rules: 'normal'
+        };
+      case 'SELECT_INPUT':
+        return {
+          operator: 'SUB_PATTERN',
+          operatorName: '符合模式(截断)',
+          rules: 'sub_pattern'
+        };
+      case 'NUMBER':
+        return {
+          operator: 'BETWEEN_CLOSE',
+          operatorName: '介于(闭区间)',
+          rules: 'between'
+        };
+      case 'DATE':
+        return {
+          operator: type === 'DATE_M' ? 'EQ' : 'BETWEEN_CLOSE',
+          operatorName: type === 'DATE_M' ? '等于' : '介于(闭区间)',
+          rules: type === 'DATE_M' ? 'defalut' : 'between'
+        };
+    }
+    return null;
+  }
+  function configQueryMap(data, query) {
+    var obj = {};
+    data.forEach(function (item) {
+      if (item.groupName) {
+        var optObj = {};
+        if (item.moduleType !== 'NO_VALUE') {
+          optObj = queryTypeMap(item.moduleType, item.type);
+        } else if (query[item.itemId]) {
+          var id = query[item.itemId];
+          optObj.operator = TAG_NULL_MAP[id].value;
+          optObj.operatorName = TAG_NULL_MAP[id].label;
+          optObj.rules = 'noValue';
+        }
+        obj = _objectSpread2(_objectSpread2({}, obj), {}, _defineProperty({}, item.itemId, _objectSpread2({
+          field: item.itemId,
+          desc: item.itemName,
+          tagsFlag: 'tags',
+          type: item.type,
+          moduleType: item.moduleType,
+          dataSource: item.configs,
+          status: item.status
+        }, optObj)));
+      } else {
+        obj = _objectSpread2(_objectSpread2({}, obj), {}, _defineProperty({}, item.itemId, _objectSpread2(_objectSpread2({}, QUERY_MAP[item.itemId]), {}, {
+          type: item.type,
+          moduleType: item.moduleType,
+          dataSource: item.configs,
+          status: item.status,
+          tagsFlag: null
+        })));
+      }
+    });
+    return obj;
+  }
+
+  /**
+   * 过滤对象中空属性
+   * @param {*} obj
+   * @returns
+   */
+  function filterNullValueObject(obj) {
+    for (var i in obj) {
+      if (obj[i] === '' || obj[i] === null || obj[i] === 'null') {
+        delete obj[i];
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * 数组去重
+   */
+  function unique(array) {
+    var keyFn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (item) {
+      return item;
+    };
+    var hash = {};
+    var result = [];
+    array.forEach(function (item) {
+      var key = keyFn(item);
+      if (key in hash) return;
+      result.push(item);
+      hash[key] = null;
+    });
+    return result;
+  }
+  function genPlatShopValue(platList, shopList, platShop) {
+    var _platCode = platShop.platCode,
+      _shopId = platShop.shopId;
+    var defaultPlat = platList[0] && platList[0].platCode;
+    var platCode = platList.find(function (plat) {
+      return plat.platCode === _platCode;
+    }) ? _platCode : defaultPlat;
+    var defaultShop = (shopList.find(function (shop) {
+      return shop.platCode === platCode;
+    }) || {}).shopId;
+    var shopId = shopList.find(function (shop) {
+      return shop.shopId === _shopId;
+    }) ? _shopId : defaultShop;
+    return {
+      shopId: shopId,
+      platCode: platCode
+    };
+  }
+
+  /**
+   * 全部商品tab-请求参数转化
+   * @param {*} data 需要转化的数据
+   * @param {*} config 配置项枚举信息
+   */
+  function allTabFormatting(config, data) {
+    var arr = [];
+    Object.keys(data).forEach(function (item) {
+      if (config[item]) {
+        var obj = {
+          field: config[item].field,
+          fieldName: config[item].desc,
+          configName: item,
+          tagsFlag: config[item].tagsFlag,
+          operator: config[item].operator,
+          operatorName: config[item].operatorName
+        };
+        switch (config[item].rules) {
+          case 'normal':
+            if (data[item]) {
+              if (config[item].type === 'SINGLE') {
+                obj.value = [data[item].value];
+                obj.semantic = [data[item].label];
+              } else {
+                var ids = [];
+                var names = [];
+                data[item].forEach(function (str) {
+                  ids.push(str.id);
+                  names.push(str.name);
+                });
+                obj.semantic = names;
+                obj.value = config[item].tagsFlag ? names : ids;
+              }
+            }
+            break;
+          case 'between':
+            data[item].start = "".concat(data[item].start);
+            data[item].end = "".concat(data[item].end);
+            if (data[item].datetype) {
+              obj.relative = data[item].datetype;
+            }
+            if (data[item].dateUnit) {
+              obj.timeUnit = data[item].dateUnit;
+            }
+            if (data[item].start || data[item].end) {
+              obj.value = [data[item].start, data[item].end];
+              obj.semantic = [data[item].start, data[item].end];
+            }
+            break;
+          case 'split':
+            if (data[item]) {
+              var _value = data[item].replace(reg, '\\\'');
+              obj.value = _value.split(',');
+              obj.semantic = data[item].split(',');
+            }
+            break;
+          case 'sub_pattern':
+            if (data[item]) {
+              if (typeof data[item] === 'string') {
+                var _value2 = data[item].replace(reg, '\\\'');
+                obj.value = [_value2];
+                var val = data[item].split(':');
+                if (val.length > 1) {
+                  obj.semantic = ["\u622A\u53D6".concat(val[0], "\u81F3").concat(val[1], "\u4F4D\uFF0C\u5B57\u7B26\u662F").concat(val[2])];
+                } else {
+                  obj.operatorName = '等于';
+                  obj.semantic = [data[item]];
+                }
+              }
+            }
+            break;
+          default:
+            if (data[item]) {
+              if (config[item].field === 'platCode') {
+                // 假如平台code标识，需要找出平台名称
+                data.platList.forEach(function (val) {
+                  if (val.platCode === data[item]) {
+                    obj.semantic = [val.platName];
+                    obj.value = [data[item]];
+                  }
+                });
+              } else if (config[item].field === 'shopId') {
+                // 假如是店铺ID标识，需要找出店铺名称
+                data.shopList.forEach(function (val) {
+                  if (val.shopId === data[item]) {
+                    obj.semantic = [val.shopName];
+                    obj.value = [data[item]];
+                  }
+                });
+              } else if (config[item].moduleType === 'SELECT' || config[item].moduleType === 'DATE') {
+                if (config[item].type === 'SINGLE') {
+                  var _list = config[item].dataSource.filter(function (el) {
+                    return el.value === data[item];
+                  });
+                  obj.semantic = [_list[0].label];
+                  obj.value = config[item].tagsFlag ? [_list[0].label] : [_list[0].value];
+                } else if (config[item].type === 'MULTIPLE' || config[item].type === 'DATE_M') {
+                  var values = data[item] && data[item].map(function (el) {
+                    var findTemp = config[item].dataSource.find(function (innerItem) {
+                      return innerItem.value === el;
+                    });
+                    return (findTemp || {}).label;
+                  });
+                  obj.value = values;
+                  obj.semantic = values;
+                } else if (config[item].moduleType === 'N0_VALUE') {
+                  obj.semantic = NULL_MAP[data[item]].label;
+                  obj.value = [data[item]];
+                  obj.operator = NULL_MAP[data[item]].value;
+                  obj.operatorName = NULL_MAP[data[item]].label;
+                } else {
+                  obj.semantic = [data[item]];
+                  obj.value = [data[item]];
+                }
+              } else {
+                obj.semantic = [data[item]];
+                var _value3 = data[item].replace(reg, '\\\'');
+                obj.value = [_value3];
+              }
+            }
+        }
+        arr.push(obj);
+      }
+    });
+    /**
+     *
+     */
+    return arr.filter(function (item) {
+      return item.value && item.value.length >= 1;
+    });
+  }
+
+  /**
+   * 商品选择tab窗口，根据筛选条件格式化数据
+   * @param {*} data
+   */
+  function parsingCondition(data) {
+    var arr = [];
+    var list = ['shopId', 'prod.outer_id', 'sku.outer_id', 'prod.product_id', 'sku.sku_id'];
+    data.forEach(function (item) {
+      var obj = {
+        field: '',
+        fieldName: '',
+        operator: '',
+        operatorName: '',
+        semantic: [],
+        value: []
+      };
+      obj.tagsFlag = item.field.groupName ? 'tags' : null;
+      obj.field = item.field.field;
+      obj.fieldName = item.field.desc;
+      obj.operator = item.operator.value;
+      obj.operatorName = item.operator.label;
+      if (list.includes(item.field.field)) {
+        switch (item.field.field) {
+          case 'shopId':
+            // 上架店铺(需要解析出平台code)
+            if (item.value) {
+              arr.push({
+                field: 'platCode',
+                fieldName: '平台名称',
+                operator: item.operator.value,
+                operatorName: '等于',
+                semantic: [item.value.plat.label],
+                value: [item.value.plat.value]
+              });
+              obj.semantic = item.value.shops.map(function (shop) {
+                return shop.label;
+              });
+              obj.value = item.value.shops.map(function (shop) {
+                return shop.value;
+              });
+            }
+            break;
+          case 'prod.outer_id': // 商品商家编码
+          case 'sku.outer_id':
+            // sku商家编码
+            if (item.value) {
+              if (item.operator.value === 'SUB_PATTERN') {
+                // 如果是截断模式
+                obj.value = ["".concat(item.value.begin, ":").concat(item.value.end, ":").concat(item.value.value.replace(reg, '\\\''))];
+                obj.semantic = ["\u622A\u53D6".concat(item.value.begin, "\u81F3").concat(item.value.end, "\u4F4D,\u5B57\u7B26\u662F").concat(item.value.value)];
+              } else if (Array.isArray(item.value)) {
+                obj.semantic = item.value.filter(function (val) {
+                  return val !== '';
+                });
+                obj.value = item.value.filter(function (val) {
+                  return val !== '';
+                }).map(function (val) {
+                  return val.replace(reg, '\\\'');
+                });
+              } else {
+                obj.semantic = [item.value];
+                obj.value = [item.value.replace(reg, '\\\'')];
+              }
+            } else if (nullList.includes(item.operator.value)) {
+              obj.value = [NULL_MAP[item.operator.value].value];
+              obj.semantic = [NULL_MAP[item.operator.value].label];
+            }
+            break;
+          case 'prod.product_id':
+          case 'sku.sku_id':
+            if (item.value) {
+              if (Array.isArray(item.value)) {
+                obj.semantic = item.value.filter(function (val) {
+                  return val !== '';
+                });
+                obj.value = item.value.filter(function (val) {
+                  return val !== '';
+                }).map(function (val) {
+                  return val.replace(reg, '\\\'');
+                });
+              } else {
+                obj.semantic = [item.value];
+                obj.value = [item.value.replace(reg, '\\\'')];
+              }
+            }
+            break;
+        }
+      } else {
+        switch (item.field.type) {
+          case 'NO_VALUE':
+            // 无值类
+            obj.semantic = [item.operator.label];
+            obj.value = [item.operator.value];
+            break;
+          case 'DATE_YMD': // 年月日
+          case 'DATE_MD':
+            // 月日
+            if (item.value) {
+              if (item.operator.value === 'BETWEEN_CLOSE' || item.operator.value === 'BETWEEN_OPEN') {
+                // 假如是区间类型
+                obj.value = item.value ? [item.value.start || '', item.value.end || ''] : [item.value];
+                obj.semantic = item.value ? [item.value.start || '', item.value.end || ''] : [item.value];
+              } else if (nullList.includes(item.operator.value)) {
+                obj.value = [NULL_MAP[item.operator.value].value];
+                obj.semantic = [NULL_MAP[item.operator.value].label];
+              } else {
+                obj.value = item.value ? [item.value] : [''];
+                obj.semantic = item.value ? [item.value] : [''];
+              }
+            } else if (nullList.includes(item.operator.value)) {
+              obj.value = [NULL_MAP[item.operator.value].value];
+              obj.semantic = [NULL_MAP[item.operator.value].label];
+            }
+            break;
+          case 'DATE_M':
+            // 月
+            if (item.value) {
+              obj.value = item.value;
+              obj.semantic = item.value.map(function (el) {
+                var findTemp = item.field.dataSource.find(function (innerItem) {
+                  return Number(innerItem.value) === Number(el);
+                });
+                return (findTemp || {}).label;
+              });
+            } else if (nullList.includes(item.operator.value)) {
+              obj.value = [NULL_MAP[item.operator.value].value];
+              obj.semantic = [NULL_MAP[item.operator.value].label];
+            }
+            break;
+          case 'CATEGORY_SELECT_TREE':
+            obj.field = item.field.field;
+            obj.fieldName = item.field.desc;
+            obj.operator = item.operator.value;
+            obj.operatorName = item.operator.label;
+            if (item.value) {
+              var categoriesIds = [];
+              var categoriesName = [];
+              item.value.categories.forEach(function (str) {
+                categoriesIds.push(str.id);
+                categoriesName.push(str.name);
+              });
+              obj.semantic = categoriesName;
+              obj.value = categoriesIds;
+            } else if (item.operator.value === 'ISNULL') {
+              obj.semantic = ['为空'];
+              obj.value = ['ISNULL'];
+            } else if (item.operator.value === 'NONULL') {
+              obj.semantic = ['不为空'];
+              obj.value = ['NONULL'];
+            }
+            break;
+          case 'SELECT_MULTIPLE_TREE':
+            // 下拉树多选
+            if (item.value) {
+              var ids = [];
+              var names = [];
+              var _list = item.value;
+              _list.forEach(function (str) {
+                ids.push(str.id);
+                names.push(str.name);
+              });
+              obj.semantic = names;
+              obj.value = names;
+            } else if (nullList.includes(item.operator.value)) {
+              obj.value = [NULL_MAP[item.operator.value].label];
+              obj.semantic = [NULL_MAP[item.operator.value].label];
+            }
+            break;
+          case 'SELECT_TREE':
+            // 下拉树单选
+            if (item.value) {
+              obj.semantic = [item.field.label];
+              obj.value = [item.field.label];
+            } else if (nullList.includes(item.operator.value)) {
+              obj.value = [NULL_MAP[item.operator.value].value];
+              obj.semantic = [NULL_MAP[item.operator.value].label];
+            }
+            break;
+          case 'MULTIPLE_SELECT':
+            // 下拉多选
+            if (item.value) {
+              var _item$value;
+              var values = (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.map(function (el) {
+                var findTemp = item.field.dataSource.find(function (innerItem) {
+                  return innerItem.value === el;
+                });
+                return (findTemp || {}).label;
+              });
+              obj.value = values;
+              obj.semantic = values;
+            } else if (nullList.includes(item.operator.value)) {
+              obj.value = [NULL_MAP[item.operator.value].value];
+              obj.semantic = [NULL_MAP[item.operator.value].label];
+            }
+            break;
+          case 'SELECT':
+            // 下拉单选
+            if (item.value) {
+              obj.value = [item.value];
+              var _list2 = item.field.dataSource.filter(function (el) {
+                return el.value === item.value;
+              });
+              obj.semantic = [_list2[0].label];
+            } else if (nullList.includes(item.operator.value)) {
+              obj.value = [NULL_MAP[item.operator.value].value];
+              obj.semantic = [NULL_MAP[item.operator.value].label];
+            }
+            break;
+          case 'NUMBER_INT': // 整数
+          case 'NUMBER_DECIMAL':
+            // 小数
+            if (item.value || item.value === 0) {
+              obj.semantic = Array.isArray(item.value) ? item.value : [item.value];
+              obj.value = Array.isArray(item.value) ? item.value : [item.value];
+            } else if (nullList.includes(item.operator.value)) {
+              obj.value = [NULL_MAP[item.operator.value].value];
+              obj.semantic = [NULL_MAP[item.operator.value].label];
+            }
+            break;
+          case 'STRING':
+            // 字符
+            if (item.value) {
+              if (item.operator.value === 'LIKE') {
+                // 假如是like操作还需要区分出或者还是并且的关系
+                obj.value = item.value.value.map(function (val) {
+                  return val.replace(reg, '\\\'');
+                });
+                obj.multiText = item.value.relation ? 'AND' : 'OR';
+                obj.semantic = item.value;
+              } else if (Array.isArray(item.value)) {
+                obj.semantic = item.value.filter(function (val) {
+                  return val !== '';
+                });
+                obj.value = item.value.filter(function (val) {
+                  return val !== '';
+                }).map(function (val) {
+                  return val.replace(reg, '\\\'');
+                });
+              } else {
+                obj.semantic = [item.value];
+                obj.value = [item.value.replace(reg, '\\\'')];
+              }
+            } else if (nullList.includes(item.operator.value)) {
+              obj.value = [NULL_MAP[item.operator.value].value];
+              obj.semantic = [NULL_MAP[item.operator.value].label];
+            }
+            break;
+        }
+      }
+      arr.push(obj);
+    });
+    return arr;
+  }
+  function copyText(semantic) {
+    return function copy() {
+      shuyunUtils.copyText(semantic.join(','));
+      cloudReact.Message.success('复制成功');
+    };
+  }
+
+  /**
+   * 通用类将查询条件转化为字符串方法
+   * @param {*} array
+   */
+  function queryConditionToString(array) {
+    var PROD_PRODUCT_ID = FIELD_STACKS.PROD_PRODUCT_ID,
+      PROD_OUTER_ID = FIELD_STACKS.PROD_OUTER_ID,
+      SKU_SKU_ID = FIELD_STACKS.SKU_SKU_ID,
+      SKU_OUTER_ID = FIELD_STACKS.SKU_OUTER_ID;
+    var obj = {
+      str: [],
+      title: [],
+      value: array
+    };
+    array.forEach(function (item) {
+      var operator = item.operator,
+        fieldName = item.fieldName,
+        field = item.field,
+        operatorName = item.operatorName,
+        relative = item.relative,
+        semantic = item.semantic,
+        timeUnit = item.timeUnit;
+      switch (operator) {
+        case OPERATOR_STACKS.TAG_ISNULL:
+        case OPERATOR_STACKS.TAG_NONULL:
+        case OPERATOR_STACKS.ISNULL:
+        case OPERATOR_STACKS.NONULL:
+          obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName));
+          obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName));
+          break;
+        case OPERATOR_STACKS.BETWEEN_CLOSE:
+        case OPERATOR_STACKS.BETWEEN_OPEN:
+          if (field === 'prod.online_time' && relative) {
+            obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName, "\u8FC7\u53BB").concat(semantic[0], "-").concat(semantic[1]).concat(timeUnit ? '月' : '天'));
+            obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName, "\u8FC7\u53BB").concat(semantic[0], "-").concat(semantic[1]).concat(timeUnit ? '月' : '天'));
+          } else {
+            obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic[0], "-").concat(semantic[1]));
+            obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic[0], "-").concat(semantic[1]));
+          }
+          break;
+        case OPERATOR_STACKS.LIKE:
+          /* eslint-disable-next-line */
+          var connectSymbol = {
+            OR: '或',
+            AND: '和'
+          }[item.multiText] || ',';
+          if (item.multiText) {
+            var _semantic$value, _semantic$value2;
+            obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic === null || semantic === void 0 ? void 0 : (_semantic$value = semantic.value) === null || _semantic$value === void 0 ? void 0 : _semantic$value.join(connectSymbol)));
+            obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic === null || semantic === void 0 ? void 0 : (_semantic$value2 = semantic.value) === null || _semantic$value2 === void 0 ? void 0 : _semantic$value2.join(connectSymbol)));
+          } else {
+            obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic === null || semantic === void 0 ? void 0 : semantic.join(connectSymbol)));
+            obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic === null || semantic === void 0 ? void 0 : semantic.join(connectSymbol)));
+          }
+          break;
+        default:
+          if ([PROD_PRODUCT_ID, PROD_OUTER_ID, SKU_SKU_ID, SKU_OUTER_ID].includes(field) && operator === OPERATOR_STACKS.EQ) {
+            obj.str.push([fieldName, '=', /*#__PURE__*/React__default['default'].createElement("span", {
+              key: semantic.toString(),
+              onClick: copyText(item.semantic),
+              style: {
+                padding: '0 4px',
+                cursor: 'pointer'
+              }
+            }, semantic.length), '个'
+            // `${getSuffixNameByField(item.field)}`
+            ]);
+          } else {
+            obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic.join(',')));
+          }
+          obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic.join(',')));
+          break;
+      }
+    });
+    obj.str = obj.str.reduce(function (acc, item, idx) {
+      if (idx > 0) acc.push(', ');
+      acc.push(item);
+      return acc;
+    }, []);
+    return obj;
+  }
+
+  /**
+   * 计算已选商品和sku的数量
+   * @param {*} Object || Array
+   */
+  function resultGoodsLength(obj) {
+    var len = 0;
+    if (Array.isArray(obj)) {
+      obj.forEach(function (item) {
+        if (item.rowExpandable) {
+          len += item.skus.length;
+        } else {
+          len += 1;
+        }
+      });
+    } else {
+      Object.keys(obj).forEach(function (item) {
+        if (obj[item].rowExpandable) {
+          // 假如是sku展开状态则商品数量以sku数量为准
+          len += obj[item].skus.length;
+        } else {
+          len += 1;
+        }
+      });
+    }
+    return len;
+  }
+
   var Store = /*#__PURE__*/function () {
     function Store() {
       _classCallCheck(this, Store);
@@ -3999,7 +4652,7 @@
               case 0:
                 url = "".concat(server, "/product-selector/2.0/batch/import?tenant=").concat(extraQuery);
                 _context7.next = 3;
-                return http.post(url, data);
+                return http.post(url, filterNullValueObject(data));
               case 3:
                 result = _context7.sent;
                 if (result.data.success) {
@@ -4349,640 +5002,6 @@
   }();
   var Store$1 = new Store();
 
-  var shuyunUtils = createCommonjsModule(function (module, exports) {
-  (function () {var b={};function p(o){return (p="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})(o)}var c=function(o,t){return JSON.stringify(o)===JSON.stringify(t)};var q=function(o,t){var e=-1;return o.some(function(o,r){return c(o,t)&&(e=r),c(o,t)}),e};var u=function(o){return JSON.parse(JSON.stringify(o))};var v=function(o){var t=!0;for(var e in o)o.hasOwnProperty(e)&&(t=!1);return t};var d=function(o){return {"[object String]":"string","[object Boolean]":"boolean","[object Undefined]":"undefined","[object Number]":"number","[object Object]":"object","[object Error]":"error","[object Function]":"function","[object Date]":"date","[object Array]":"array","[object RegExp]":"regexp","[object Null]":"null","[object NodeList]":"nodeList","[object Arguments]":"arguments","[object Window]":"window","[object HTMLDocument]":"document"}[Object.prototype.toString.call(o)]||(o instanceof Element?"element":"")};var w=function(o){return "string"==typeof o?o.trim():Object.keys(o).reduce(function(t,e){var r=o[e];return "undefined"===d(r)||"null"===d(r)?t:(t[e]=r,t)},{})};var x=function(o){var t="";for(var e in o){var r=o[e];r="object"===p(r)?JSON.stringify(r):r,t="".concat(t,"&").concat(e,"=").concat(r);}return t.replace("&","")};function f(r,e){var t=Object.keys(r);if(Object.getOwnPropertySymbols){var o=Object.getOwnPropertySymbols(r);e&&(o=o.filter(function(e){return Object.getOwnPropertyDescriptor(r,e).enumerable})),t.push.apply(t,o);}return t}function g(r){for(var e=1;e<arguments.length;e++){var t=null!=arguments[e]?arguments[e]:{};e%2?f(Object(t),!0).forEach(function(e){h(r,e,t[e]);}):Object.getOwnPropertyDescriptors?Object.defineProperties(r,Object.getOwnPropertyDescriptors(t)):f(Object(t)).forEach(function(e){Object.defineProperty(r,e,Object.getOwnPropertyDescriptor(t,e));});}return r}function h(r,e,t){return e in r?Object.defineProperty(r,e,{value:t,enumerable:!0,configurable:!0,writable:!0}):r[e]=t,r}function y(r,e){return C(r)||B(r,e)||A(r,e)||z()}function z(){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 A(r,e){if(r){if("string"==typeof r)return j(r,e);var t=Object.prototype.toString.call(r).slice(8,-1);return "Object"===t&&r.constructor&&(t=r.constructor.name),"Map"===t||"Set"===t?Array.from(r):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?j(r,e):void 0}}function j(r,e){(null==e||e>r.length)&&(e=r.length);for(var t=0,o=new Array(e);t<e;t++)o[t]=r[t];return o}function B(r,e){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(r)){var t=[],o=!0,n=!1,a=void 0;try{for(var $,s=r[Symbol.iterator]();!(o=($=s.next()).done)&&(t.push($.value),!e||t.length!==e);o=!0);}catch(i){n=!0,a=i;}finally{try{o||null==s.return||s.return();}finally{if(n)throw a}}return t}}function C(r){if(Array.isArray(r))return r}var D=function(r){return r.replace(/-\w/g,function(r){return r.split("-")[1].toUpperCase()})};var E=function(r){return r.replace(/([A-Z])/g,"-$1").toLowerCase()};var F=function(r){return r.replace(/^\?/,"").split("&").reduce(function(r,e){var t=y(e.split("="),2),o=t[0],n=t[1],a=void 0===n?"":n;return g(g({},r),{},h({},o,a))},{})};var k=function(e,t,r,n){var o={percentile:{digits:100,sign:"%"},thousands:{digits:1e3,sign:"\u2030"}}[e],s=Math.pow(10,r),$=parseInt(t*o.digits*s,10)/s;return n?Number($).toFixed(r)+o.sign:$+o.sign},G=function(e,t){var r=!(arguments.length>2&&void 0!==arguments[2])||arguments[2];return k("percentile",e,t,r)};var H=function(e,t){var r=!(arguments.length>2&&void 0!==arguments[2])||arguments[2];return k("thousands",e,t,r)};var I=function(e){var t=document.createElement("input");t.style.cssText="position:absolute;top:0;z-index: -999;",t.value=e,document.body.appendChild(t),t.select();var o=document.execCommand("copy");return t.remove(),o};var J=function(e){var t=document.createElement("div");t.style.display="inline-block",t.style.opacity="0",t.innerText=e,document.body.appendChild(t);var o=window.getComputedStyle(t).width;return document.body.removeChild(t),parseInt(o,10)};var K=function(t,e){var o=Blob.prototype,n=null;if(Object.getPrototypeOf(t)===o&&(n=t),t.data&&Object.getPrototypeOf(t.data)===o&&(n=t.data),!n||Object.getPrototypeOf(n)!==o)return !1;var r=document.createElement("a");r.addEventListener("click",function(){r.download=e,r.href=Window.URL.createObjectURL(n);});var a=document.createEvent("MouseEvents");return a.initEvent("click",!1,!1),r.dispatchEvent(a),!0};function L(t){return (L="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function M(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function l(t,e){for(var r=0;r<e.length;r++){var a=e[r];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(t,a.key,a);}}function N(t,e,r){return e&&l(t.prototype,e),r&&l(t,r),t}var O=function(){function t(e){switch(M(this,t),L(e)){case"number":if(13===e.toString().length)return void this.parseDate(new Date(e));this.parseStr(e.toString());break;case"string":this.parseStr(e);break;case"object":this.parseDate(e.constructor===Date?e:new Date);break;default:this.parseDate(new Date);}}return N(t,[{key:"parseStr",value:function(t){var e=t.replace(/\D/g,""),r={fullYear_str:e.substr(0,4),year_str:e.substr(2,4),month_str:e.substr(4,2),date_str:e.substr(6,2),hour_str:e.substr(8,2),minute_str:e.substr(10,2),second_str:e.substr(12,2)};if(r.fullYear_str&&r.month_str&&r.date_str){var a="".concat(r.fullYear_str,"/").concat(r.month_str,"/").concat(r.date_str," ").concat(r.hour_str||"00",":").concat(r.minute_str||"00",":").concat(r.second_str||"00");this.parseDate(new Date(a));}else this.parseDate(new Date);}},{key:"parseDate",value:function(t){this.fullYear=t.getFullYear(),this.year=parseInt(t.getFullYear().toString().substr(2,2)),this.month=t.getMonth()+1,this.date=t.getDate(),this.hour=t.getHours(),this.minute=t.getMinutes(),this.second=t.getSeconds(),this.day=t.getDay();}},{key:"format",value:function(t){return t.replace(/YYYY/i,this.fullYear).replace(/YY/i,this.year<10?"0".concat(this.year):this.year).replace(/MM/,this.month<10?"0".concat(this.month):this.month).replace(/DD/i,this.date<10?"0".concat(this.date):this.date).replace(/HH/i,this.hour<10?"0".concat(this.hour):this.hour).replace(/mm/,this.minute<10?"0".concat(this.minute):this.minute).replace(/ss/i,this.second<10?"0".concat(this.second):this.second)}}]),t}(),P=function(t){return new O(t)};var m={copyText:I,getTextWidth:J,moment:P,equal:c,index:q,clone:u,isEmpty:v,type:d,trim:w,toQueryString:x,toHump:D,toHyphen:E,toFormData:F,toPercentile:G,toThousands:H,download:K};b.default=m,b=m;{module.exports=b;}})();
-  });
-
-  var NULL_MAP = {
-    ISNULL: {
-      label: '为空',
-      value: 'ISNULL'
-    },
-    NONULL: {
-      label: '不为空',
-      value: 'NONULL'
-    }
-  };
-  var TAG_NULL_MAP = {
-    TAG_ISNULL: {
-      label: '为空',
-      value: 'TAG_ISNULL'
-    },
-    TAG_NONULL: {
-      label: '不为空',
-      value: 'TAG_NONULL'
-    }
-  };
-  var reg = new RegExp('\'', 'g');
-  var nullList = ['ISNULL', 'NONULL'];
-  function queryTypeMap(moduleType, type) {
-    switch (moduleType) {
-      case 'SELECT':
-        return {
-          operator: 'EQ',
-          operatorName: '等于',
-          rules: 'defalut'
-        };
-      case 'INPUT':
-        return {
-          operator: type === 'SINGLE' ? 'EQ' : 'LIKE',
-          operatorName: type === 'SINGLE' ? '等于' : '内容包含',
-          rules: type === 'SINGLE' ? 'defalut' : 'split'
-        };
-      case 'SELECT_TREE':
-        return {
-          operator: 'EQ',
-          operatorName: '等于',
-          rules: 'normal'
-        };
-      case 'SELECT_INPUT':
-        return {
-          operator: 'SUB_PATTERN',
-          operatorName: '符合模式(截断)',
-          rules: 'sub_pattern'
-        };
-      case 'NUMBER':
-        return {
-          operator: 'BETWEEN_CLOSE',
-          operatorName: '介于(闭区间)',
-          rules: 'between'
-        };
-      case 'DATE':
-        return {
-          operator: type === 'DATE_M' ? 'EQ' : 'BETWEEN_CLOSE',
-          operatorName: type === 'DATE_M' ? '等于' : '介于(闭区间)',
-          rules: type === 'DATE_M' ? 'defalut' : 'between'
-        };
-    }
-    return null;
-  }
-  function configQueryMap(data, query) {
-    var obj = {};
-    data.forEach(function (item) {
-      if (item.groupName) {
-        var optObj = {};
-        if (item.moduleType !== 'NO_VALUE') {
-          optObj = queryTypeMap(item.moduleType, item.type);
-        } else if (query[item.itemId]) {
-          var id = query[item.itemId];
-          optObj.operator = TAG_NULL_MAP[id].value;
-          optObj.operatorName = TAG_NULL_MAP[id].label;
-          optObj.rules = 'noValue';
-        }
-        obj = _objectSpread2(_objectSpread2({}, obj), {}, _defineProperty({}, item.itemId, _objectSpread2({
-          field: item.itemId,
-          desc: item.itemName,
-          tagsFlag: 'tags',
-          type: item.type,
-          moduleType: item.moduleType,
-          dataSource: item.configs,
-          status: item.status
-        }, optObj)));
-      } else {
-        obj = _objectSpread2(_objectSpread2({}, obj), {}, _defineProperty({}, item.itemId, _objectSpread2(_objectSpread2({}, QUERY_MAP[item.itemId]), {}, {
-          type: item.type,
-          moduleType: item.moduleType,
-          dataSource: item.configs,
-          status: item.status,
-          tagsFlag: null
-        })));
-      }
-    });
-    return obj;
-  }
-
-  /**
-   * 数组去重
-   */
-  function unique(array) {
-    var keyFn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (item) {
-      return item;
-    };
-    var hash = {};
-    var result = [];
-    array.forEach(function (item) {
-      var key = keyFn(item);
-      if (key in hash) return;
-      result.push(item);
-      hash[key] = null;
-    });
-    return result;
-  }
-  function genPlatShopValue(platList, shopList, platShop) {
-    var _platCode = platShop.platCode,
-      _shopId = platShop.shopId;
-    var defaultPlat = platList[0] && platList[0].platCode;
-    var platCode = platList.find(function (plat) {
-      return plat.platCode === _platCode;
-    }) ? _platCode : defaultPlat;
-    var defaultShop = (shopList.find(function (shop) {
-      return shop.platCode === platCode;
-    }) || {}).shopId;
-    var shopId = shopList.find(function (shop) {
-      return shop.shopId === _shopId;
-    }) ? _shopId : defaultShop;
-    return {
-      shopId: shopId,
-      platCode: platCode
-    };
-  }
-
-  /**
-   * 全部商品tab-请求参数转化
-   * @param {*} data 需要转化的数据
-   * @param {*} config 配置项枚举信息
-   */
-  function allTabFormatting(config, data) {
-    var arr = [];
-    Object.keys(data).forEach(function (item) {
-      if (config[item]) {
-        var obj = {
-          field: config[item].field,
-          fieldName: config[item].desc,
-          configName: item,
-          tagsFlag: config[item].tagsFlag,
-          operator: config[item].operator,
-          operatorName: config[item].operatorName
-        };
-        switch (config[item].rules) {
-          case 'normal':
-            if (data[item]) {
-              if (config[item].type === 'SINGLE') {
-                obj.value = [data[item].value];
-                obj.semantic = [data[item].label];
-              } else {
-                var ids = [];
-                var names = [];
-                data[item].forEach(function (str) {
-                  ids.push(str.id);
-                  names.push(str.name);
-                });
-                obj.semantic = names;
-                obj.value = config[item].tagsFlag ? names : ids;
-              }
-            }
-            break;
-          case 'between':
-            data[item].start = "".concat(data[item].start);
-            data[item].end = "".concat(data[item].end);
-            if (data[item].datetype) {
-              obj.relative = data[item].datetype;
-            }
-            if (data[item].dateUnit) {
-              obj.timeUnit = data[item].dateUnit;
-            }
-            if (data[item].start || data[item].end) {
-              obj.value = [data[item].start, data[item].end];
-              obj.semantic = [data[item].start, data[item].end];
-            }
-            break;
-          case 'split':
-            if (data[item]) {
-              var _value = data[item].replace(reg, '\\\'');
-              obj.value = _value.split(',');
-              obj.semantic = data[item].split(',');
-            }
-            break;
-          case 'sub_pattern':
-            if (data[item]) {
-              if (typeof data[item] === 'string') {
-                var _value2 = data[item].replace(reg, '\\\'');
-                obj.value = [_value2];
-                var val = data[item].split(':');
-                if (val.length > 1) {
-                  obj.semantic = ["\u622A\u53D6".concat(val[0], "\u81F3").concat(val[1], "\u4F4D\uFF0C\u5B57\u7B26\u662F").concat(val[2])];
-                } else {
-                  obj.operatorName = '等于';
-                  obj.semantic = [data[item]];
-                }
-              }
-            }
-            break;
-          default:
-            if (data[item]) {
-              if (config[item].field === 'platCode') {
-                // 假如平台code标识，需要找出平台名称
-                data.platList.forEach(function (val) {
-                  if (val.platCode === data[item]) {
-                    obj.semantic = [val.platName];
-                    obj.value = [data[item]];
-                  }
-                });
-              } else if (config[item].field === 'shopId') {
-                // 假如是店铺ID标识，需要找出店铺名称
-                data.shopList.forEach(function (val) {
-                  if (val.shopId === data[item]) {
-                    obj.semantic = [val.shopName];
-                    obj.value = [data[item]];
-                  }
-                });
-              } else if (config[item].moduleType === 'SELECT' || config[item].moduleType === 'DATE') {
-                if (config[item].type === 'SINGLE') {
-                  var _list = config[item].dataSource.filter(function (el) {
-                    return el.value === data[item];
-                  });
-                  obj.semantic = [_list[0].label];
-                  obj.value = config[item].tagsFlag ? [_list[0].label] : [_list[0].value];
-                } else if (config[item].type === 'MULTIPLE' || config[item].type === 'DATE_M') {
-                  var values = data[item] && data[item].map(function (el) {
-                    var findTemp = config[item].dataSource.find(function (innerItem) {
-                      return innerItem.value === el;
-                    });
-                    return (findTemp || {}).label;
-                  });
-                  obj.value = values;
-                  obj.semantic = values;
-                } else if (config[item].moduleType === 'N0_VALUE') {
-                  obj.semantic = NULL_MAP[data[item]].label;
-                  obj.value = [data[item]];
-                  obj.operator = NULL_MAP[data[item]].value;
-                  obj.operatorName = NULL_MAP[data[item]].label;
-                } else {
-                  obj.semantic = [data[item]];
-                  obj.value = [data[item]];
-                }
-              } else {
-                obj.semantic = [data[item]];
-                var _value3 = data[item].replace(reg, '\\\'');
-                obj.value = [_value3];
-              }
-            }
-        }
-        arr.push(obj);
-      }
-    });
-    /**
-     *
-     */
-    return arr.filter(function (item) {
-      return item.value && item.value.length >= 1;
-    });
-  }
-
-  /**
-   * 商品选择tab窗口，根据筛选条件格式化数据
-   * @param {*} data
-   */
-  function parsingCondition(data) {
-    var arr = [];
-    var list = ['shopId', 'prod.outer_id', 'sku.outer_id', 'prod.product_id', 'sku.sku_id'];
-    data.forEach(function (item) {
-      var obj = {
-        field: '',
-        fieldName: '',
-        operator: '',
-        operatorName: '',
-        semantic: [],
-        value: []
-      };
-      obj.tagsFlag = item.field.groupName ? 'tags' : null;
-      obj.field = item.field.field;
-      obj.fieldName = item.field.desc;
-      obj.operator = item.operator.value;
-      obj.operatorName = item.operator.label;
-      if (list.includes(item.field.field)) {
-        switch (item.field.field) {
-          case 'shopId':
-            // 上架店铺(需要解析出平台code)
-            if (item.value) {
-              arr.push({
-                field: 'platCode',
-                fieldName: '平台名称',
-                operator: item.operator.value,
-                operatorName: '等于',
-                semantic: [item.value.plat.label],
-                value: [item.value.plat.value]
-              });
-              obj.semantic = item.value.shops.map(function (shop) {
-                return shop.label;
-              });
-              obj.value = item.value.shops.map(function (shop) {
-                return shop.value;
-              });
-            }
-            break;
-          case 'prod.outer_id': // 商品商家编码
-          case 'sku.outer_id':
-            // sku商家编码
-            if (item.value) {
-              if (item.operator.value === 'SUB_PATTERN') {
-                // 如果是截断模式
-                obj.value = ["".concat(item.value.begin, ":").concat(item.value.end, ":").concat(item.value.value.replace(reg, '\\\''))];
-                obj.semantic = ["\u622A\u53D6".concat(item.value.begin, "\u81F3").concat(item.value.end, "\u4F4D,\u5B57\u7B26\u662F").concat(item.value.value)];
-              } else if (Array.isArray(item.value)) {
-                obj.semantic = item.value.filter(function (val) {
-                  return val !== '';
-                });
-                obj.value = item.value.filter(function (val) {
-                  return val !== '';
-                }).map(function (val) {
-                  return val.replace(reg, '\\\'');
-                });
-              } else {
-                obj.semantic = [item.value];
-                obj.value = [item.value.replace(reg, '\\\'')];
-              }
-            } else if (nullList.includes(item.operator.value)) {
-              obj.value = [NULL_MAP[item.operator.value].value];
-              obj.semantic = [NULL_MAP[item.operator.value].label];
-            }
-            break;
-          case 'prod.product_id':
-          case 'sku.sku_id':
-            if (item.value) {
-              if (Array.isArray(item.value)) {
-                obj.semantic = item.value.filter(function (val) {
-                  return val !== '';
-                });
-                obj.value = item.value.filter(function (val) {
-                  return val !== '';
-                }).map(function (val) {
-                  return val.replace(reg, '\\\'');
-                });
-              } else {
-                obj.semantic = [item.value];
-                obj.value = [item.value.replace(reg, '\\\'')];
-              }
-            }
-            break;
-        }
-      } else {
-        switch (item.field.type) {
-          case 'NO_VALUE':
-            // 无值类
-            obj.semantic = [item.operator.label];
-            obj.value = [item.operator.value];
-            break;
-          case 'DATE_YMD': // 年月日
-          case 'DATE_MD':
-            // 月日
-            if (item.value) {
-              if (item.operator.value === 'BETWEEN_CLOSE' || item.operator.value === 'BETWEEN_OPEN') {
-                // 假如是区间类型
-                obj.value = item.value ? [item.value.start || '', item.value.end || ''] : [item.value];
-                obj.semantic = item.value ? [item.value.start || '', item.value.end || ''] : [item.value];
-              } else if (nullList.includes(item.operator.value)) {
-                obj.value = [NULL_MAP[item.operator.value].value];
-                obj.semantic = [NULL_MAP[item.operator.value].label];
-              } else {
-                obj.value = item.value ? [item.value] : [''];
-                obj.semantic = item.value ? [item.value] : [''];
-              }
-            } else if (nullList.includes(item.operator.value)) {
-              obj.value = [NULL_MAP[item.operator.value].value];
-              obj.semantic = [NULL_MAP[item.operator.value].label];
-            }
-            break;
-          case 'DATE_M':
-            // 月
-            if (item.value) {
-              obj.value = item.value;
-              obj.semantic = item.value.map(function (el) {
-                var findTemp = item.field.dataSource.find(function (innerItem) {
-                  return Number(innerItem.value) === Number(el);
-                });
-                return (findTemp || {}).label;
-              });
-            } else if (nullList.includes(item.operator.value)) {
-              obj.value = [NULL_MAP[item.operator.value].value];
-              obj.semantic = [NULL_MAP[item.operator.value].label];
-            }
-            break;
-          case 'CATEGORY_SELECT_TREE':
-            obj.field = item.field.field;
-            obj.fieldName = item.field.desc;
-            obj.operator = item.operator.value;
-            obj.operatorName = item.operator.label;
-            if (item.value) {
-              var categoriesIds = [];
-              var categoriesName = [];
-              item.value.categories.forEach(function (str) {
-                categoriesIds.push(str.id);
-                categoriesName.push(str.name);
-              });
-              obj.semantic = categoriesName;
-              obj.value = categoriesIds;
-            } else if (item.operator.value === 'ISNULL') {
-              obj.semantic = ['为空'];
-              obj.value = ['ISNULL'];
-            } else if (item.operator.value === 'NONULL') {
-              obj.semantic = ['不为空'];
-              obj.value = ['NONULL'];
-            }
-            break;
-          case 'SELECT_MULTIPLE_TREE':
-            // 下拉树多选
-            if (item.value) {
-              var ids = [];
-              var names = [];
-              var _list = item.value;
-              _list.forEach(function (str) {
-                ids.push(str.id);
-                names.push(str.name);
-              });
-              obj.semantic = names;
-              obj.value = names;
-            } else if (nullList.includes(item.operator.value)) {
-              obj.value = [NULL_MAP[item.operator.value].label];
-              obj.semantic = [NULL_MAP[item.operator.value].label];
-            }
-            break;
-          case 'SELECT_TREE':
-            // 下拉树单选
-            if (item.value) {
-              obj.semantic = [item.field.label];
-              obj.value = [item.field.label];
-            } else if (nullList.includes(item.operator.value)) {
-              obj.value = [NULL_MAP[item.operator.value].value];
-              obj.semantic = [NULL_MAP[item.operator.value].label];
-            }
-            break;
-          case 'MULTIPLE_SELECT':
-            // 下拉多选
-            if (item.value) {
-              var _item$value;
-              var values = (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.map(function (el) {
-                var findTemp = item.field.dataSource.find(function (innerItem) {
-                  return innerItem.value === el;
-                });
-                return (findTemp || {}).label;
-              });
-              obj.value = values;
-              obj.semantic = values;
-            } else if (nullList.includes(item.operator.value)) {
-              obj.value = [NULL_MAP[item.operator.value].value];
-              obj.semantic = [NULL_MAP[item.operator.value].label];
-            }
-            break;
-          case 'SELECT':
-            // 下拉单选
-            if (item.value) {
-              obj.value = [item.value];
-              var _list2 = item.field.dataSource.filter(function (el) {
-                return el.value === item.value;
-              });
-              obj.semantic = [_list2[0].label];
-            } else if (nullList.includes(item.operator.value)) {
-              obj.value = [NULL_MAP[item.operator.value].value];
-              obj.semantic = [NULL_MAP[item.operator.value].label];
-            }
-            break;
-          case 'NUMBER_INT': // 整数
-          case 'NUMBER_DECIMAL':
-            // 小数
-            if (item.value || item.value === 0) {
-              obj.semantic = Array.isArray(item.value) ? item.value : [item.value];
-              obj.value = Array.isArray(item.value) ? item.value : [item.value];
-            } else if (nullList.includes(item.operator.value)) {
-              obj.value = [NULL_MAP[item.operator.value].value];
-              obj.semantic = [NULL_MAP[item.operator.value].label];
-            }
-            break;
-          case 'STRING':
-            // 字符
-            if (item.value) {
-              if (item.operator.value === 'LIKE') {
-                // 假如是like操作还需要区分出或者还是并且的关系
-                obj.value = item.value.value.map(function (val) {
-                  return val.replace(reg, '\\\'');
-                });
-                obj.multiText = item.value.relation ? 'AND' : 'OR';
-                obj.semantic = item.value;
-              } else if (Array.isArray(item.value)) {
-                obj.semantic = item.value.filter(function (val) {
-                  return val !== '';
-                });
-                obj.value = item.value.filter(function (val) {
-                  return val !== '';
-                }).map(function (val) {
-                  return val.replace(reg, '\\\'');
-                });
-              } else {
-                obj.semantic = [item.value];
-                obj.value = [item.value.replace(reg, '\\\'')];
-              }
-            } else if (nullList.includes(item.operator.value)) {
-              obj.value = [NULL_MAP[item.operator.value].value];
-              obj.semantic = [NULL_MAP[item.operator.value].label];
-            }
-            break;
-        }
-      }
-      arr.push(obj);
-    });
-    return arr;
-  }
-  function copyText(semantic) {
-    return function copy() {
-      shuyunUtils.copyText(semantic.join(','));
-      cloudReact.Message.success('复制成功');
-    };
-  }
-
-  /**
-   * 通用类将查询条件转化为字符串方法
-   * @param {*} array
-   */
-  function queryConditionToString(array) {
-    var PROD_PRODUCT_ID = FIELD_STACKS.PROD_PRODUCT_ID,
-      PROD_OUTER_ID = FIELD_STACKS.PROD_OUTER_ID,
-      SKU_SKU_ID = FIELD_STACKS.SKU_SKU_ID,
-      SKU_OUTER_ID = FIELD_STACKS.SKU_OUTER_ID;
-    var obj = {
-      str: [],
-      title: [],
-      value: array
-    };
-    array.forEach(function (item) {
-      var _semantic$value, _semantic$value2;
-      var operator = item.operator,
-        fieldName = item.fieldName,
-        field = item.field,
-        operatorName = item.operatorName,
-        relative = item.relative,
-        semantic = item.semantic,
-        timeUnit = item.timeUnit;
-      switch (operator) {
-        case OPERATOR_STACKS.TAG_ISNULL:
-        case OPERATOR_STACKS.TAG_NONULL:
-        case OPERATOR_STACKS.ISNULL:
-        case OPERATOR_STACKS.NONULL:
-          obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName));
-          obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName));
-          break;
-        case OPERATOR_STACKS.BETWEEN_CLOSE:
-        case OPERATOR_STACKS.BETWEEN_OPEN:
-          if (field === 'prod.online_time' && relative) {
-            obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName, "\u8FC7\u53BB").concat(semantic[0], "-").concat(semantic[1]).concat(timeUnit ? '月' : '天'));
-            obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName, "\u8FC7\u53BB").concat(semantic[0], "-").concat(semantic[1]).concat(timeUnit ? '月' : '天'));
-          } else {
-            obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic[0], "-").concat(semantic[1]));
-            obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic[0], "-").concat(semantic[1]));
-          }
-          break;
-        case OPERATOR_STACKS.LIKE:
-          /* eslint-disable-next-line */
-          var connectSymbol = {
-            OR: '或',
-            AND: '和'
-          }[item.multiText] || ',';
-          obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat((_semantic$value = semantic.value) === null || _semantic$value === void 0 ? void 0 : _semantic$value.join(connectSymbol)));
-          obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat((_semantic$value2 = semantic.value) === null || _semantic$value2 === void 0 ? void 0 : _semantic$value2.join(connectSymbol)));
-          break;
-        default:
-          if ([PROD_PRODUCT_ID, PROD_OUTER_ID, SKU_SKU_ID, SKU_OUTER_ID].includes(field) && operator === OPERATOR_STACKS.EQ) {
-            obj.str.push([fieldName, '=', /*#__PURE__*/React__default['default'].createElement("span", {
-              key: semantic.toString(),
-              onClick: copyText(item.semantic),
-              style: {
-                padding: '0 4px',
-                cursor: 'pointer'
-              }
-            }, semantic.length), '个'
-            // `${getSuffixNameByField(item.field)}`
-            ]);
-          } else {
-            obj.str.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic.join(',')));
-          }
-          obj.title.push("".concat(fieldName, "\uFF1A").concat(operatorName).concat(semantic.join(',')));
-          break;
-      }
-    });
-    obj.str = obj.str.reduce(function (acc, item, idx) {
-      if (idx > 0) acc.push(', ');
-      acc.push(item);
-      return acc;
-    }, []);
-    return obj;
-  }
-
-  /**
-   * 计算已选商品和sku的数量
-   * @param {*} Object || Array
-   */
-  function resultGoodsLength(obj) {
-    var len = 0;
-    if (Array.isArray(obj)) {
-      obj.forEach(function (item) {
-        if (item.rowExpandable) {
-          len += item.skus.length;
-        } else {
-          len += 1;
-        }
-      });
-    } else {
-      Object.keys(obj).forEach(function (item) {
-        if (obj[item].rowExpandable) {
-          // 假如是sku展开状态则商品数量以sku数量为准
-          len += obj[item].skus.length;
-        } else {
-          len += 1;
-        }
-      });
-    }
-    return len;
-  }
-
   /**
    * 全部商品查询条件
    * @param {*} platShopList 平台&店铺列表
@@ -13939,11 +13958,12 @@
         align: 'right',
         width: '160px',
         template: function template(checklistQuantity) {
+          var reg = new RegExp(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g);
           return /*#__PURE__*/React__default['default'].createElement("span", {
             style: {
               paddingRight: 10
             }
-          }, +checklistQuantity >= 0 ? checklistQuantity.toString().replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, '$1,') : '--');
+          }, +checklistQuantity >= 0 ? checklistQuantity.toString().replace(reg, '$1,') : '--');
         }
       }, {
         key: 'creatorName',
@@ -14493,7 +14513,11 @@
         }, /*#__PURE__*/React__default['default'].createElement("div", {
           className: classnames("".concat(prefixCls, "-black-selector"))
         }, /*#__PURE__*/React__default['default'].createElement(cloudReact.Tips, {
-          msg: TIPS_CONFIGS[type].tips
+          msg: (option === null || option === void 0 ? void 0 : option.tips) ? /*#__PURE__*/React__default['default'].createElement("span", {
+            dangerouslySetInnerHTML: {
+              __html: option === null || option === void 0 ? void 0 : option.tips
+            }
+          }) : TIPS_CONFIGS[type].tips
         }), /*#__PURE__*/React__default['default'].createElement(TableComponent, {
           onSelectedData: this.onSelectedData,
           showTypes: option.showTypes,
@@ -14517,7 +14541,8 @@
       selectedList: propTypes.array,
       showTypes: propTypes.array,
       isReadOnly: propTypes.bool,
-      isCheckAll: propTypes.bool
+      isCheckAll: propTypes.bool,
+      tips: propTypes.string
     }),
     onClose: propTypes.func,
     onCancel: propTypes.func,
@@ -14533,7 +14558,8 @@
       showTypes: TYPE_LIST_CONFIGS.black.map(function (item) {
         return item.value;
       }),
-      isCheckAll: true
+      isCheckAll: true,
+      tips: ''
     },
     type: 'black',
     // black: 黑名单 red：红名单
@@ -14734,11 +14760,12 @@
         align: 'right',
         width: 160,
         render: function render(checklistQuantity) {
+          var reg = new RegExp(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g);
           return /*#__PURE__*/React__default['default'].createElement("span", {
             style: {
               paddingRight: 10
             }
-          }, +checklistQuantity >= 0 ? checklistQuantity.toString().replace(/(\d)(?=(\d{3})+(?:\.\d+)?$)/g, '$1,') : '--');
+          }, +checklistQuantity >= 0 ? checklistQuantity.toString().replace(reg, '$1,') : '--');
         }
       }, {
         dataIndex: 'creatorName',
@@ -34103,7 +34130,8 @@
       };
       _this.thousandAndDecimal = function (num) {
         if (num) {
-          return parseFloat(num).toFixed(2).replace(/(\d)(?=(\d{3})+\.)/g, '$1,');
+          var reg = new RegExp(/(\d)(?=(\d{3})+\.)/g);
+          return parseFloat(num).toFixed(2).replace(reg, '$1,');
         } else {
           return '0.00';
         }
@@ -43665,6 +43693,824 @@
     visible: false
   };
 
+  /**
+   * 此文件记录一些通用 & 默认配置项
+   */
+  var DEFAULT_TABLE_SKU_ROW = ['productName', 'productId', 'outerId', 'price', 'stock', 'onlineTime', 'status', 'platName', 'shopName', 'showCategoryName', 'showSellerCategoryName', 'skuTotal', 'sku'];
+  var DEFAULT_TABLE_ROW$1 = ['productName', 'productId', 'outerId', 'price', 'stock', 'onlineTime', 'status', 'platName', 'shopName', 'showCategoryName', 'showSellerCategoryName'];
+  var IS_STANDARD_CATE$1 = ['YDH', 'PDD', 'REDBOOK', 'WEIMOB', 'VIP']; // 区分哪些平台不具有标准类目
+  // export const IS_STANDARD_CATE = ['TAOBAO', 'YOUZAN', 'JOS', 'SUNING', 'DOUYIN', 'OFFLINE', 'DANGDANG', 'MOGUJIE', 'WEIXIN'] // 区分哪些平台具有标准类目
+  // export const IS_CUSTOM_CATE = ['YHD', 'SUNING', 'MGJ', 'OFFLINE', 'DD', 'WEIXIN', 'PDD', 'REDBOOK', 'WEIMOB', 'DOUYIN', 'VIP'] // 区分哪些平台不具有自定义类目
+  var IS_CUSTOM_CATE$1 = ['TAOBAO', 'JOS', 'YOUZAN']; // 区分哪些平台有自定义类目
+  var SKU_STATUS_MAP = {
+    'SY_ONLINE': '在架',
+    'SY_OFFLINE': '下架',
+    'SY_SAIL_OVER': '售罄',
+    '': '不限'
+  };
+  var QUERY_MAP$1 = {
+    // 全部商品tab窗口与查询条件枚举关系
+    platCode: {
+      field: 'platCode',
+      // 接口对应字段
+      operator: 'EQ',
+      // 查询条件
+      operatorName: '等于',
+      desc: '平台名称',
+      // 描述
+      rules: 'defalut' // 对应字段解析规则
+    },
+
+    shopId: {
+      field: 'shopId',
+      operator: 'EQ',
+      operatorName: '等于',
+      desc: '店铺名称',
+      rules: 'defalut'
+    },
+    prod_product_id: {
+      field: 'prod.product_id',
+      operator: 'EQ',
+      operatorName: '等于',
+      desc: '商品ID',
+      rules: 'defalut'
+    },
+    prod_product_name: {
+      field: 'prod.product_name',
+      operator: 'LIKE',
+      operatorName: '内容包含',
+      desc: '商品名称',
+      rules: 'split'
+    },
+    prod_category_tree: {
+      field: 'prod.category_id',
+      operator: 'EQ',
+      operatorName: '等于',
+      desc: '标准类目',
+      rules: 'normal'
+    },
+    prod_seller_tree: {
+      field: 'prod.seller_cid',
+      operator: 'EQ',
+      operatorName: '等于',
+      desc: '自定义类目',
+      rules: 'normal'
+    },
+    prod_status: {
+      field: 'prod.status',
+      operator: 'EQ',
+      operatorName: '等于',
+      desc: '商品状态',
+      rules: 'defalut'
+    },
+    prod_stock: {
+      field: 'prod.stock',
+      operator: 'BETWEEN_CLOSE',
+      operatorName: '介于(闭区间)',
+      desc: '库存',
+      rules: 'between'
+    },
+    prod_outer_id: {
+      field: 'prod.outer_id',
+      operator: 'SUB_PATTERN',
+      operatorName: '符合模式(截断)',
+      desc: '商品商家编码',
+      rules: 'sub_pattern'
+    },
+    prod_price: {
+      field: 'prod.price',
+      operator: 'BETWEEN_CLOSE',
+      operatorName: '介于(闭区间)',
+      desc: '价格',
+      rules: 'between'
+    },
+    prod_online_time: {
+      field: 'prod.online_time',
+      operator: 'BETWEEN_CLOSE',
+      operatorName: '介于(闭区间)',
+      desc: '上架时间',
+      rules: 'between'
+    },
+    sku_flag: {
+      field: 'sku_flag',
+      operator: 'EQ',
+      operatorName: '等于',
+      desc: '是否有SKU',
+      rules: 'default'
+    },
+    sku_sku_id: {
+      field: 'sku.sku_id',
+      operator: 'EQ',
+      operatorName: '等于',
+      desc: 'SKU ID',
+      rules: 'default'
+    },
+    sku_outer_id: {
+      field: 'sku.outer_id',
+      operator: 'SUB_PATTERN',
+      operatorName: '符合模式(截断)',
+      desc: 'SKU商家编码',
+      rules: 'sub_pattern'
+    },
+    sku_specification: {
+      field: 'sku.specification',
+      operator: 'LIKE',
+      operatorName: '内容包含',
+      desc: 'SKU名称',
+      rules: 'default'
+    }
+  };
+  var SELECTED_TAB_GOODS_TYPE$1 = [
+  // 已选择商品tab窗口,下拉选择配置
+  {
+    labelKey: '商品标题',
+    valueKey: 'productName',
+    isSku: false
+  }, {
+    labelKey: '商品ID',
+    valueKey: 'productId',
+    isSku: false
+  }, {
+    labelKey: '商品商家编码',
+    valueKey: 'outerId',
+    isSku: false
+  }, {
+    labelKey: 'SKU ID',
+    valueKey: 'skuId',
+    isSku: true
+  }, {
+    labelKey: 'SKU商家编码',
+    valueKey: 'outerSkuId',
+    isSku: true
+  }, {
+    labelKey: 'SKU名称',
+    valueKey: 'skuDetail',
+    isSku: true
+  }];
+  var FIELD_STACKS$1 = {
+    SHOP_ID: 'shopId',
+    // 上架店铺
+    PLAT_CODE: 'platCode',
+    // 平台
+    PROD_PRICE: 'prod.price',
+    // 价格
+    PROD_STOCK: 'prod.stock',
+    // 库存
+    PROD_STATUS: 'prod.status',
+    // 商品状态
+    PROD_OUTER_ID: 'prod.outer_id',
+    // 商品商家编码
+    PROD_SELLER_ID: 'prod.seller_cid',
+    // 自定义类目
+    PROD_PRODUCT_ID: 'prod.product_id',
+    // 商品ID
+    PROD_CATEGORY_ID: 'prod.category_id',
+    // 标准类目
+    PROD_ONLINE_TIME: 'prod.online_time',
+    // 上架时间
+    PROD_PRODUCT_NAME: 'prod.product_name',
+    // 商品名称
+
+    SKU_FLAG: 'sku_flag',
+    // 是否有SKU
+    SKU_PRICE: 'sku.price',
+    // SKU属性 > SKU价格
+    SKU_STOCK: 'sku.stock',
+    // SKU属性 > SKU库存
+    SKU_SKU_ID: 'sku.sku_id',
+    // SKU属性 > SKU ID
+    SKU_STATUS: 'sku.status',
+    // SKU属性 > SKU在架状态
+    SKU_OUTER_ID: 'sku.outer_id',
+    // SKU属性 > SKU 商家编码
+    SKU_SPECIFICATION: 'sku.specification' // SKU属性 > SKU名称
+  };
+
+  var OPERATOR_STACKS$1 = {
+    EQ: 'EQ',
+    LT: 'LT',
+    GT: 'GT',
+    LIKE: 'LIKE',
+    END_LIKE: 'END_LIKE',
+    BEGIN_LIKE: 'BEGIN_LIKE',
+    SUB_PATTERN: 'SUB_PATTERN',
+    BETWEEN_OPEN: 'BETWEEN_OPEN',
+    BETWEEN_CLOSE: 'BETWEEN_CLOSE',
+    ISNULL: 'ISNULL',
+    NONULL: 'NONULL',
+    NOT_EQ: 'NOT_EQ',
+    TAG_ISNULL: 'TAG_ISNULL',
+    TAG_NONULL: 'TAG_NONULL',
+    BETWEEN_RELATIVE: 'BETWEEN_RELATIVE'
+  };
+
+  var NULL_MAP$1 = {
+    ISNULL: {
+      label: '为空',
+      value: 'ISNULL'
+    },
+    NONULL: {
+      label: '不为空',
+      value: 'NONULL'
+    }
+  };
+  var TAG_NULL_MAP$1 = {
+    TAG_ISNULL: {
+      label: '为空',
+      value: 'TAG_ISNULL'
+    },
+    TAG_NONULL: {
+      label: '不为空',
+      value: 'TAG_NONULL'
+    }
+  };
+  var reg$1 = new RegExp('\'', 'g');
+  var nullList$1 = ['ISNULL', 'NONULL'];
+  function queryTypeMap$1(moduleType, type) {
+    switch (moduleType) {
+      case 'SELECT':
+        return {
+          operator: 'EQ',
+          operatorName: '等于',
+          rules: 'defalut'
+        };
+      case 'INPUT':
+        return {
+          operator: type === 'SINGLE' ? 'EQ' : 'LIKE',
+          operatorName: type === 'SINGLE' ? '等于' : '内容包含',
+          rules: type === 'SINGLE' ? 'defalut' : 'split'
+        };
+      case 'SELECT_TREE':
+        return {
+          operator: 'EQ',
+          operatorName: '等于',
+          rules: 'normal'
+        };
+      case 'SELECT_INPUT':
+        return {
+          operator: 'SUB_PATTERN',
+          operatorName: '符合模式(截断)',
+          rules: 'sub_pattern'
+        };
+      case 'NUMBER':
+        return {
+          operator: 'BETWEEN_CLOSE',
+          operatorName: '介于(闭区间)',
+          rules: 'between'
+        };
+      case 'DATE':
+        return {
+          operator: type === 'DATE_M' ? 'EQ' : 'BETWEEN_CLOSE',
+          operatorName: type === 'DATE_M' ? '等于' : '介于(闭区间)',
+          rules: type === 'DATE_M' ? 'defalut' : 'between'
+        };
+    }
+    return null;
+  }
+  function configQueryMap$1(data, query) {
+    var obj = {};
+    data.forEach(function (item) {
+      if (!item.groupName || item.groupName === '商品基本属性' || item.groupName === '商品 SKU 属性') {
+        obj = _objectSpread2(_objectSpread2({}, obj), {}, _defineProperty({}, item.itemId, _objectSpread2(_objectSpread2({}, QUERY_MAP$1[item.itemId]), {}, {
+          type: item.type,
+          moduleType: item.moduleType,
+          dataSource: item.configs,
+          newStatus: item.newStatus,
+          // status: item.newStatus,
+          tagsFlag: null
+        })));
+      } else {
+        var optObj = {};
+        if (item.moduleType !== 'NO_VALUE') {
+          optObj = queryTypeMap$1(item.moduleType, item.type);
+        } else if (query[item.itemId]) {
+          var id = query[item.itemId];
+          optObj.operator = TAG_NULL_MAP$1[id].value;
+          optObj.operatorName = TAG_NULL_MAP$1[id].label;
+          optObj.rules = 'noValue';
+        }
+        obj = _objectSpread2(_objectSpread2({}, obj), {}, _defineProperty({}, item.itemId, _objectSpread2({
+          field: item.itemId,
+          desc: item.itemName,
+          tagsFlag: 'tags',
+          type: item.type,
+          moduleType: item.moduleType,
+          dataSource: item.configs,
+          newStatus: item.newStatus
+        }, optObj)));
+      }
+    });
+    return obj;
+  }
+
+  /**
+   * 数组去重
+   */
+  function unique$1(array) {
+    var keyFn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (item) {
+      return item;
+    };
+    var hash = {};
+    var result = [];
+    array.forEach(function (item) {
+      var key = keyFn(item);
+      if (key in hash) return;
+      result.push(item);
+      hash[key] = null;
+    });
+    return result;
+  }
+  function genPlatShopValue$1(platList, shopList, platShop) {
+    var _platCode = platShop.platCode,
+      _shopId = platShop.shopId;
+    var defaultPlat = platList[0] && platList[0].platCode;
+    var platCode = platList.find(function (plat) {
+      return plat.platCode === _platCode;
+    }) ? _platCode : defaultPlat;
+    var defaultShop = (shopList.find(function (shop) {
+      return shop.platCode === platCode;
+    }) || {}).shopId;
+    var shopId = shopList.find(function (shop) {
+      return shop.shopId === _shopId;
+    }) ? _shopId : defaultShop;
+    return {
+      shopId: shopId,
+      platCode: platCode
+    };
+  }
+
+  /**
+   * 全部商品tab-请求参数转化
+   * @param {*} data 需要转化的数据
+   * @param {*} config 配置项枚举信息
+   */
+  function allTabFormatting$1(config, data) {
+    var arr = [];
+    Object.keys(data).forEach(function (item) {
+      if (config[item]) {
+        var obj = {
+          field: config[item].field,
+          fieldName: config[item].desc,
+          configName: item,
+          tagsFlag: config[item].tagsFlag,
+          operator: config[item].operator,
+          operatorName: config[item].operatorName
+        };
+        switch (config[item].rules) {
+          case 'normal':
+            if (data[item]) {
+              if (config[item].type === 'SINGLE') {
+                obj.value = [data[item].value];
+                obj.semantic = [data[item].label];
+              } else {
+                var ids = [];
+                var names = [];
+                data[item].forEach(function (str) {
+                  ids.push(str.id);
+                  names.push(str.name);
+                });
+                obj.semantic = names;
+                obj.value = config[item].tagsFlag ? names : ids;
+              }
+            }
+            break;
+          case 'between':
+            data[item].start = "".concat(data[item].start);
+            data[item].end = "".concat(data[item].end);
+            if (data[item].datetype) {
+              obj.relative = data[item].datetype;
+            }
+            if (data[item].dateUnit) {
+              obj.timeUnit = data[item].dateUnit;
+            }
+            if (data[item].start || data[item].end) {
+              obj.value = [data[item].start, data[item].end];
+              obj.semantic = [data[item].start, data[item].end];
+            }
+            break;
+          case 'split':
+            if (data[item]) {
+              var _value = data[item].replace(reg$1, '\\\'');
+              obj.value = _value.split(',');
+              obj.semantic = data[item].split(',');
+            }
+            break;
+          case 'sub_pattern':
+            if (data[item]) {
+              if (typeof data[item] === 'string') {
+                var _value2 = data[item].replace(reg$1, '\\\'');
+                obj.value = [_value2];
+                var val = data[item].split(':');
+                if (val.length > 1) {
+                  obj.semantic = ["\u622A\u53D6".concat(val[0], "\u81F3").concat(val[1], "\u4F4D\uFF0C\u5B57\u7B26\u662F").concat(val[2])];
+                } else {
+                  obj.operatorName = '等于';
+                  obj.semantic = [data[item]];
+                }
+              }
+            }
+            break;
+          default:
+            if (data[item]) {
+              if (config[item].field === 'platCode') {
+                // 假如平台code标识，需要找出平台名称
+                data.platList.forEach(function (val) {
+                  if (val.platCode === data[item]) {
+                    obj.semantic = [val.platName];
+                    obj.value = [data[item]];
+                  }
+                });
+              } else if (config[item].field === 'shopId') {
+                // 假如是店铺ID标识，需要找出店铺名称
+                data.shopList.forEach(function (val) {
+                  if (val.shopId === data[item]) {
+                    obj.semantic = [val.shopName];
+                    obj.value = [data[item]];
+                  }
+                });
+              } else if (config[item].moduleType === 'SELECT' || config[item].moduleType === 'DATE') {
+                if (config[item].type === 'SINGLE') {
+                  var _list = config[item].dataSource.filter(function (el) {
+                    return el.value === data[item];
+                  });
+                  obj.semantic = [_list[0].label];
+                  obj.value = config[item].tagsFlag ? [_list[0].label] : [_list[0].value];
+                } else if (config[item].type === 'MULTIPLE' || config[item].type === 'DATE_M') {
+                  var values = data[item] && data[item].map(function (el) {
+                    var findTemp = config[item].dataSource.find(function (innerItem) {
+                      return innerItem.value === el;
+                    });
+                    return (findTemp || {}).label;
+                  });
+                  obj.value = values;
+                  obj.semantic = values;
+                } else if (config[item].moduleType === 'N0_VALUE') {
+                  obj.semantic = NULL_MAP$1[data[item]].label;
+                  obj.value = [data[item]];
+                  obj.operator = NULL_MAP$1[data[item]].value;
+                  obj.operatorName = NULL_MAP$1[data[item]].label;
+                } else {
+                  obj.semantic = [data[item]];
+                  obj.value = [data[item]];
+                }
+              } else {
+                obj.semantic = [data[item]];
+                var _value3 = data[item].replace(reg$1, '\\\'');
+                obj.value = [_value3];
+              }
+            }
+        }
+        arr.push(obj);
+      }
+    });
+    /**
+     *
+     */
+    return arr.filter(function (item) {
+      return item.value && item.value.length >= 1;
+    });
+  }
+
+  /**
+   * 过滤对象中空属性
+   * @param {*} obj
+   * @returns
+   */
+  function filterNullValueObject$1(obj) {
+    for (var i in obj) {
+      if (obj[i] === '' || obj[i] === null || obj[i] === 'null') {
+        delete obj[i];
+      }
+    }
+    return obj;
+  }
+
+  /**
+   * 商品选择tab窗口，根据筛选条件格式化数据
+   * @param {*} data
+   */
+  function parsingNewCondition(data) {
+    var arr = [];
+    var list = ['shopId', 'prod.outer_id', 'sku.outer_id', 'prod.product_id', 'sku.sku_id', 'prod.online_time', 'prod.status'];
+    data.forEach(function (item) {
+      var obj = {
+        field: '',
+        fieldName: '',
+        operator: '',
+        operatorName: '',
+        semantic: [],
+        value: []
+      };
+      obj.tagsFlag = item.field.groupName ? 'tags' : null;
+      obj.field = item.field.field;
+      obj.fieldName = item.field.desc;
+      obj.operator = item.operator.value;
+      obj.operatorName = item.operator.label;
+      if (list.includes(item.field.field)) {
+        switch (item.field.field) {
+          case 'shopId':
+            // 上架店铺(需要解析出平台code)
+            if (item.value) {
+              arr.push({
+                field: 'platCode',
+                fieldName: '平台名称',
+                operator: item.operator.value,
+                operatorName: '等于',
+                semantic: [item.value.plat.label],
+                value: [item.value.plat.value]
+              });
+              obj.semantic = item.value.shops.map(function (shop) {
+                return shop.label;
+              });
+              obj.value = item.value.shops.map(function (shop) {
+                return shop.value;
+              });
+            }
+            break;
+          case 'prod.outer_id': // 商品商家编码
+          case 'sku.outer_id':
+            // sku商家编码
+            if (item.value) {
+              if (item.operator.value === 'SUB_PATTERN') {
+                // 如果是截断模式
+                obj.value = ["".concat(item.value.begin, ":").concat(item.value.end, ":").concat(item.value.value.replace(reg$1, '\\\''))];
+                obj.semantic = ["\u622A\u53D6".concat(item.value.begin, "\u81F3").concat(item.value.end, "\u4F4D,\u5B57\u7B26\u662F").concat(item.value.value)];
+              } else if (Array.isArray(item.value)) {
+                obj.semantic = item.value.filter(function (val) {
+                  return val !== '';
+                });
+                obj.value = item.value.filter(function (val) {
+                  return val !== '';
+                }).map(function (val) {
+                  return val.replace(reg$1, '\\\'');
+                });
+              } else {
+                obj.semantic = [item.value];
+                obj.value = [item.value.replace(reg$1, '\\\'')];
+              }
+            } else if (nullList$1.includes(item.operator.value)) {
+              obj.value = [NULL_MAP$1[item.operator.value].value];
+              obj.semantic = [NULL_MAP$1[item.operator.value].label];
+            }
+            break;
+          case 'prod.product_id':
+          case 'sku.sku_id':
+            if (item.value) {
+              if (Array.isArray(item.value)) {
+                obj.semantic = item.value.filter(function (val) {
+                  return val !== '';
+                });
+                obj.value = item.value.filter(function (val) {
+                  return val !== '';
+                }).map(function (val) {
+                  return val.replace(reg$1, '\\\'');
+                });
+              } else {
+                obj.semantic = [item.value];
+                obj.value = [item.value.replace(reg$1, '\\\'')];
+              }
+            }
+            break;
+          case 'prod.online_time':
+            if (item.operator.value === 'BETWEEN_RELATIVE') {
+              obj.relative = 'relative';
+              obj.operator = 'BETWEEN_CLOSE';
+              obj.operatorName = '介于(闭区间)';
+              if (item.value) {
+                if (item.value.value) {
+                  obj.value = item.value.value;
+                  obj.semantic = item.value.value;
+                }
+                if (item.value.timeUnit) {
+                  obj.timeUnit = item.value.timeUnit;
+                }
+              }
+            }
+            break;
+          case 'prod.status':
+            obj.value = item.value;
+            var values = item.value.map(function (el) {
+              var findTemp = item.field.dataSource.find(function (innerItem) {
+                return innerItem.value === el;
+              });
+              return (findTemp || {
+                label: el
+              }).label;
+            });
+            obj.semantic = values;
+            break;
+        }
+      } else {
+        switch (item.field.type) {
+          case 'NO_VALUE':
+            // 无值类
+            obj.semantic = [item.operator.label];
+            obj.value = [item.operator.value];
+            break;
+          case 'DATE_YMD': // 年月日
+          case 'DATE_MD':
+            // 月日
+            if (item.value) {
+              if (item.operator.value === 'BETWEEN_CLOSE' || item.operator.value === 'BETWEEN_OPEN') {
+                // 假如是区间类型
+                obj.value = item.value ? [item.value.start || '', item.value.end || ''] : [item.value];
+                obj.semantic = item.value ? [item.value.start || '', item.value.end || ''] : [item.value];
+              } else if (nullList$1.includes(item.operator.value)) {
+                obj.value = [NULL_MAP$1[item.operator.value].value];
+                obj.semantic = [NULL_MAP$1[item.operator.value].label];
+              } else {
+                obj.value = item.value ? [item.value] : [''];
+                obj.semantic = item.value ? [item.value] : [''];
+              }
+            } else if (nullList$1.includes(item.operator.value)) {
+              obj.value = [NULL_MAP$1[item.operator.value].value];
+              obj.semantic = [NULL_MAP$1[item.operator.value].label];
+            }
+            break;
+          case 'DATE_M':
+            // 月
+            if (item.value) {
+              obj.value = item.value;
+              obj.semantic = item.value.map(function (el) {
+                var findTemp = item.field.dataSource.find(function (innerItem) {
+                  return Number(innerItem.value) === Number(el);
+                });
+                return (findTemp || {
+                  label: el
+                }).label;
+              });
+            } else if (nullList$1.includes(item.operator.value)) {
+              obj.value = [NULL_MAP$1[item.operator.value].value];
+              obj.semantic = [NULL_MAP$1[item.operator.value].label];
+            }
+            break;
+          case 'CATEGORY_SELECT_TREE':
+            obj.field = item.field.field;
+            obj.fieldName = item.field.desc;
+            obj.operator = item.operator.value;
+            obj.operatorName = item.operator.label;
+            if (item.value) {
+              var categoriesIds = [];
+              var categoriesName = [];
+              item.value.categories.forEach(function (str) {
+                categoriesIds.push(str.id);
+                categoriesName.push(str.name);
+              });
+              obj.semantic = categoriesName;
+              obj.value = categoriesIds;
+            } else if (item.operator.value === 'ISNULL') {
+              obj.semantic = ['为空'];
+              obj.value = ['ISNULL'];
+            } else if (item.operator.value === 'NONULL') {
+              obj.semantic = ['不为空'];
+              obj.value = ['NONULL'];
+            }
+            break;
+          case 'SELECT_MULTIPLE_TREE':
+            // 下拉树多选
+            if (item.value) {
+              var ids = [];
+              var names = [];
+              var _list = item.value;
+              _list.forEach(function (str) {
+                ids.push(str.id);
+                names.push(str.name);
+              });
+              obj.semantic = names;
+              obj.value = names;
+            } else if (nullList$1.includes(item.operator.value)) {
+              obj.value = [NULL_MAP$1[item.operator.value].label];
+              obj.semantic = [NULL_MAP$1[item.operator.value].label];
+            }
+            break;
+          case 'SELECT_TREE':
+            // 下拉树单选
+            if (item.value) {
+              obj.semantic = [item.field.label];
+              obj.value = [item.field.label];
+            } else if (nullList$1.includes(item.operator.value)) {
+              obj.value = [NULL_MAP$1[item.operator.value].value];
+              obj.semantic = [NULL_MAP$1[item.operator.value].label];
+            }
+            break;
+          case 'MULTIPLE_SELECT':
+            // 下拉多选
+            if (item.value) {
+              var _item$value;
+              var _values = (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.map(function (el) {
+                var findTemp = item.field.dataSource.find(function (innerItem) {
+                  return innerItem.value === el;
+                });
+                return (findTemp || {
+                  label: el
+                }).label;
+              });
+              obj.value = _values;
+              obj.semantic = _values;
+            } else if (nullList$1.includes(item.operator.value)) {
+              obj.value = [NULL_MAP$1[item.operator.value].value];
+              obj.semantic = [NULL_MAP$1[item.operator.value].label];
+            }
+            break;
+          case 'SELECT':
+            // 下拉单选
+            if (item.value !== undefined) {
+              obj.value = [item.value];
+              var _list3 = item.field.dataSource.filter(function (el) {
+                return el.value === item.value;
+              });
+              obj.semantic = [_list3[0].label];
+            } else if (nullList$1.includes(item.operator.value)) {
+              obj.value = [NULL_MAP$1[item.operator.value].value];
+              obj.semantic = [NULL_MAP$1[item.operator.value].label];
+            }
+            break;
+          case 'NUMBER_INT': // 整数
+          case 'NUMBER_DECIMAL':
+            // 小数
+            if (item.value || item.value === 0) {
+              obj.semantic = Array.isArray(item.value) ? item.value : [item.value];
+              obj.value = Array.isArray(item.value) ? item.value : [item.value];
+            } else if (nullList$1.includes(item.operator.value)) {
+              obj.value = [NULL_MAP$1[item.operator.value].value];
+              obj.semantic = [NULL_MAP$1[item.operator.value].label];
+            }
+            break;
+          case 'STRING':
+            // 字符
+            if (item.value) {
+              if (item.operator.value === 'LIKE') {
+                // 假如是like操作还需要区分出或者还是并且的关系
+                obj.value = item.value.value.map(function (val) {
+                  return val.replace(reg$1, '\\\'');
+                });
+                obj.multiText = item.value.relation ? 'AND' : 'OR';
+                obj.semantic = item.value;
+              } else if (Array.isArray(item.value)) {
+                obj.semantic = item.value.filter(function (val) {
+                  return val !== '';
+                });
+                obj.value = item.value.filter(function (val) {
+                  return val !== '';
+                }).map(function (val) {
+                  return val.replace(reg$1, '\\\'');
+                });
+              } else {
+                obj.semantic = [item.value];
+                obj.value = [item.value.replace(reg$1, '\\\'')];
+              }
+            } else if (nullList$1.includes(item.operator.value)) {
+              obj.value = [NULL_MAP$1[item.operator.value].value];
+              obj.semantic = [NULL_MAP$1[item.operator.value].label];
+            }
+            break;
+        }
+      }
+      arr.push(obj);
+    });
+    return arr;
+  }
+  function queryConditionToStringNew(array) {
+    var obj = {
+      str: [],
+      title: [],
+      value: parsingNewCondition(array).filter(function (item) {
+        return item.value.length || item.operator === "ISNULL" || item.operator === "NONULL";
+      })
+    };
+    return obj;
+  }
+
+  /**
+   * 计算已选商品和sku的数量
+   * @param {*} Object || Array
+   */
+  function resultGoodsLength$1(obj) {
+    // TODO SELECT
+    var len = 0;
+    if (Array.isArray(obj)) {
+      if (obj.length) {
+        obj.forEach(function (item) {
+          if (item.rowExpandable) {
+            len += item.skus.length;
+          } else {
+            len += 1;
+          }
+        });
+      }
+    } else {
+      Object.keys(obj).forEach(function (item) {
+        if (obj[item].rowExpandable) {
+          // 假如是sku展开状态则商品数量以sku数量为准
+          len += obj[item].skus.length;
+        } else {
+          len += 1;
+        }
+      });
+    }
+    return len;
+  }
+
   var skuConditionQueryList = ['sku.sku_id', 'sku.outer_id', 'sku.specification', 'sku.status', 'sku.price', 'sku.stock'];
   var Store$f = /*#__PURE__*/function () {
     function Store() {
@@ -44157,7 +45003,7 @@
               case 0:
                 url = "".concat(server, "/product-selector/2.0/batch/import?tenant=").concat(extraQuery);
                 _context10.next = 3;
-                return http.post(url, data);
+                return http.post(url, filterNullValueObject$1(data));
               case 3:
                 result = _context10.sent;
                 if (result.data.success) {
@@ -44653,7 +45499,7 @@
         });
         setGlobalSelect(_objectSpread2({}, selectObj));
       } else {
-        setGlobalSelect({});
+        setGlobalSelect(_objectSpread2({}, originSelectObj));
       }
     };
 
@@ -44803,217 +45649,6 @@
     return React.useContext(Context$4);
   }
 
-  /**
-   * 此文件记录一些通用 & 默认配置项
-   */
-  var DEFAULT_TABLE_SKU_ROW = ['productName', 'productId', 'outerId', 'price', 'stock', 'onlineTime', 'status', 'platName', 'shopName', 'showCategoryName', 'showSellerCategoryName', 'skuTotal', 'sku'];
-  var DEFAULT_TABLE_ROW$1 = ['productName', 'productId', 'outerId', 'price', 'stock', 'onlineTime', 'status', 'platName', 'shopName', 'showCategoryName', 'showSellerCategoryName'];
-  var IS_STANDARD_CATE$1 = ['YDH', 'PDD', 'REDBOOK', 'WEIMOB', 'VIP']; // 区分哪些平台不具有标准类目
-  // export const IS_STANDARD_CATE = ['TAOBAO', 'YOUZAN', 'JOS', 'SUNING', 'DOUYIN', 'OFFLINE', 'DANGDANG', 'MOGUJIE', 'WEIXIN'] // 区分哪些平台具有标准类目
-  // export const IS_CUSTOM_CATE = ['YHD', 'SUNING', 'MGJ', 'OFFLINE', 'DD', 'WEIXIN', 'PDD', 'REDBOOK', 'WEIMOB', 'DOUYIN', 'VIP'] // 区分哪些平台不具有自定义类目
-  var IS_CUSTOM_CATE$1 = ['TAOBAO', 'JOS', 'YOUZAN']; // 区分哪些平台有自定义类目
-  var SKU_STATUS_MAP = {
-    'SY_ONLINE': '在架',
-    'SY_OFFLINE': '下架',
-    'SY_SAIL_OVER': '售罄',
-    '': '不限'
-  };
-  var QUERY_MAP$1 = {
-    // 全部商品tab窗口与查询条件枚举关系
-    platCode: {
-      field: 'platCode',
-      // 接口对应字段
-      operator: 'EQ',
-      // 查询条件
-      operatorName: '等于',
-      desc: '平台名称',
-      // 描述
-      rules: 'defalut' // 对应字段解析规则
-    },
-
-    shopId: {
-      field: 'shopId',
-      operator: 'EQ',
-      operatorName: '等于',
-      desc: '店铺名称',
-      rules: 'defalut'
-    },
-    prod_product_id: {
-      field: 'prod.product_id',
-      operator: 'EQ',
-      operatorName: '等于',
-      desc: '商品ID',
-      rules: 'defalut'
-    },
-    prod_product_name: {
-      field: 'prod.product_name',
-      operator: 'LIKE',
-      operatorName: '内容包含',
-      desc: '商品名称',
-      rules: 'split'
-    },
-    prod_category_tree: {
-      field: 'prod.category_id',
-      operator: 'EQ',
-      operatorName: '等于',
-      desc: '标准类目',
-      rules: 'normal'
-    },
-    prod_seller_tree: {
-      field: 'prod.seller_cid',
-      operator: 'EQ',
-      operatorName: '等于',
-      desc: '自定义类目',
-      rules: 'normal'
-    },
-    prod_status: {
-      field: 'prod.status',
-      operator: 'EQ',
-      operatorName: '等于',
-      desc: '商品状态',
-      rules: 'defalut'
-    },
-    prod_stock: {
-      field: 'prod.stock',
-      operator: 'BETWEEN_CLOSE',
-      operatorName: '介于(闭区间)',
-      desc: '库存',
-      rules: 'between'
-    },
-    prod_outer_id: {
-      field: 'prod.outer_id',
-      operator: 'SUB_PATTERN',
-      operatorName: '符合模式(截断)',
-      desc: '商品商家编码',
-      rules: 'sub_pattern'
-    },
-    prod_price: {
-      field: 'prod.price',
-      operator: 'BETWEEN_CLOSE',
-      operatorName: '介于(闭区间)',
-      desc: '价格',
-      rules: 'between'
-    },
-    prod_online_time: {
-      field: 'prod.online_time',
-      operator: 'BETWEEN_CLOSE',
-      operatorName: '介于(闭区间)',
-      desc: '上架时间',
-      rules: 'between'
-    },
-    sku_flag: {
-      field: 'sku_flag',
-      operator: 'EQ',
-      operatorName: '等于',
-      desc: '是否有SKU',
-      rules: 'default'
-    },
-    sku_sku_id: {
-      field: 'sku.sku_id',
-      operator: 'EQ',
-      operatorName: '等于',
-      desc: 'SKU ID',
-      rules: 'default'
-    },
-    sku_outer_id: {
-      field: 'sku.outer_id',
-      operator: 'SUB_PATTERN',
-      operatorName: '符合模式(截断)',
-      desc: 'SKU商家编码',
-      rules: 'sub_pattern'
-    },
-    sku_specification: {
-      field: 'sku.specification',
-      operator: 'LIKE',
-      operatorName: '内容包含',
-      desc: 'SKU名称',
-      rules: 'default'
-    }
-  };
-  var SELECTED_TAB_GOODS_TYPE$1 = [
-  // 已选择商品tab窗口,下拉选择配置
-  {
-    labelKey: '商品标题',
-    valueKey: 'productName',
-    isSku: false
-  }, {
-    labelKey: '商品ID',
-    valueKey: 'productId',
-    isSku: false
-  }, {
-    labelKey: '商品商家编码',
-    valueKey: 'outerId',
-    isSku: false
-  }, {
-    labelKey: 'SKU ID',
-    valueKey: 'skuId',
-    isSku: true
-  }, {
-    labelKey: 'SKU商家编码',
-    valueKey: 'outerSkuId',
-    isSku: true
-  }, {
-    labelKey: 'SKU名称',
-    valueKey: 'skuDetail',
-    isSku: true
-  }];
-  var FIELD_STACKS$1 = {
-    SHOP_ID: 'shopId',
-    // 上架店铺
-    PLAT_CODE: 'platCode',
-    // 平台
-    PROD_PRICE: 'prod.price',
-    // 价格
-    PROD_STOCK: 'prod.stock',
-    // 库存
-    PROD_STATUS: 'prod.status',
-    // 商品状态
-    PROD_OUTER_ID: 'prod.outer_id',
-    // 商品商家编码
-    PROD_SELLER_ID: 'prod.seller_cid',
-    // 自定义类目
-    PROD_PRODUCT_ID: 'prod.product_id',
-    // 商品ID
-    PROD_CATEGORY_ID: 'prod.category_id',
-    // 标准类目
-    PROD_ONLINE_TIME: 'prod.online_time',
-    // 上架时间
-    PROD_PRODUCT_NAME: 'prod.product_name',
-    // 商品名称
-
-    SKU_FLAG: 'sku_flag',
-    // 是否有SKU
-    SKU_PRICE: 'sku.price',
-    // SKU属性 > SKU价格
-    SKU_STOCK: 'sku.stock',
-    // SKU属性 > SKU库存
-    SKU_SKU_ID: 'sku.sku_id',
-    // SKU属性 > SKU ID
-    SKU_STATUS: 'sku.status',
-    // SKU属性 > SKU在架状态
-    SKU_OUTER_ID: 'sku.outer_id',
-    // SKU属性 > SKU 商家编码
-    SKU_SPECIFICATION: 'sku.specification' // SKU属性 > SKU名称
-  };
-
-  var OPERATOR_STACKS$1 = {
-    EQ: 'EQ',
-    LT: 'LT',
-    GT: 'GT',
-    LIKE: 'LIKE',
-    END_LIKE: 'END_LIKE',
-    BEGIN_LIKE: 'BEGIN_LIKE',
-    SUB_PATTERN: 'SUB_PATTERN',
-    BETWEEN_OPEN: 'BETWEEN_OPEN',
-    BETWEEN_CLOSE: 'BETWEEN_CLOSE',
-    ISNULL: 'ISNULL',
-    NONULL: 'NONULL',
-    NOT_EQ: 'NOT_EQ',
-    TAG_ISNULL: 'TAG_ISNULL',
-    TAG_NONULL: 'TAG_NONULL',
-    BETWEEN_RELATIVE: 'BETWEEN_RELATIVE'
-  };
-
   function WidgetBox$1(_ref) {
     var _ref$help = _ref.help,
       help = _ref$help === void 0 ? '' : _ref$help,
@@ -50107,599 +50742,6 @@
     return data;
   }
 
-  var NULL_MAP$1 = {
-    ISNULL: {
-      label: '为空',
-      value: 'ISNULL'
-    },
-    NONULL: {
-      label: '不为空',
-      value: 'NONULL'
-    }
-  };
-  var TAG_NULL_MAP$1 = {
-    TAG_ISNULL: {
-      label: '为空',
-      value: 'TAG_ISNULL'
-    },
-    TAG_NONULL: {
-      label: '不为空',
-      value: 'TAG_NONULL'
-    }
-  };
-  var reg$1 = new RegExp('\'', 'g');
-  var nullList$1 = ['ISNULL', 'NONULL'];
-  function queryTypeMap$1(moduleType, type) {
-    switch (moduleType) {
-      case 'SELECT':
-        return {
-          operator: 'EQ',
-          operatorName: '等于',
-          rules: 'defalut'
-        };
-      case 'INPUT':
-        return {
-          operator: type === 'SINGLE' ? 'EQ' : 'LIKE',
-          operatorName: type === 'SINGLE' ? '等于' : '内容包含',
-          rules: type === 'SINGLE' ? 'defalut' : 'split'
-        };
-      case 'SELECT_TREE':
-        return {
-          operator: 'EQ',
-          operatorName: '等于',
-          rules: 'normal'
-        };
-      case 'SELECT_INPUT':
-        return {
-          operator: 'SUB_PATTERN',
-          operatorName: '符合模式(截断)',
-          rules: 'sub_pattern'
-        };
-      case 'NUMBER':
-        return {
-          operator: 'BETWEEN_CLOSE',
-          operatorName: '介于(闭区间)',
-          rules: 'between'
-        };
-      case 'DATE':
-        return {
-          operator: type === 'DATE_M' ? 'EQ' : 'BETWEEN_CLOSE',
-          operatorName: type === 'DATE_M' ? '等于' : '介于(闭区间)',
-          rules: type === 'DATE_M' ? 'defalut' : 'between'
-        };
-    }
-    return null;
-  }
-  function configQueryMap$1(data, query) {
-    var obj = {};
-    data.forEach(function (item) {
-      if (!item.groupName || item.groupName === '商品基本属性' || item.groupName === '商品 SKU 属性') {
-        obj = _objectSpread2(_objectSpread2({}, obj), {}, _defineProperty({}, item.itemId, _objectSpread2(_objectSpread2({}, QUERY_MAP$1[item.itemId]), {}, {
-          type: item.type,
-          moduleType: item.moduleType,
-          dataSource: item.configs,
-          newStatus: item.newStatus,
-          // status: item.newStatus,
-          tagsFlag: null
-        })));
-      } else {
-        var optObj = {};
-        if (item.moduleType !== 'NO_VALUE') {
-          optObj = queryTypeMap$1(item.moduleType, item.type);
-        } else if (query[item.itemId]) {
-          var id = query[item.itemId];
-          optObj.operator = TAG_NULL_MAP$1[id].value;
-          optObj.operatorName = TAG_NULL_MAP$1[id].label;
-          optObj.rules = 'noValue';
-        }
-        obj = _objectSpread2(_objectSpread2({}, obj), {}, _defineProperty({}, item.itemId, _objectSpread2({
-          field: item.itemId,
-          desc: item.itemName,
-          tagsFlag: 'tags',
-          type: item.type,
-          moduleType: item.moduleType,
-          dataSource: item.configs,
-          newStatus: item.newStatus
-        }, optObj)));
-      }
-    });
-    return obj;
-  }
-
-  /**
-   * 数组去重
-   */
-  function unique$1(array) {
-    var keyFn = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (item) {
-      return item;
-    };
-    var hash = {};
-    var result = [];
-    array.forEach(function (item) {
-      var key = keyFn(item);
-      if (key in hash) return;
-      result.push(item);
-      hash[key] = null;
-    });
-    return result;
-  }
-  function genPlatShopValue$1(platList, shopList, platShop) {
-    var _platCode = platShop.platCode,
-      _shopId = platShop.shopId;
-    var defaultPlat = platList[0] && platList[0].platCode;
-    var platCode = platList.find(function (plat) {
-      return plat.platCode === _platCode;
-    }) ? _platCode : defaultPlat;
-    var defaultShop = (shopList.find(function (shop) {
-      return shop.platCode === platCode;
-    }) || {}).shopId;
-    var shopId = shopList.find(function (shop) {
-      return shop.shopId === _shopId;
-    }) ? _shopId : defaultShop;
-    return {
-      shopId: shopId,
-      platCode: platCode
-    };
-  }
-
-  /**
-   * 全部商品tab-请求参数转化
-   * @param {*} data 需要转化的数据
-   * @param {*} config 配置项枚举信息
-   */
-  function allTabFormatting$1(config, data) {
-    var arr = [];
-    Object.keys(data).forEach(function (item) {
-      if (config[item]) {
-        var obj = {
-          field: config[item].field,
-          fieldName: config[item].desc,
-          configName: item,
-          tagsFlag: config[item].tagsFlag,
-          operator: config[item].operator,
-          operatorName: config[item].operatorName
-        };
-        switch (config[item].rules) {
-          case 'normal':
-            if (data[item]) {
-              if (config[item].type === 'SINGLE') {
-                obj.value = [data[item].value];
-                obj.semantic = [data[item].label];
-              } else {
-                var ids = [];
-                var names = [];
-                data[item].forEach(function (str) {
-                  ids.push(str.id);
-                  names.push(str.name);
-                });
-                obj.semantic = names;
-                obj.value = config[item].tagsFlag ? names : ids;
-              }
-            }
-            break;
-          case 'between':
-            data[item].start = "".concat(data[item].start);
-            data[item].end = "".concat(data[item].end);
-            if (data[item].datetype) {
-              obj.relative = data[item].datetype;
-            }
-            if (data[item].dateUnit) {
-              obj.timeUnit = data[item].dateUnit;
-            }
-            if (data[item].start || data[item].end) {
-              obj.value = [data[item].start, data[item].end];
-              obj.semantic = [data[item].start, data[item].end];
-            }
-            break;
-          case 'split':
-            if (data[item]) {
-              var _value = data[item].replace(reg$1, '\\\'');
-              obj.value = _value.split(',');
-              obj.semantic = data[item].split(',');
-            }
-            break;
-          case 'sub_pattern':
-            if (data[item]) {
-              if (typeof data[item] === 'string') {
-                var _value2 = data[item].replace(reg$1, '\\\'');
-                obj.value = [_value2];
-                var val = data[item].split(':');
-                if (val.length > 1) {
-                  obj.semantic = ["\u622A\u53D6".concat(val[0], "\u81F3").concat(val[1], "\u4F4D\uFF0C\u5B57\u7B26\u662F").concat(val[2])];
-                } else {
-                  obj.operatorName = '等于';
-                  obj.semantic = [data[item]];
-                }
-              }
-            }
-            break;
-          default:
-            if (data[item]) {
-              if (config[item].field === 'platCode') {
-                // 假如平台code标识，需要找出平台名称
-                data.platList.forEach(function (val) {
-                  if (val.platCode === data[item]) {
-                    obj.semantic = [val.platName];
-                    obj.value = [data[item]];
-                  }
-                });
-              } else if (config[item].field === 'shopId') {
-                // 假如是店铺ID标识，需要找出店铺名称
-                data.shopList.forEach(function (val) {
-                  if (val.shopId === data[item]) {
-                    obj.semantic = [val.shopName];
-                    obj.value = [data[item]];
-                  }
-                });
-              } else if (config[item].moduleType === 'SELECT' || config[item].moduleType === 'DATE') {
-                if (config[item].type === 'SINGLE') {
-                  var _list = config[item].dataSource.filter(function (el) {
-                    return el.value === data[item];
-                  });
-                  obj.semantic = [_list[0].label];
-                  obj.value = config[item].tagsFlag ? [_list[0].label] : [_list[0].value];
-                } else if (config[item].type === 'MULTIPLE' || config[item].type === 'DATE_M') {
-                  var values = data[item] && data[item].map(function (el) {
-                    var findTemp = config[item].dataSource.find(function (innerItem) {
-                      return innerItem.value === el;
-                    });
-                    return (findTemp || {}).label;
-                  });
-                  obj.value = values;
-                  obj.semantic = values;
-                } else if (config[item].moduleType === 'N0_VALUE') {
-                  obj.semantic = NULL_MAP$1[data[item]].label;
-                  obj.value = [data[item]];
-                  obj.operator = NULL_MAP$1[data[item]].value;
-                  obj.operatorName = NULL_MAP$1[data[item]].label;
-                } else {
-                  obj.semantic = [data[item]];
-                  obj.value = [data[item]];
-                }
-              } else {
-                obj.semantic = [data[item]];
-                var _value3 = data[item].replace(reg$1, '\\\'');
-                obj.value = [_value3];
-              }
-            }
-        }
-        arr.push(obj);
-      }
-    });
-    /**
-     *
-     */
-    return arr.filter(function (item) {
-      return item.value && item.value.length >= 1;
-    });
-  }
-
-  /**
-   * 商品选择tab窗口，根据筛选条件格式化数据
-   * @param {*} data
-   */
-  function parsingNewCondition(data) {
-    var arr = [];
-    var list = ['shopId', 'prod.outer_id', 'sku.outer_id', 'prod.product_id', 'sku.sku_id', 'prod.online_time', 'prod.status'];
-    data.forEach(function (item) {
-      var obj = {
-        field: '',
-        fieldName: '',
-        operator: '',
-        operatorName: '',
-        semantic: [],
-        value: []
-      };
-      obj.tagsFlag = item.field.groupName ? 'tags' : null;
-      obj.field = item.field.field;
-      obj.fieldName = item.field.desc;
-      obj.operator = item.operator.value;
-      obj.operatorName = item.operator.label;
-      if (list.includes(item.field.field)) {
-        switch (item.field.field) {
-          case 'shopId':
-            // 上架店铺(需要解析出平台code)
-            if (item.value) {
-              arr.push({
-                field: 'platCode',
-                fieldName: '平台名称',
-                operator: item.operator.value,
-                operatorName: '等于',
-                semantic: [item.value.plat.label],
-                value: [item.value.plat.value]
-              });
-              obj.semantic = item.value.shops.map(function (shop) {
-                return shop.label;
-              });
-              obj.value = item.value.shops.map(function (shop) {
-                return shop.value;
-              });
-            }
-            break;
-          case 'prod.outer_id': // 商品商家编码
-          case 'sku.outer_id':
-            // sku商家编码
-            if (item.value) {
-              if (item.operator.value === 'SUB_PATTERN') {
-                // 如果是截断模式
-                obj.value = ["".concat(item.value.begin, ":").concat(item.value.end, ":").concat(item.value.value.replace(reg$1, '\\\''))];
-                obj.semantic = ["\u622A\u53D6".concat(item.value.begin, "\u81F3").concat(item.value.end, "\u4F4D,\u5B57\u7B26\u662F").concat(item.value.value)];
-              } else if (Array.isArray(item.value)) {
-                obj.semantic = item.value.filter(function (val) {
-                  return val !== '';
-                });
-                obj.value = item.value.filter(function (val) {
-                  return val !== '';
-                }).map(function (val) {
-                  return val.replace(reg$1, '\\\'');
-                });
-              } else {
-                obj.semantic = [item.value];
-                obj.value = [item.value.replace(reg$1, '\\\'')];
-              }
-            } else if (nullList$1.includes(item.operator.value)) {
-              obj.value = [NULL_MAP$1[item.operator.value].value];
-              obj.semantic = [NULL_MAP$1[item.operator.value].label];
-            }
-            break;
-          case 'prod.product_id':
-          case 'sku.sku_id':
-            if (item.value) {
-              if (Array.isArray(item.value)) {
-                obj.semantic = item.value.filter(function (val) {
-                  return val !== '';
-                });
-                obj.value = item.value.filter(function (val) {
-                  return val !== '';
-                }).map(function (val) {
-                  return val.replace(reg$1, '\\\'');
-                });
-              } else {
-                obj.semantic = [item.value];
-                obj.value = [item.value.replace(reg$1, '\\\'')];
-              }
-            }
-            break;
-          case 'prod.online_time':
-            if (item.operator.value === 'BETWEEN_RELATIVE') {
-              obj.relative = 'relative';
-              obj.operator = 'BETWEEN_CLOSE';
-              obj.operatorName = '介于(闭区间)';
-              if (item.value) {
-                if (item.value.value) {
-                  obj.value = item.value.value;
-                  obj.semantic = item.value.value;
-                }
-                if (item.value.timeUnit) {
-                  obj.timeUnit = item.value.timeUnit;
-                }
-              }
-            }
-            break;
-          case 'prod.status':
-            obj.value = item.value;
-            var values = item.value.map(function (el) {
-              var findTemp = item.field.dataSource.find(function (innerItem) {
-                return innerItem.value === el;
-              });
-              return (findTemp || {
-                label: el
-              }).label;
-            });
-            obj.semantic = values;
-            break;
-        }
-      } else {
-        switch (item.field.type) {
-          case 'NO_VALUE':
-            // 无值类
-            obj.semantic = [item.operator.label];
-            obj.value = [item.operator.value];
-            break;
-          case 'DATE_YMD': // 年月日
-          case 'DATE_MD':
-            // 月日
-            if (item.value) {
-              if (item.operator.value === 'BETWEEN_CLOSE' || item.operator.value === 'BETWEEN_OPEN') {
-                // 假如是区间类型
-                obj.value = item.value ? [item.value.start || '', item.value.end || ''] : [item.value];
-                obj.semantic = item.value ? [item.value.start || '', item.value.end || ''] : [item.value];
-              } else if (nullList$1.includes(item.operator.value)) {
-                obj.value = [NULL_MAP$1[item.operator.value].value];
-                obj.semantic = [NULL_MAP$1[item.operator.value].label];
-              } else {
-                obj.value = item.value ? [item.value] : [''];
-                obj.semantic = item.value ? [item.value] : [''];
-              }
-            } else if (nullList$1.includes(item.operator.value)) {
-              obj.value = [NULL_MAP$1[item.operator.value].value];
-              obj.semantic = [NULL_MAP$1[item.operator.value].label];
-            }
-            break;
-          case 'DATE_M':
-            // 月
-            if (item.value) {
-              obj.value = item.value;
-              obj.semantic = item.value.map(function (el) {
-                var findTemp = item.field.dataSource.find(function (innerItem) {
-                  return Number(innerItem.value) === Number(el);
-                });
-                return (findTemp || {
-                  label: el
-                }).label;
-              });
-            } else if (nullList$1.includes(item.operator.value)) {
-              obj.value = [NULL_MAP$1[item.operator.value].value];
-              obj.semantic = [NULL_MAP$1[item.operator.value].label];
-            }
-            break;
-          case 'CATEGORY_SELECT_TREE':
-            obj.field = item.field.field;
-            obj.fieldName = item.field.desc;
-            obj.operator = item.operator.value;
-            obj.operatorName = item.operator.label;
-            if (item.value) {
-              var categoriesIds = [];
-              var categoriesName = [];
-              item.value.categories.forEach(function (str) {
-                categoriesIds.push(str.id);
-                categoriesName.push(str.name);
-              });
-              obj.semantic = categoriesName;
-              obj.value = categoriesIds;
-            } else if (item.operator.value === 'ISNULL') {
-              obj.semantic = ['为空'];
-              obj.value = ['ISNULL'];
-            } else if (item.operator.value === 'NONULL') {
-              obj.semantic = ['不为空'];
-              obj.value = ['NONULL'];
-            }
-            break;
-          case 'SELECT_MULTIPLE_TREE':
-            // 下拉树多选
-            if (item.value) {
-              var ids = [];
-              var names = [];
-              var _list = item.value;
-              _list.forEach(function (str) {
-                ids.push(str.id);
-                names.push(str.name);
-              });
-              obj.semantic = names;
-              obj.value = names;
-            } else if (nullList$1.includes(item.operator.value)) {
-              obj.value = [NULL_MAP$1[item.operator.value].label];
-              obj.semantic = [NULL_MAP$1[item.operator.value].label];
-            }
-            break;
-          case 'SELECT_TREE':
-            // 下拉树单选
-            if (item.value) {
-              obj.semantic = [item.field.label];
-              obj.value = [item.field.label];
-            } else if (nullList$1.includes(item.operator.value)) {
-              obj.value = [NULL_MAP$1[item.operator.value].value];
-              obj.semantic = [NULL_MAP$1[item.operator.value].label];
-            }
-            break;
-          case 'MULTIPLE_SELECT':
-            // 下拉多选
-            if (item.value) {
-              var _item$value;
-              var _values = (_item$value = item.value) === null || _item$value === void 0 ? void 0 : _item$value.map(function (el) {
-                var findTemp = item.field.dataSource.find(function (innerItem) {
-                  return innerItem.value === el;
-                });
-                return (findTemp || {
-                  label: el
-                }).label;
-              });
-              obj.value = _values;
-              obj.semantic = _values;
-            } else if (nullList$1.includes(item.operator.value)) {
-              obj.value = [NULL_MAP$1[item.operator.value].value];
-              obj.semantic = [NULL_MAP$1[item.operator.value].label];
-            }
-            break;
-          case 'SELECT':
-            // 下拉单选
-            if (item.value !== undefined) {
-              obj.value = [item.value];
-              var _list3 = item.field.dataSource.filter(function (el) {
-                return el.value === item.value;
-              });
-              obj.semantic = [_list3[0].label];
-            } else if (nullList$1.includes(item.operator.value)) {
-              obj.value = [NULL_MAP$1[item.operator.value].value];
-              obj.semantic = [NULL_MAP$1[item.operator.value].label];
-            }
-            break;
-          case 'NUMBER_INT': // 整数
-          case 'NUMBER_DECIMAL':
-            // 小数
-            if (item.value || item.value === 0) {
-              obj.semantic = Array.isArray(item.value) ? item.value : [item.value];
-              obj.value = Array.isArray(item.value) ? item.value : [item.value];
-            } else if (nullList$1.includes(item.operator.value)) {
-              obj.value = [NULL_MAP$1[item.operator.value].value];
-              obj.semantic = [NULL_MAP$1[item.operator.value].label];
-            }
-            break;
-          case 'STRING':
-            // 字符
-            if (item.value) {
-              if (item.operator.value === 'LIKE') {
-                // 假如是like操作还需要区分出或者还是并且的关系
-                obj.value = item.value.value.map(function (val) {
-                  return val.replace(reg$1, '\\\'');
-                });
-                obj.multiText = item.value.relation ? 'AND' : 'OR';
-                obj.semantic = item.value;
-              } else if (Array.isArray(item.value)) {
-                obj.semantic = item.value.filter(function (val) {
-                  return val !== '';
-                });
-                obj.value = item.value.filter(function (val) {
-                  return val !== '';
-                }).map(function (val) {
-                  return val.replace(reg$1, '\\\'');
-                });
-              } else {
-                obj.semantic = [item.value];
-                obj.value = [item.value.replace(reg$1, '\\\'')];
-              }
-            } else if (nullList$1.includes(item.operator.value)) {
-              obj.value = [NULL_MAP$1[item.operator.value].value];
-              obj.semantic = [NULL_MAP$1[item.operator.value].label];
-            }
-            break;
-        }
-      }
-      arr.push(obj);
-    });
-    return arr;
-  }
-  function queryConditionToStringNew(array) {
-    var obj = {
-      str: [],
-      title: [],
-      value: parsingNewCondition(array).filter(function (item) {
-        return item.value.length || item.operator === "ISNULL" || item.operator === "NONULL";
-      })
-    };
-    return obj;
-  }
-
-  /**
-   * 计算已选商品和sku的数量
-   * @param {*} Object || Array
-   */
-  function resultGoodsLength$1(obj) {
-    // TODO SELECT
-    var len = 0;
-    if (Array.isArray(obj)) {
-      if (obj.length) {
-        obj.forEach(function (item) {
-          if (item.rowExpandable) {
-            len += item.skus.length;
-          } else {
-            len += 1;
-          }
-        });
-      }
-    } else {
-      Object.keys(obj).forEach(function (item) {
-        if (obj[item].rowExpandable) {
-          // 假如是sku展开状态则商品数量以sku数量为准
-          len += obj[item].skus.length;
-        } else {
-          len += 1;
-        }
-      });
-    }
-    return len;
-  }
-
   // 动态条件
   function DynamicCondition(props) {
     var _useState = React.useState([]),
@@ -50846,7 +50888,7 @@
     return /*#__PURE__*/React__default['default'].createElement("div", {
       className: "".concat(prefixCls, "-rule-group")
     }, /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "".concat(prefixCls, "-rule-group-title-new")
+      className: "".concat(prefixCls, "-rule-group-title")
     }, /*#__PURE__*/React__default['default'].createElement("span", {
       style: {
         display: 'flex'
@@ -50872,7 +50914,7 @@
       currentRule: props.currentRule,
       setCurrentRule: props.setDynamicCondition
     }, /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "condition-tab-wrap goods-table-wrap"
+      className: "edit-condition ".concat(prefixCls, "-goods-selector-new-goods-table-wrap")
     }, /*#__PURE__*/React__default['default'].createElement(Conditions$1.Form, null))) : /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Loading, null));
   }
 
@@ -51136,7 +51178,7 @@
         maxWidth: "570px"
       }
     }, /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "".concat(prefixCls, "-goods-selector-pro-create-history-new")
+      className: "".concat(prefixCls, "-goods-selector-new-create-condition")
     }, /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tips, {
       icon: "info-circle1",
       msg: "<div><div>1. \u53EF\u521B\u5EFA\u548C\u4FDD\u5B58\u6700\u8FD1\u768430\u4E2A\u5546\u54C1\u67E5\u8BE2\u6761\u4EF6\uFF1B\u8D85\u8FC730\u4E2A\u65F6\uFF0C\u7CFB\u7EDF\u5C06\u6309\u4ECE\u65E9\u53CA\u665A\u89C4\u5219\u5220\u9664\u3002</div><div>2. \u4FDD\u5B58\u6210\u529F\u540E\uFF0C\u53EF\u70B9\u51FB\u3010\u5E38\u7528\u67E5\u8BE2\u6761\u4EF6\u3011\u627E\u5230\u4FDD\u5B58\u8FC7\u7684\u67E5\u8BE2\u6761\u4EF6\u3002</div></div>",
@@ -51577,6 +51619,7 @@
       };
     }();
     var handleMatch = function handleMatch() {
+      var _batchResult$data, _batchResult$data$dat;
       if (!isMatch) {
         cloudReactV2.Message.error('请先进行匹配');
         return;
@@ -51588,7 +51631,7 @@
       }
       var addNum = props.limit - resultGoodsLength$1(ctxValue.globalSelect);
       // TODO 去重
-      var addList = batchResult.data.data.slice(0, addNum);
+      var addList = ((_batchResult$data = batchResult.data) === null || _batchResult$data === void 0 ? void 0 : (_batchResult$data$dat = _batchResult$data.data) === null || _batchResult$data$dat === void 0 ? void 0 : _batchResult$data$dat.length) ? batchResult.data.data.slice(0, addNum) : [];
       ctxValue.setAllGlobalSelect(addList, ctxValue.globalSelect, true);
       if (!isSupportAllPlatShop) {
         ctxValue.setAllGlobalSearch(addList);
@@ -51607,7 +51650,7 @@
       initData();
     };
     var footer = /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "goods-selector-pro-node-new-footer"
+      className: "".concat(prefixCls, "-goods-selector-new-footer")
     }, !props.readonly ? /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Button, {
       className: "cancel",
       onClick: closePop
@@ -52690,7 +52733,7 @@
       }
     }), "\u53EF\u5C06\u5E38\u7528\u7684\u67E5\u8BE2\u6761\u4EF6\u8BBE\u4E3A\u9ED8\u8BA4\uFF0C\u9ED8\u8BA4\u7684\u67E5\u8BE2\u6761\u4EF6\u5C06\u88AB\u56FA\u5B9A\u5728\u5546\u54C1\u641C\u7D22\u6761\u4EF6\u7684\u754C\u9762\u4E0A\u3002");
     return /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "newCloud-add-condition"
+      className: "add-condition-new"
     }, /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tips, {
       msg: tipNode
     }), /*#__PURE__*/React__default['default'].createElement("div", {
@@ -53785,7 +53828,7 @@
     // const hiddenDisplayQuery = usedQuery.slice(6);
 
     var footer = /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "goods-selector-pro-node-new-footer"
+      className: "".concat(prefixCls, "-goods-selector-new-footer")
     }, !props.readonly ? /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Button, {
       className: "cancel",
       onClick: handleClose
@@ -53798,7 +53841,7 @@
       onClick: handleOk
     }, "\u786E\u5B9A"));
     return /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "goods-selector-pro-form-new"
+      className: "".concat(prefixCls, "-goods-selector-new-goods-form")
     }, dropDown && usedQuery.length ? usedQuery.map(function (item) {
       var itemId = item.itemId,
         itemName = item.itemName,
@@ -54565,7 +54608,7 @@
               // const tableList = Object.values(ctxValue.globalTableList);
               // ctxValue.setSkuToggleStatus(tableList, ctxValue.globalTableList, false);
               // ctxValue.setIsExpandAll(false);
-              ctxValue.setAllGlobalSelect([], ctxValue.globalSelect, false);
+              ctxValue.setAllGlobalSelect([], [], false);
               resultGoodsLength$1([]);
               setTimeout(function () {
                 setLoading(false);
@@ -54632,7 +54675,7 @@
       setColumns(ctxValue.globalSelectColumn);
     }, [ctxValue.globalSelectColumn]);
     return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "newCloud-goods-table-wrap"
+      className: "".concat(prefixCls, "-goods-selector-new-goods-table-wrap")
     }, allQuery.length ? /*#__PURE__*/React__default['default'].createElement(GoodsForm$1, {
       platShop: platShop,
       platShopList: platShopList,
@@ -54948,7 +54991,7 @@
       setColumns(ctxValue.globalSelectColumn);
     }, [ctxValue.globalSelectColumn]);
     return /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "cloud-select-tab-wrap-new newCloud-goods-table-wrap"
+      className: "".concat(prefixCls, "-goods-selector-new-selected-tab ").concat(prefixCls, "-goods-selector-new-goods-table-wrap")
     }, /*#__PURE__*/React__default['default'].createElement("div", {
       className: "justify-between"
     }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -55131,18 +55174,9 @@
     }();
     var onClose = function onClose() {
       props.onClose(globalSelect);
-      // setCurrentPageNum(1),
-      // setCurrentPageSize(10)
     };
-
-    // const footer = <>
-    // 	{!props.readonly ? <Button style={{ marginRight: 16 }} className="cancel-btn" onClick={onCancel}>取消</Button> : null}
-    // 	<Button type="primary" onClick={onOk}>确定</Button>
-
-    // </>;
-
     var footer = /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "goods-selector-pro-node-new-footer"
+      className: "".concat(prefixCls, "-goods-selector-new-footer")
     }, !props.readonly ? /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Button, {
       className: "cancel",
       onClick: onCancel
@@ -55165,7 +55199,7 @@
     }, /*#__PURE__*/React__default['default'].createElement(GoodsProvider$1, {
       value: props.ctxContext
     }, /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "".concat(prefixCls, "-goods-selector-pro-container-new"),
+      className: "".concat(prefixCls, "-goods-selector-new-goods-modal"),
       style: {
         position: 'relative'
       }
@@ -55178,7 +55212,7 @@
       })
     }) : null, /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tabs, {
       defaultActiveKey: "all",
-      className: "".concat(prefixCls, "-goods-selector-pro-new"),
+      className: "".concat(prefixCls, "-goods-selector-new-goods-modal-tabs"),
       activeKey: nowActive,
       mode: "remain",
       type: "line",
@@ -55186,7 +55220,7 @@
     }, tabList.includes('all') && !readonly && /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tabs.Panel, {
       tab: "\u5168\u90E8\u5546\u54C1",
       key: "all",
-      className: "".concat(prefixCls, "-goods-selector-pro-new-panel")
+      className: "".concat(prefixCls, "-goods-selector-new-goods-modal-tabs-panel")
     }, /*#__PURE__*/React__default['default'].createElement(AllGoods$1, _extends({
       tabActive: nowActive
     }, props, {
@@ -55195,7 +55229,7 @@
     }))), tabList.includes('selected') && /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tabs.Panel, {
       tab: "\u5DF2\u9009\u5546\u54C1",
       key: "selected",
-      className: "".concat(prefixCls, "-goods-selector-pro-new-panel")
+      className: "".concat(prefixCls, "-goods-selector-new-goods-modal-tabs-panel")
     }, /*#__PURE__*/React__default['default'].createElement(SelectGoods$2, {
       server: server,
       extraQuery: extraQuery,
@@ -55455,7 +55489,7 @@
     return /*#__PURE__*/React__default['default'].createElement("div", {
       className: "".concat(prefixCls, "-rule-group")
     }, /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "".concat(prefixCls, "-rule-group-title-new")
+      className: "".concat(prefixCls, "-rule-group-title")
     }, /*#__PURE__*/React__default['default'].createElement("span", {
       style: {
         display: 'flex'
@@ -56254,9 +56288,9 @@
       supportSku: props.supportSku,
       showPage: showPage
     })))), tabList.includes('find') ? /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "".concat(prefixCls, "-goods-selector-pro-container")
+      className: "".concat(prefixCls, "-goods-selector-new-goods-modal")
     }, /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "".concat(prefixCls, "-good-rules-container")
+      className: "".concat(prefixCls, "-goods-selector-new-rules-container")
     }, !props.supportConditionsOnlyGoods && /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tips, {
       icon: "info-circle1",
       msg: "\u540C\u65F6\u4FDD\u5B58\u5546\u54C1\u67E5\u8BE2\u548C\u6761\u4EF6\u67E5\u8BE2\uFF0C\u67E5\u8BE2\u7ED3\u679C\u4E3A\u4E24\u8005\u7684\u5E76\u96C6\u3002",
@@ -56361,7 +56395,7 @@
       renameData: renameData,
       ctxValue: ctxValue
     }))) : /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "".concat(prefixCls, "-goods-selector-pro-container-new"),
+      className: "".concat(prefixCls, "-goods-selector-new-goods-modal"),
       style: {
         position: 'relative'
       }
@@ -56374,7 +56408,7 @@
       })
     }) : null, /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tabs, {
       defaultActiveKey: "1",
-      className: "".concat(prefixCls, "-goods-selector-pro-new"),
+      className: "".concat(prefixCls, "-goods-selector-new-goods-modal-tabs"),
       activeKey: nowActive,
       mode: "remain",
       type: "line",
@@ -56382,7 +56416,7 @@
     }, tabList.includes('all') && !props.readonly && /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tabs.Panel, {
       tab: "\u5168\u90E8\u5546\u54C1",
       key: "all",
-      className: "".concat(prefixCls, "-goods-selector-pro-new-panel")
+      className: "".concat(prefixCls, "-goods-selector-new-goods-modal-tab-panel")
     }, /*#__PURE__*/React__default['default'].createElement(AllGoods$1, _extends({}, props, {
       tabActive: nowActive,
       changeCondition: changeCondition,
@@ -56390,7 +56424,7 @@
     }))), tabList.includes('selected') && /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Tabs.Panel, {
       tab: "\u5DF2\u9009\u5546\u54C1",
       key: "selected",
-      className: "".concat(prefixCls, "-goods-selector-pro-new-panel")
+      className: "".concat(prefixCls, "-goods-selector-new-goods-modal-tabs-panel")
     }, /*#__PURE__*/React__default['default'].createElement(SelectGoods$2, {
       server: server,
       extraQuery: extraQuery,
@@ -56591,7 +56625,7 @@
       setModalVisible(visible);
     }, [visible]);
     var footer = /*#__PURE__*/React__default['default'].createElement("div", {
-      className: "goods-selector-pro-node-new-footer"
+      className: "".concat(prefixCls, "-goods-selector-new-footer")
     }, /*#__PURE__*/React__default['default'].createElement(cloudReactV2.Button, {
       className: "cancel",
       onClick: onCancel
@@ -56676,7 +56710,7 @@
       onClose: onClose
       // onCancel={onCancel}
       ,
-      className: "goods-selector-pro-node-new"
+      className: "".concat(prefixCls, "-goods-selector-new")
     }, visible && rulesVisible && /*#__PURE__*/React__default['default'].createElement(Rules, _extends({
       modalRef: modalRef,
       forwardRef: ref
@@ -111425,9 +111459,18 @@
       };
       _this.handleInsertKeywordAndText = function (content, keyword) {
         var _ref2;
-        var arr = (_ref2 = []).concat.apply(_ref2, _toConsumableArray(content.split(/(?=œœ_)/).map(function (item) {
-          return item.split(/(?<=_œœ)/);
-        })));
+        var reg1 = new RegExp(/(?=œœ_)/);
+        // 将 变量文本字符串 拆分成 变量 和 文本
+        // => 将 "文本1œœ_[bianliang]变量_œœ文本2œœ_[taoba]订单短[2323]_œœœœ_[taobao]XMTB_œœ"
+        // => 转换成 ['文本1', 'œœ_[bianliang]变量_œœ', '文本2', 'œœ_[taoba]订单短[2323]_œœ', 'œœ_[taobao]XMTB_œœ']
+        var arr = (_ref2 = []).concat.apply(_ref2, _toConsumableArray(content.split(reg1).map(function (item) {
+          return item.split(/_œœ/);
+        }))).map(function (item) {
+          if (item.includes('œœ_')) {
+            return "".concat(item, "_\u0153\u0153");
+          }
+          return item;
+        }).filter(Boolean);
         arr.forEach(function (item) {
           if (item.includes('œœ_[')) {
             var type = item.match(/œœ_\[.*?]/g)[0].replace(/œœ_\[|]/g, '');
@@ -112384,7 +112427,8 @@
       _this.originalPreviewText = [];
       _this.originalTotalChars = 0;
       _this.getPureEditorText = function (editorText) {
-        return editorText.replace(/\(.*?\)(?=_œœ)/g, '');
+        var reg = new RegExp(/\(.*?\)(?=_œœ)/g);
+        return editorText.replace(reg, '');
       };
       _this.getPureText = function (editorText) {
         return editorText.replace(/œœ_.*?_œœ|þ_enter_þ/g, '');
@@ -114767,7 +114811,7 @@
     var key = "atom" + ++keyCount;
     var config = {
       toString: function toString() {
-        return key;
+        return  this.debugLabel ? key + ':' + this.debugLabel : key;
       }
     };
     if (typeof read === 'function') {
@@ -114797,7 +114841,7 @@
   function _createForOfIteratorHelperLoose(r, e) {
     var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
     if (t) return (t = t.call(r)).next.bind(t);
-    if (Array.isArray(r) || (t = _unsupportedIterableToArray$2(r)) || e  ) {
+    if (Array.isArray(r) || (t = _unsupportedIterableToArray$2(r)) || e) {
       t && (r = t);
       var o = 0;
       return function () {
@@ -114828,240 +114872,237 @@
   var isActuallyWritableAtom = function isActuallyWritableAtom(atom) {
     return !!atom.write;
   };
-  var cancelPromiseMap = new WeakMap();
-  var registerCancelPromise = function registerCancelPromise(promise, cancel) {
-    cancelPromiseMap.set(promise, cancel);
-    promise.catch(function () {}).finally(function () {
-      return cancelPromiseMap.delete(promise);
-    });
-  };
-  var cancelPromise = function cancelPromise(promise, next) {
-    var cancel = cancelPromiseMap.get(promise);
-    if (cancel) {
-      cancelPromiseMap.delete(promise);
-      cancel(next);
+  var CONTINUE_PROMISE = Symbol( 'CONTINUE_PROMISE' );
+  var PENDING = 'pending';
+  var FULFILLED = 'fulfilled';
+  var REJECTED = 'rejected';
+  var isContinuablePromise = function isContinuablePromise(promise) {
+    return typeof promise === 'object' && promise !== null && CONTINUE_PROMISE in promise;
+  };
+  var continuablePromiseMap = new WeakMap();
+  var createContinuablePromise = function createContinuablePromise(promise, abort, complete) {
+    if (!continuablePromiseMap.has(promise)) {
+      var continuePromise;
+      var p = new Promise(function (resolve, reject) {
+        var curr = promise;
+        var onFulfilled = function onFulfilled(me) {
+          return function (v) {
+            if (curr === me) {
+              p.status = FULFILLED;
+              p.value = v;
+              resolve(v);
+              complete();
+            }
+          };
+        };
+        var onRejected = function onRejected(me) {
+          return function (e) {
+            if (curr === me) {
+              p.status = REJECTED;
+              p.reason = e;
+              reject(e);
+              complete();
+            }
+          };
+        };
+        promise.then(onFulfilled(promise), onRejected(promise));
+        continuePromise = function continuePromise(nextPromise, nextAbort) {
+          if (nextPromise) {
+            continuablePromiseMap.set(nextPromise, p);
+            curr = nextPromise;
+            nextPromise.then(onFulfilled(nextPromise), onRejected(nextPromise));
+            abort();
+            abort = nextAbort;
+          }
+        };
+      });
+      p.status = PENDING;
+      p[CONTINUE_PROMISE] = continuePromise;
+      continuablePromiseMap.set(promise, p);
     }
-  };
-  var resolvePromise = function resolvePromise(promise, value) {
-    promise.status = 'fulfilled';
-    promise.value = value;
-  };
-  var rejectPromise = function rejectPromise(promise, e) {
-    promise.status = 'rejected';
-    promise.reason = e;
+    return continuablePromiseMap.get(promise);
   };
   var isPromiseLike = function isPromiseLike(x) {
     return typeof (x == null ? void 0 : x.then) === 'function';
   };
-  var isEqualAtomValue = function isEqualAtomValue(a, b) {
-    return !!a && 'v' in a && 'v' in b && Object.is(a.v, b.v);
-  };
-  var isEqualAtomError = function isEqualAtomError(a, b) {
-    return !!a && 'e' in a && 'e' in b && Object.is(a.e, b.e);
-  };
-  var hasPromiseAtomValue = function hasPromiseAtomValue(a) {
-    return !!a && 'v' in a && a.v instanceof Promise;
-  };
-  var isEqualPromiseAtomValue = function isEqualPromiseAtomValue(a, b) {
-    return 'v' in a && 'v' in b && a.v.orig && a.v.orig === b.v.orig;
+  var isAtomStateInitialized = function isAtomStateInitialized(atomState) {
+    return 'v' in atomState || 'e' in atomState;
   };
   var returnAtomValue = function returnAtomValue(atomState) {
     if ('e' in atomState) {
       throw atomState.e;
     }
+    if ( !('v' in atomState)) {
+      throw new Error('[Bug] atom state is not initialized');
+    }
     return atomState.v;
   };
-  var createStore$1$1 = function createStore() {
+  var getPendingContinuablePromise = function getPendingContinuablePromise(atomState) {
+    var value = atomState.v;
+    if (isContinuablePromise(value) && value.status === PENDING) {
+      return value;
+    }
+    return null;
+  };
+  var addPendingContinuablePromiseToDependency = function addPendingContinuablePromiseToDependency(atom, promise, dependencyAtomState) {
+    if (!dependencyAtomState.p.has(atom)) {
+      dependencyAtomState.p.add(atom);
+      promise.then(function () {
+        dependencyAtomState.p.delete(atom);
+      }, function () {
+        dependencyAtomState.p.delete(atom);
+      });
+    }
+  };
+  var createPending = function createPending() {
+    return [new Map(), new Map(), new Set()];
+  };
+  var addPendingAtom = function addPendingAtom(pending, atom, atomState) {
+    if (!pending[0].has(atom)) {
+      pending[0].set(atom, new Set());
+    }
+    pending[1].set(atom, atomState);
+  };
+  var addPendingDependent = function addPendingDependent(pending, atom, dependent) {
+    var dependents = pending[0].get(atom);
+    if (dependents) {
+      dependents.add(dependent);
+    }
+  };
+  var getPendingDependents = function getPendingDependents(pending, atom) {
+    return pending[0].get(atom);
+  };
+  var addPendingFunction = function addPendingFunction(pending, fn) {
+    pending[2].add(fn);
+  };
+  var flushPending = function flushPending(pending) {
+    while (pending[1].size || pending[2].size) {
+      pending[0].clear();
+      var _atomStates = new Set(pending[1].values());
+      pending[1].clear();
+      var _functions = new Set(pending[2]);
+      pending[2].clear();
+      _atomStates.forEach(function (atomState) {
+        var _atomState$m;
+        return (_atomState$m = atomState.m) == null ? void 0 : _atomState$m.l.forEach(function (l) {
+          return l();
+        });
+      });
+      _functions.forEach(function (fn) {
+        return fn();
+      });
+    }
+  };
+  var createStore$2 = function createStore() {
     var atomStateMap = new WeakMap();
-    var mountedMap = new WeakMap();
-    var pendingStack = [];
-    var pendingMap = new WeakMap();
-    var devListenersRev2;
-    var mountedAtoms;
+    var debugMountedAtoms;
     {
-      devListenersRev2 = new Set();
-      mountedAtoms = new Set();
+      debugMountedAtoms = new Set();
     }
     var getAtomState = function getAtomState(atom) {
-      return atomStateMap.get(atom);
-    };
-    var addPendingDependent = function addPendingDependent(atom, atomState) {
-      atomState.d.forEach(function (_, a) {
-        if (!pendingMap.has(a)) {
-          var aState = getAtomState(a);
-          pendingMap.set(a, [aState, new Set()]);
-          if (aState) {
-            addPendingDependent(a, aState);
-          }
-        }
-        pendingMap.get(a)[1].add(atom);
-      });
-    };
-    var setAtomState = function setAtomState(atom, atomState) {
-      var _pendingStack;
-      {
-        Object.freeze(atomState);
-      }
-      var prevAtomState = getAtomState(atom);
-      atomStateMap.set(atom, atomState);
-      (_pendingStack = pendingStack[pendingStack.length - 1]) == null || _pendingStack.add(atom);
-      if (!pendingMap.has(atom)) {
-        pendingMap.set(atom, [prevAtomState, new Set()]);
-        addPendingDependent(atom, atomState);
-      }
-      if (hasPromiseAtomValue(prevAtomState)) {
-        var _next = 'v' in atomState ? atomState.v instanceof Promise ? atomState.v : Promise.resolve(atomState.v) : Promise.reject(atomState.e);
-        if (prevAtomState.v !== _next) {
-          cancelPromise(prevAtomState.v, _next);
-        }
-      }
-    };
-    var updateDependencies = function updateDependencies(atom, nextAtomState, nextDependencies, keepPreviousDependencies) {
-      var dependencies = new Map(keepPreviousDependencies ? nextAtomState.d : null);
-      var changed = false;
-      nextDependencies.forEach(function (aState, a) {
-        if (!aState && isSelfAtom(atom, a)) {
-          aState = nextAtomState;
-        }
-        if (aState) {
-          dependencies.set(a, aState);
-          if (nextAtomState.d.get(a) !== aState) {
-            changed = true;
-          }
-        } else {
-          console.warn('[Bug] atom state not found');
-        }
-      });
-      if (changed || nextAtomState.d.size !== dependencies.size) {
-        nextAtomState.d = dependencies;
+      var atomState = atomStateMap.get(atom);
+      if (!atomState) {
+        atomState = {
+          d: new Map(),
+          p: new Set(),
+          n: 0
+        };
+        atomStateMap.set(atom, atomState);
       }
+      return atomState;
     };
-    var setAtomValue = function setAtomValue(atom, value, nextDependencies, keepPreviousDependencies) {
-      var prevAtomState = getAtomState(atom);
-      var nextAtomState = {
-        d: (prevAtomState == null ? void 0 : prevAtomState.d) || new Map(),
-        v: value
-      };
-      if (nextDependencies) {
-        updateDependencies(atom, nextAtomState, nextDependencies, keepPreviousDependencies);
-      }
-      if (isEqualAtomValue(prevAtomState, nextAtomState) && prevAtomState.d === nextAtomState.d) {
-        return prevAtomState;
+    var setAtomStateValueOrPromise = function setAtomStateValueOrPromise(atom, atomState, valueOrPromise, abortPromise, completePromise) {
+      if (abortPromise === void 0) {
+        abortPromise = function abortPromise() {};
       }
-      if (hasPromiseAtomValue(prevAtomState) && hasPromiseAtomValue(nextAtomState) && isEqualPromiseAtomValue(prevAtomState, nextAtomState)) {
-        if (prevAtomState.d === nextAtomState.d) {
-          return prevAtomState;
-        } else {
-          nextAtomState.v = prevAtomState.v;
-        }
+      if (completePromise === void 0) {
+        completePromise = function completePromise() {};
       }
-      setAtomState(atom, nextAtomState);
-      return nextAtomState;
-    };
-    var setAtomValueOrPromise = function setAtomValueOrPromise(atom, valueOrPromise, nextDependencies, abortPromise) {
+      var hasPrevValue = 'v' in atomState;
+      var prevValue = atomState.v;
+      var pendingPromise = getPendingContinuablePromise(atomState);
       if (isPromiseLike(valueOrPromise)) {
-        var continuePromise;
-        var updatePromiseDependencies = function updatePromiseDependencies() {
-          var prevAtomState = getAtomState(atom);
-          if (!hasPromiseAtomValue(prevAtomState) || prevAtomState.v !== promise) {
-            return;
-          }
-          var nextAtomState = setAtomValue(atom, promise, nextDependencies);
-          if (mountedMap.has(atom) && prevAtomState.d !== nextAtomState.d) {
-            mountDependencies(atom, nextAtomState, prevAtomState.d);
+        if (pendingPromise) {
+          if (pendingPromise !== valueOrPromise) {
+            pendingPromise[CONTINUE_PROMISE](valueOrPromise, abortPromise);
+            ++atomState.n;
           }
-        };
-        var promise = new Promise(function (resolve, reject) {
-          var settled = false;
-          valueOrPromise.then(function (v) {
-            if (!settled) {
-              settled = true;
-              resolvePromise(promise, v);
-              resolve(v);
-              updatePromiseDependencies();
-            }
-          }, function (e) {
-            if (!settled) {
-              settled = true;
-              rejectPromise(promise, e);
-              reject(e);
-              updatePromiseDependencies();
-            }
-          });
-          continuePromise = function continuePromise(next) {
-            if (!settled) {
-              settled = true;
-              next.then(function (v) {
-                return resolvePromise(promise, v);
-              }, function (e) {
-                return rejectPromise(promise, e);
-              });
-              resolve(next);
+        } else {
+          var continuablePromise = createContinuablePromise(valueOrPromise, abortPromise, completePromise);
+          if (continuablePromise.status === PENDING) {
+            for (var _iterator = _createForOfIteratorHelperLoose(atomState.d.keys()), _step; !(_step = _iterator()).done;) {
+              var a = _step.value;
+              var aState = getAtomState(a);
+              addPendingContinuablePromiseToDependency(atom, continuablePromise, aState);
             }
-          };
-        });
-        promise.orig = valueOrPromise;
-        promise.status = 'pending';
-        registerCancelPromise(promise, function (next) {
-          if (next) {
-            continuePromise(next);
-            abortPromise == null || abortPromise();
           }
-        });
-        return setAtomValue(atom, promise, nextDependencies, true);
+          atomState.v = continuablePromise;
+          delete atomState.e;
+        }
+      } else {
+        if (pendingPromise) {
+          pendingPromise[CONTINUE_PROMISE](Promise.resolve(valueOrPromise), abortPromise);
+        }
+        atomState.v = valueOrPromise;
+        delete atomState.e;
+      }
+      if (!hasPrevValue || !Object.is(prevValue, atomState.v)) {
+        ++atomState.n;
       }
-      return setAtomValue(atom, valueOrPromise, nextDependencies);
     };
-    var setAtomError = function setAtomError(atom, error, nextDependencies) {
-      var prevAtomState = getAtomState(atom);
-      var nextAtomState = {
-        d: (prevAtomState == null ? void 0 : prevAtomState.d) || new Map(),
-        e: error
-      };
-      if (nextDependencies) {
-        updateDependencies(atom, nextAtomState, nextDependencies);
+    var addDependency = function addDependency(pending, atom, a, aState) {
+      var _aState$m;
+      if ( a === atom) {
+        throw new Error('[Bug] atom cannot depend on itself');
       }
-      if (isEqualAtomError(prevAtomState, nextAtomState) && prevAtomState.d === nextAtomState.d) {
-        return prevAtomState;
+      var atomState = getAtomState(atom);
+      atomState.d.set(a, aState.n);
+      var continuablePromise = getPendingContinuablePromise(atomState);
+      if (continuablePromise) {
+        addPendingContinuablePromiseToDependency(atom, continuablePromise, aState);
+      }
+      (_aState$m = aState.m) == null || _aState$m.t.add(atom);
+      if (pending) {
+        addPendingDependent(pending, a, atom);
       }
-      setAtomState(atom, nextAtomState);
-      return nextAtomState;
     };
-    var readAtomState = function readAtomState(atom, force) {
+    var readAtomState = function readAtomState(pending, atom, force) {
       var atomState = getAtomState(atom);
-      if (!(force != null && force(atom)) && atomState) {
-        if (mountedMap.has(atom)) {
+      if (!(force != null && force(atom)) && isAtomStateInitialized(atomState)) {
+        if (atomState.m) {
           return atomState;
         }
         if (Array.from(atomState.d).every(function (_ref) {
           var a = _ref[0],
-            s = _ref[1];
-          if (a === atom) {
-            return true;
-          }
-          var aState = readAtomState(a, force);
-          return aState === s || isEqualAtomValue(aState, s);
+            n = _ref[1];
+          return readAtomState(pending, a, force).n === n;
         })) {
           return atomState;
         }
       }
-      var nextDependencies = new Map();
+      atomState.d.clear();
       var isSync = true;
       var getter = function getter(a) {
         if (isSelfAtom(atom, a)) {
           var _aState = getAtomState(a);
-          if (_aState) {
-            nextDependencies.set(a, _aState);
-            return returnAtomValue(_aState);
-          }
-          if (hasInitialValue(a)) {
-            nextDependencies.set(a, undefined);
-            return a.init;
+          if (!isAtomStateInitialized(_aState)) {
+            if (hasInitialValue(a)) {
+              setAtomStateValueOrPromise(a, _aState, a.init);
+            } else {
+              throw new Error('no atom init');
+            }
           }
-          throw new Error('no atom init');
+          return returnAtomValue(_aState);
+        }
+        var aState = readAtomState(pending, a, force);
+        if (isSync) {
+          addDependency(pending, atom, a, aState);
+        } else {
+          var _pending = createPending();
+          addDependency(_pending, atom, a, aState);
+          mountDependencies(_pending, atom, atomState);
+          flushPending(_pending);
         }
-        var aState = readAtomState(a, force);
-        nextDependencies.set(a, aState);
         return returnAtomValue(aState);
       };
       var controller;
@@ -115095,37 +115136,52 @@
       };
       try {
         var valueOrPromise = atom.read(getter, options);
-        return setAtomValueOrPromise(atom, valueOrPromise, nextDependencies, function () {
+        setAtomStateValueOrPromise(atom, atomState, valueOrPromise, function () {
           var _controller;
           return (_controller = controller) == null ? void 0 : _controller.abort();
+        }, function () {
+          if (atomState.m) {
+            var _pending2 = createPending();
+            mountDependencies(_pending2, atom, atomState);
+            flushPending(_pending2);
+          }
         });
+        return atomState;
       } catch (error) {
-        return setAtomError(atom, error, nextDependencies);
+        delete atomState.v;
+        atomState.e = error;
+        ++atomState.n;
+        return atomState;
       } finally {
         isSync = false;
       }
     };
     var readAtom = function readAtom(atom) {
-      return returnAtomValue(readAtomState(atom));
+      return returnAtomValue(readAtomState(undefined, atom));
     };
-    var recomputeDependents = function recomputeDependents(atom) {
+    var recomputeDependents = function recomputeDependents(pending, atom) {
       var getDependents = function getDependents(a) {
-        var _mountedMap$get, _pendingMap$get;
-        var dependents = new Set((_mountedMap$get = mountedMap.get(a)) == null ? void 0 : _mountedMap$get.t);
-        (_pendingMap$get = pendingMap.get(a)) == null || _pendingMap$get[1].forEach(function (dependent) {
+        var _aState$m2, _getPendingDependents;
+        var aState = getAtomState(a);
+        var dependents = new Set((_aState$m2 = aState.m) == null ? void 0 : _aState$m2.t);
+        for (var _iterator2 = _createForOfIteratorHelperLoose(aState.p), _step2; !(_step2 = _iterator2()).done;) {
+          var atomWithPendingContinuablePromise = _step2.value;
+          dependents.add(atomWithPendingContinuablePromise);
+        }
+        (_getPendingDependents = getPendingDependents(pending, a)) == null || _getPendingDependents.forEach(function (dependent) {
           dependents.add(dependent);
         });
         return dependents;
       };
-      var topsortedAtoms = new Array();
+      var topsortedAtoms = [];
       var markedAtoms = new Set();
       var visit = function visit(n) {
         if (markedAtoms.has(n)) {
           return;
         }
         markedAtoms.add(n);
-        for (var _iterator = _createForOfIteratorHelperLoose(getDependents(n)), _step; !(_step = _iterator()).done;) {
-          var m = _step.value;
+        for (var _iterator3 = _createForOfIteratorHelperLoose(getDependents(n)), _step3; !(_step3 = _iterator3()).done;) {
+          var m = _step3.value;
           if (n !== m) {
             visit(m);
           }
@@ -115139,37 +115195,32 @@
       };
       for (var i = topsortedAtoms.length - 1; i >= 0; --i) {
         var a = topsortedAtoms[i];
-        var _prevAtomState = getAtomState(a);
-        if (!_prevAtomState) {
-          continue;
-        }
+        var aState = getAtomState(a);
+        var prevEpochNumber = aState.n;
         var hasChangedDeps = false;
-        for (var _iterator2 = _createForOfIteratorHelperLoose(_prevAtomState.d.keys()), _step2; !(_step2 = _iterator2()).done;) {
-          var dep = _step2.value;
+        for (var _iterator4 = _createForOfIteratorHelperLoose(aState.d.keys()), _step4; !(_step4 = _iterator4()).done;) {
+          var dep = _step4.value;
           if (dep !== a && changedAtoms.has(dep)) {
             hasChangedDeps = true;
             break;
           }
         }
         if (hasChangedDeps) {
-          var nextAtomState = readAtomState(a, isMarked);
-          addPendingDependent(a, nextAtomState);
-          if (!isEqualAtomValue(_prevAtomState, nextAtomState)) {
+          readAtomState(pending, a, isMarked);
+          mountDependencies(pending, a, aState);
+          if (prevEpochNumber !== aState.n) {
+            addPendingAtom(pending, a, aState);
             changedAtoms.add(a);
           }
         }
         markedAtoms.delete(a);
       }
     };
-    var writeAtomState = function writeAtomState(atom) {
+    var writeAtomState = function writeAtomState(pending, atom) {
       var getter = function getter(a) {
-        return returnAtomValue(readAtomState(a));
+        return returnAtomValue(readAtomState(pending, a));
       };
       var setter = function setter(a) {
-        var isSync = pendingStack.length > 0;
-        if (!isSync) {
-          pendingStack.push(new Set([a]));
-        }
         var r;
         for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
           args[_key3 - 1] = arguments[_key3];
@@ -115178,277 +115229,177 @@
           if (!hasInitialValue(a)) {
             throw new Error('atom not writable');
           }
-          var _prevAtomState2 = getAtomState(a);
-          var nextAtomState = setAtomValueOrPromise(a, args[0]);
-          if (!isEqualAtomValue(_prevAtomState2, nextAtomState)) {
-            recomputeDependents(a);
+          var aState = getAtomState(a);
+          var hasPrevValue = 'v' in aState;
+          var prevValue = aState.v;
+          var v = args[0];
+          setAtomStateValueOrPromise(a, aState, v);
+          mountDependencies(pending, a, aState);
+          if (!hasPrevValue || !Object.is(prevValue, aState.v)) {
+            addPendingAtom(pending, a, aState);
+            recomputeDependents(pending, a);
           }
         } else {
-          r = writeAtomState.apply(void 0, [a].concat(args));
-        }
-        if (!isSync) {
-          var flushed = flushPending(pendingStack.pop());
-          {
-            devListenersRev2.forEach(function (l) {
-              return l({
-                type: 'async-write',
-                flushed: flushed
-              });
-            });
-          }
+          r = writeAtomState.apply(void 0, [pending, a].concat(args));
         }
+        flushPending(pending);
         return r;
       };
-      for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
-        args[_key2 - 1] = arguments[_key2];
+      for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+        args[_key2 - 2] = arguments[_key2];
       }
       var result = atom.write.apply(atom, [getter, setter].concat(args));
       return result;
     };
     var writeAtom = function writeAtom(atom) {
-      pendingStack.push(new Set([atom]));
+      var pending = createPending();
       for (var _len4 = arguments.length, args = new Array(_len4 > 1 ? _len4 - 1 : 0), _key4 = 1; _key4 < _len4; _key4++) {
         args[_key4 - 1] = arguments[_key4];
       }
-      var result = writeAtomState.apply(void 0, [atom].concat(args));
-      var flushed = flushPending(pendingStack.pop());
-      {
-        devListenersRev2.forEach(function (l) {
-          return l({
-            type: 'write',
-            flushed: flushed
-          });
-        });
-      }
+      var result = writeAtomState.apply(void 0, [pending, atom].concat(args));
+      flushPending(pending);
       return result;
     };
-    var mountAtom = function mountAtom(atom, initialDependent, onMountQueue) {
-      var _getAtomState;
-      var existingMount = mountedMap.get(atom);
-      if (existingMount) {
-        if (initialDependent) {
-          existingMount.t.add(initialDependent);
-        }
-        return existingMount;
-      }
-      var queue = onMountQueue || [];
-      (_getAtomState = getAtomState(atom)) == null || _getAtomState.d.forEach(function (_, a) {
-        if (a !== atom) {
-          mountAtom(a, atom, queue);
+    var mountDependencies = function mountDependencies(pending, atom, atomState) {
+      if (atomState.m && !getPendingContinuablePromise(atomState)) {
+        for (var _iterator5 = _createForOfIteratorHelperLoose(atomState.d.keys()), _step5; !(_step5 = _iterator5()).done;) {
+          var a = _step5.value;
+          if (!atomState.m.d.has(a)) {
+            var aMounted = mountAtom(pending, a);
+            aMounted.t.add(atom);
+            atomState.m.d.add(a);
+          }
         }
-      });
-      readAtomState(atom);
-      var mounted = {
-        t: new Set(initialDependent && [initialDependent]),
-        l: new Set()
-      };
-      mountedMap.set(atom, mounted);
-      {
-        mountedAtoms.add(atom);
-      }
-      if (isActuallyWritableAtom(atom) && atom.onMount) {
-        var onMount = atom.onMount;
-        queue.push(function () {
-          var onUnmount = onMount(function () {
-            for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
-              args[_key5] = arguments[_key5];
-            }
-            return writeAtom.apply(void 0, [atom].concat(args));
-          });
-          if (onUnmount) {
-            mounted.u = onUnmount;
+        for (var _iterator6 = _createForOfIteratorHelperLoose(atomState.m.d || []), _step6; !(_step6 = _iterator6()).done;) {
+          var _a = _step6.value;
+          if (!atomState.d.has(_a)) {
+            atomState.m.d.delete(_a);
+            var _aMounted = unmountAtom(pending, _a);
+            _aMounted == null || _aMounted.t.delete(atom);
           }
-        });
-      }
-      if (!onMountQueue) {
-        queue.forEach(function (f) {
-          return f();
-        });
+        }
       }
-      return mounted;
     };
-    var canUnmountAtom = function canUnmountAtom(atom, mounted) {
-      return !mounted.l.size && (!mounted.t.size || mounted.t.size === 1 && mounted.t.has(atom));
-    };
-    var tryUnmountAtom = function tryUnmountAtom(atom, mounted) {
-      if (!canUnmountAtom(atom, mounted)) {
-        return;
-      }
-      var onUnmount = mounted.u;
-      if (onUnmount) {
-        onUnmount();
-      }
-      mountedMap.delete(atom);
-      {
-        mountedAtoms.delete(atom);
-      }
+    var mountAtom = function mountAtom(pending, atom) {
       var atomState = getAtomState(atom);
-      if (atomState) {
-        if (hasPromiseAtomValue(atomState)) {
-          cancelPromise(atomState.v);
-        }
-        atomState.d.forEach(function (_, a) {
-          if (a !== atom) {
-            var mountedDep = mountedMap.get(a);
-            if (mountedDep) {
-              mountedDep.t.delete(atom);
-              tryUnmountAtom(a, mountedDep);
+      if (!atomState.m) {
+        readAtomState(pending, atom);
+        for (var _iterator7 = _createForOfIteratorHelperLoose(atomState.d.keys()), _step7; !(_step7 = _iterator7()).done;) {
+          var a = _step7.value;
+          var aMounted = mountAtom(pending, a);
+          aMounted.t.add(atom);
+        }
+        atomState.m = {
+          l: new Set(),
+          d: new Set(atomState.d.keys()),
+          t: new Set()
+        };
+        {
+          debugMountedAtoms.add(atom);
+        }
+        if (isActuallyWritableAtom(atom) && atom.onMount) {
+          var mounted = atomState.m;
+          var onMount = atom.onMount;
+          addPendingFunction(pending, function () {
+            var onUnmount = onMount(function () {
+              for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+                args[_key5] = arguments[_key5];
+              }
+              return writeAtomState.apply(void 0, [pending, atom].concat(args));
+            });
+            if (onUnmount) {
+              mounted.u = onUnmount;
             }
-          }
-        });
-      } else {
-        console.warn('[Bug] could not find atom state to unmount', atom);
+          });
+        }
       }
+      return atomState.m;
     };
-    var mountDependencies = function mountDependencies(atom, atomState, prevDependencies) {
-      var depSet = new Set(atomState.d.keys());
-      var maybeUnmountAtomSet = new Set();
-      prevDependencies == null || prevDependencies.forEach(function (_, a) {
-        if (depSet.has(a)) {
-          depSet.delete(a);
-          return;
-        }
-        maybeUnmountAtomSet.add(a);
-        var mounted = mountedMap.get(a);
-        if (mounted) {
-          mounted.t.delete(atom);
-        }
-      });
-      depSet.forEach(function (a) {
-        mountAtom(a, atom);
-      });
-      maybeUnmountAtomSet.forEach(function (a) {
-        var mounted = mountedMap.get(a);
-        if (mounted) {
-          tryUnmountAtom(a, mounted);
+    var unmountAtom = function unmountAtom(pending, atom) {
+      var atomState = getAtomState(atom);
+      if (atomState.m && !atomState.m.l.size && !Array.from(atomState.m.t).some(function (a) {
+        var _getAtomState$m;
+        return (_getAtomState$m = getAtomState(a).m) == null ? void 0 : _getAtomState$m.d.has(atom);
+      })) {
+        var onUnmount = atomState.m.u;
+        if (onUnmount) {
+          addPendingFunction(pending, onUnmount);
         }
-      });
-    };
-    var flushPending = function flushPending(pendingAtoms) {
-      var flushed;
-      {
-        flushed = new Set();
-      }
-      var pending = [];
-      var collectPending = function collectPending(pendingAtom) {
-        var _getAtomState2;
-        if (!pendingMap.has(pendingAtom)) {
-          return;
+        delete atomState.m;
+        {
+          debugMountedAtoms.delete(atom);
         }
-        var _ref2 = pendingMap.get(pendingAtom),
-          prevAtomState = _ref2[0],
-          dependents = _ref2[1];
-        pendingMap.delete(pendingAtom);
-        pending.push([pendingAtom, prevAtomState]);
-        dependents.forEach(collectPending);
-        (_getAtomState2 = getAtomState(pendingAtom)) == null || _getAtomState2.d.forEach(function (_, a) {
-          return collectPending(a);
-        });
-      };
-      pendingAtoms.forEach(collectPending);
-      pending.forEach(function (_ref3) {
-        var atom = _ref3[0],
-          prevAtomState = _ref3[1];
-        var atomState = getAtomState(atom);
-        if (!atomState) {
-          {
-            console.warn('[Bug] no atom state to flush');
-          }
-          return;
+        for (var _iterator8 = _createForOfIteratorHelperLoose(atomState.d.keys()), _step8; !(_step8 = _iterator8()).done;) {
+          var a = _step8.value;
+          var aMounted = unmountAtom(pending, a);
+          aMounted == null || aMounted.t.delete(atom);
         }
-        if (atomState !== prevAtomState) {
-          var mounted = mountedMap.get(atom);
-          if (mounted && atomState.d !== (prevAtomState == null ? void 0 : prevAtomState.d)) {
-            mountDependencies(atom, atomState, prevAtomState == null ? void 0 : prevAtomState.d);
-          }
-          if (mounted && !(!hasPromiseAtomValue(prevAtomState) && (isEqualAtomValue(prevAtomState, atomState) || isEqualAtomError(prevAtomState, atomState)))) {
-            mounted.l.forEach(function (listener) {
-              return listener();
-            });
-            {
-              flushed.add(atom);
-            }
-          }
+        var pendingPromise = getPendingContinuablePromise(atomState);
+        if (pendingPromise) {
+          pendingPromise[CONTINUE_PROMISE](undefined, function () {});
         }
-      });
-      {
-        return flushed;
+        return undefined;
       }
+      return atomState.m;
     };
     var subscribeAtom = function subscribeAtom(atom, listener) {
-      var mounted = mountAtom(atom);
-      var flushed = flushPending([atom]);
+      var pending = createPending();
+      var mounted = mountAtom(pending, atom);
+      flushPending(pending);
       var listeners = mounted.l;
       listeners.add(listener);
-      {
-        devListenersRev2.forEach(function (l) {
-          return l({
-            type: 'sub',
-            flushed: flushed
-          });
-        });
-      }
       return function () {
         listeners.delete(listener);
-        tryUnmountAtom(atom, mounted);
-        {
-          devListenersRev2.forEach(function (l) {
-            return l({
-              type: 'unsub'
-            });
-          });
-        }
+        var pending = createPending();
+        unmountAtom(pending, atom);
+        flushPending(pending);
       };
     };
+    var store = {
+      get: readAtom,
+      set: writeAtom,
+      sub: subscribeAtom
+    };
     {
-      return {
-        get: readAtom,
-        set: writeAtom,
-        sub: subscribeAtom,
-        dev_subscribe_store: function dev_subscribe_store(l) {
-          devListenersRev2.add(l);
-          return function () {
-            devListenersRev2.delete(l);
-          };
-        },
-        dev_get_mounted_atoms: function dev_get_mounted_atoms() {
-          return mountedAtoms.values();
+      var devStore = {
+        dev4_get_internal_weak_map: function dev4_get_internal_weak_map() {
+          return atomStateMap;
         },
-        dev_get_atom_state: function dev_get_atom_state(a) {
-          return atomStateMap.get(a);
+        dev4_get_mounted_atoms: function dev4_get_mounted_atoms() {
+          return debugMountedAtoms;
         },
-        dev_get_mounted: function dev_get_mounted(a) {
-          return mountedMap.get(a);
-        },
-        dev_restore_atoms: function dev_restore_atoms(values) {
-          pendingStack.push(new Set());
-          for (var _iterator3 = _createForOfIteratorHelperLoose(values), _step3; !(_step3 = _iterator3()).done;) {
-            var _step3$value = _step3.value,
-              atom = _step3$value[0],
-              valueOrPromise = _step3$value[1];
+        dev4_restore_atoms: function dev4_restore_atoms(values) {
+          var pending = createPending();
+          for (var _iterator9 = _createForOfIteratorHelperLoose(values), _step9; !(_step9 = _iterator9()).done;) {
+            var _step9$value = _step9.value,
+              atom = _step9$value[0],
+              value = _step9$value[1];
             if (hasInitialValue(atom)) {
-              setAtomValueOrPromise(atom, valueOrPromise);
-              recomputeDependents(atom);
+              var atomState = getAtomState(atom);
+              var hasPrevValue = 'v' in atomState;
+              var prevValue = atomState.v;
+              setAtomStateValueOrPromise(atom, atomState, value);
+              mountDependencies(pending, atom, atomState);
+              if (!hasPrevValue || !Object.is(prevValue, atomState.v)) {
+                addPendingAtom(pending, atom, atomState);
+                recomputeDependents(pending, atom);
+              }
             }
           }
-          var flushed = flushPending(pendingStack.pop());
-          devListenersRev2.forEach(function (l) {
-            return l({
-              type: 'restore',
-              flushed: flushed
-            });
-          });
+          flushPending(pending);
         }
       };
+      Object.assign(store, devStore);
     }
+    return store;
   };
   var defaultStore;
-  var getDefaultStore$1 = function getDefaultStore() {
+  var getDefaultStore = function getDefaultStore() {
     if (!defaultStore) {
-      defaultStore = createStore$1$1();
+      defaultStore = createStore$2();
       {
-        var _ref4;
-        (_ref4 = globalThis).__JOTAI_DEFAULT_STORE__ || (_ref4.__JOTAI_DEFAULT_STORE__ = defaultStore);
+        var _ref2;
+        (_ref2 = globalThis).__JOTAI_DEFAULT_STORE__ || (_ref2.__JOTAI_DEFAULT_STORE__ = defaultStore);
         if (globalThis.__JOTAI_DEFAULT_STORE__ !== defaultStore) {
           console.warn('Detected multiple Jotai instances. It may cause unexpected behavior with the default store. https://github.com/pmndrs/jotai/discussions/2044');
         }
@@ -115457,9 +115408,6 @@
     return defaultStore;
   };
 
-  var createStore$2 = createStore$1$1;
-  var getDefaultStore = getDefaultStore$1;
-
   var atom_1 = atom;
   var createStore_1 = createStore$2;
   var getDefaultStore_1 = getDefaultStore;
@@ -115623,7 +115571,7 @@
   function _createForOfIteratorHelperLoose$1(r, e) {
     var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
     if (t) return (t = t.call(r)).next.bind(t);
-    if (Array.isArray(r) || (t = _unsupportedIterableToArray$3(r)) || e  ) {
+    if (Array.isArray(r) || (t = _unsupportedIterableToArray$3(r)) || e) {
       t && (r = t);
       var o = 0;
       return function () {
@@ -116513,7 +116461,7 @@
   function _createForOfIteratorHelperLoose$2(r, e) {
     var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
     if (t) return (t = t.call(r)).next.bind(t);
-    if (Array.isArray(r) || (t = _unsupportedIterableToArray$4(r)) || e  ) {
+    if (Array.isArray(r) || (t = _unsupportedIterableToArray$4(r)) || e) {
       t && (r = t);
       var o = 0;
       return function () {
@@ -146405,7 +146353,7 @@
   }
   // 检验当前运行环境
   if (typeof window === 'undefined') {
-    console.warn('cloud-business@0.1.124-1 仅支持在浏览器环境进行使用!');
+    console.warn('cloud-business@0.1.124-11 仅支持在浏览器环境进行使用!');
   }
   var bodys = document.getElementsByTagName('body')[0];
   var colors = [1, 2, 3, 4, 5, 6, 7];
@@ -146415,7 +146363,7 @@
       bodys.style.setProperty("--shuyunBlue".concat(i$2 + 1), color);
     }
   }
-  var version = '0.1.124-1';
+  var version = '0.1.124-11';
 
   exports.AreaSelector = AreaSelector;
   exports.AreaSelectorNew = AreaSelector$1;