@bit-sun/business-component 2.2.9 → 2.2.11

package/dist/index.js

@@ -105,7 +105,10 @@ function handleRequestAuthHeader(config) {
 }
 // 处理请求头
 var handleRequestHeader = function handleRequestHeader(config) {
+  var _resposne$accountPers, _resposne$employeeRes;
   config.headers['sso-sessionid'] = (resposne === null || resposne === void 0 ? void 0 : resposne.sessionId) || '';
+  config.headers['x-account-id'] = (resposne === null || resposne === void 0 ? void 0 : (_resposne$accountPers = resposne.accountPersonDetail) === null || _resposne$accountPers === void 0 ? void 0 : _resposne$accountPers.accountId) || -1;
+  config.headers['x-employee-id'] = (resposne === null || resposne === void 0 ? void 0 : (_resposne$employeeRes = resposne.employeeResVo) === null || _resposne$employeeRes === void 0 ? void 0 : _resposne$employeeRes.id) || 2;
   config.headers['x-tenant-id'] = getCurrentTenantId() || 1;
   if (localStorage.getItem('x-user-auth-context')) {
     config.headers['x-user-auth-context'] = localStorage.getItem('x-user-auth-context');
@@ -1245,7 +1248,7 @@ var DataValidation = /*#__PURE__*/function (_React$Component) {
       };
     });
 
-    luckysheet = window.luckysheet;
+    luckysheet = window.luckysheet || window.top.luckysheet;
     _this.state = {
       showErrorData: false,
       data: [],
@@ -1826,7 +1829,7 @@ var DataImport = /*#__PURE__*/function (_React$Component) {
       });
     }
 
-    luckysheet$1 = window.luckysheet;
+    luckysheet$1 = window.luckysheet || window.top.luckysheet;
     _this.state = {
       showErrorData: false,
       data: [],
@@ -9910,7 +9913,11 @@ var AddSelect = function AddSelect(props) {
     buttonProps = _props$buttonProps === void 0 ? {} : _props$buttonProps,
     beforeShowModal = props.beforeShowModal,
     _props$tableCodeList = props.tableCodeList,
-    tableCodeList = _props$tableCodeList === void 0 ? [] : _props$tableCodeList;
+    tableCodeList = _props$tableCodeList === void 0 ? [] : _props$tableCodeList,
+    _props$businessType = props.businessType,
+    businessType = _props$businessType === void 0 ? 'sku' : _props$businessType,
+    _props$isAllowRepeate = props.isAllowRepeatedSelect,
+    isAllowRepeatedSelect = _props$isAllowRepeate === void 0 ? false : _props$isAllowRepeate;
   var _ref = requestConfig || {},
     url = _ref.url,
     otherParams = _ref.otherParams,
@@ -9927,6 +9934,7 @@ var AddSelect = function AddSelect(props) {
   var realButtonProps = _objectSpread2({
     type: "primary"
   }, buttonProps);
+  var selectRowKey = isAllowRepeatedSelect ? 'uuid' : mappingValueField;
   var selectMode = selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode; // 设定当前选择器 为单选或者多选模式 无设定为单选模式（默认）
   var initVal = value || (selectMode ? [] : null);
   var pageSize = 100; // 下拉框默认分页 条数
@@ -10078,7 +10086,9 @@ var AddSelect = function AddSelect(props) {
             var _record$packingUnitLi, _record$packingUnitLi2;
             // let
             if (record.needFocus === true && currentIndex === 0) ;
-            var precisionObj = {};
+            var precisionObj = businessType == 'skc' ? {
+              precision: 0
+            } : {};
             var unitAccuracy = (_record$packingUnitLi = record.packingUnitList) === null || _record$packingUnitLi === void 0 ? void 0 : (_record$packingUnitLi2 = _record$packingUnitLi[0]) === null || _record$packingUnitLi2 === void 0 ? void 0 : _record$packingUnitLi2.unitAccuracy;
             var isCountUnitAccuracyCheck = item.dataIndex == 'count' && unitAccuracy !== undefined;
             if (isCountUnitAccuracyCheck) {
@@ -10202,6 +10212,53 @@ var AddSelect = function AddSelect(props) {
           }
         });
       }
+      var selectLength = modalTableProps.selectColumn.filter(function (item) {
+        return item.isSelectItem;
+      }).length;
+      if (item.isSelectItem) {
+        return _objectSpread2(_objectSpread2({}, item), {}, {
+          render: function render(text, record, index) {
+            var _item$dataSource;
+            if ((_item$dataSource = item.dataSource) === null || _item$dataSource === void 0 ? void 0 : _item$dataSource.length) {
+              return /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+                value: text || null,
+                onChange: function onChange(value) {
+                  if (businessType == 'skc' && popvalue.some(function (i) {
+                    return i.code == record.code && i[item.dataIndex] == value;
+                  })) {
+                    antd.message.warning('相同skc配码不可设置相同哦');
+                    record[item.dataIndex] = null;
+                    var _newPopValue = popvalue.map(function (i, innerIndex) {
+                      if (innerIndex == index) {
+                        i[item.dataIndex] = record[item.dataIndex];
+                      }
+                      return i;
+                    });
+                    setPopValue(_newPopValue);
+                    return false;
+                  }
+                  record[item.dataIndex] = value;
+                  var newPopValue = popvalue.map(function (i, innerIndex) {
+                    if (innerIndex == index) {
+                      i[item.dataIndex] = record[item.dataIndex];
+                    }
+                    return i;
+                  });
+                  setPopValue(newPopValue);
+                },
+                style: {
+                  width: '160px'
+                }
+              }, item.dataSource.map(function (item) {
+                return /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+                  value: item.code
+                }, item.name);
+              }));
+            }
+            return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null);
+          }
+        });
+      }
       return item;
     })), [{
       title: '操作',
@@ -10408,18 +10465,42 @@ var AddSelect = function AddSelect(props) {
   };
 
   React.useEffect(function () {
-    Promise.all([loadSelectSource("/items/brand/queryBrandList", {
-      pageSize: 5000,
-      currentPage: 1,
-      'ctl-withAuth': true
-    }), loadSelectSource("/items/category/queryCategoryTree", {
-      pageSize: 5000,
-      currentPage: 1
-    })]).then(function (x) {
-      formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
-      formatTreeDataSource(x, 1, 3, tableSearchForm);
-    });
-  }, []);
+    if (businessType == 'sku') {
+      Promise.all([loadSelectSource("/items/brand/queryBrandList", {
+        pageSize: 5000,
+        currentPage: 1,
+        'ctl-withAuth': true
+      }), loadSelectSource("/items/category/queryCategoryTree", {
+        pageSize: 5000,
+        currentPage: 1
+      })]).then(function (x) {
+        formatSource(x, 0, 2, tableSearchForm, ['id', 'name']);
+        formatTreeDataSource(x, 1, 3, tableSearchForm);
+      });
+    }
+    if (businessType == 'skc') {
+      Promise.all([loadSelectSource("/items/item/propertyValue", {
+        pageSize: 5000,
+        currentPage: 1,
+        'qp-propertyId-eq': '1467042217951883265'
+      }), loadSelectSource("/items/category/queryCategoryTree", {
+        pageSize: 5000,
+        currentPage: 1
+      }), loadSelectSource("/items/class/withProperty", {
+        pageSize: 5000,
+        currentPage: 1
+      }), loadSelectSource("/items/brand/queryBrandList", {
+        pageSize: 5000,
+        currentPage: 1,
+        'ctl-withAuth': true
+      })]).then(function (x) {
+        formatSource(x, 0, 3, tableSearchForm, ['value', 'value']);
+        formatTreeDataSource(x, 1, 4, tableSearchForm);
+        formatSource(x, 2, 5, tableSearchForm, ['id', 'name']);
+        formatSource(x, 3, 6, tableSearchForm, ['id', 'name']);
+      });
+    }
+  }, [businessType]);
   React.useEffect(function () {
     if (value) {
       setPopValue(value);
@@ -10549,8 +10630,18 @@ var AddSelect = function AddSelect(props) {
         selectRows[selectedRowKeys.length]['needFocus'] = true;
       }
     }
-    setPopValue(selectRows);
-    setSelectedRowKeys(selectKeys);
+    if (isAllowRepeatedSelect) {
+      var list = popvalue.concat(selectRows).map(function (i) {
+        return _objectSpread2(_objectSpread2({}, i), {}, {
+          uuid: i.uuid || uuid()
+        });
+      });
+      setPopValue(list);
+      setSelectedRowKeys([]);
+    } else {
+      setPopValue(selectRows);
+      setSelectedRowKeys(selectKeys);
+    }
     // setIndeterminate(!!filterRows.length && filterRows.length < tablePagination?.total);
     // setCheckedAll(filterRows.length === tablePagination?.total);
   };
@@ -10667,12 +10758,19 @@ var AddSelect = function AddSelect(props) {
     setSelectedRowKeys([]);
   };
   var deleteRecord = function deleteRecord(record) {
-    setPopValue(popvalue.filter(function (item) {
-      return item.skuCode !== record.skuCode;
-    }));
-    setSelectedRowKeys(_toConsumableArray(selectedRowKeys.filter(function (item) {
-      return item !== record.skuCode;
-    })));
+    if (isAllowRepeatedSelect) {
+      setPopValue(popvalue.filter(function (item) {
+        return item.uuid !== record.uuid;
+      }));
+      setSelectedRowKeys([]);
+    } else {
+      setPopValue(popvalue.filter(function (item) {
+        return item.skuCode !== record.skuCode;
+      }));
+      setSelectedRowKeys(_toConsumableArray(selectedRowKeys.filter(function (item) {
+        return item !== record.skuCode;
+      })));
+    }
   };
   var inputIndex = 0;
   React.useEffect(function () {
@@ -10744,6 +10842,7 @@ var AddSelect = function AddSelect(props) {
   handleColumns(showSelectedCol, [], function (res) {
     return setShowColumnsCallback(res);
   });
+  var selectLength = isAllowRepeatedSelect ? (popvalue === null || popvalue === void 0 ? void 0 : popvalue.length) || 0 : (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0;
   return /*#__PURE__*/React__default['default'].createElement("div", {
     className: 'add_select'
   }, /*#__PURE__*/React__default['default'].createElement("div", {
@@ -10829,7 +10928,7 @@ var AddSelect = function AddSelect(props) {
     style: themeColor
   }, (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total) || 0), "\xA0\u9879", selectMode ? /*#__PURE__*/React__default['default'].createElement("span", null, "\uFF0C \u672C\u6B21\u5DF2\u9009\xA0", /*#__PURE__*/React__default['default'].createElement("span", {
     style: themeColor
-  }, (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0), "\xA0\u9879") : ''), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("span", {
+  }, selectLength), "\xA0\u9879") : ''), /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement("span", {
     style: {
       marginRight: 8
     }
@@ -10872,7 +10971,7 @@ var AddSelect = function AddSelect(props) {
     }
   }, /*#__PURE__*/React__default['default'].createElement("span", null, "\u672C\u6B21\u5DF2\u9009\xA0", /*#__PURE__*/React__default['default'].createElement("span", {
     style: themeColor
-  }, (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0), "\xA0\u9879")), /*#__PURE__*/React__default['default'].createElement("div", {
+  }, selectLength), "\xA0\u9879")), /*#__PURE__*/React__default['default'].createElement("div", {
     style: {
       display: 'flex'
     }
@@ -10906,7 +11005,7 @@ var AddSelect = function AddSelect(props) {
     dataSource: popvalue,
     pagination: false,
     // onChange={handleTableChange}
-    rowKey: mappingValueField,
+    rowKey: selectRowKey,
     rowClassName: 'row-class',
     scroll: {
       y: 500
@@ -11956,6 +12055,7 @@ var handleDefaultPrefixUrl = function handleDefaultPrefixUrl(type) {
     case 'skuCommodity':
     case 'skuPropertyValue':
     case 'spuCommodity':
+    case 'skcCommodity':
       result = '/items';
       break;
     case 'physicalWarehouse':
@@ -12655,6 +12755,155 @@ function commonFun(type, prefixUrl, requestConfigProp, modalTableBusProps) {
       }]
     }, modalTableBusProps);
   }
+  // 商品选择器skc
+  if (type === 'skcCommodity') {
+    requestConfig = _objectSpread2({
+      url: "".concat(prefixUrl.selectPrefix, "/skc/skcSelect"),
+      filter: 'qp-code,name-orGroup,like',
+      mappingTextField: 'name',
+      mappingValueField: 'code',
+      sourceName: 'qp-skcCode-eq'
+    }, requestConfigProp);
+    tableSearchForm = [{
+      name: 'qp-code-like',
+      label: 'SKC编码'
+    }, {
+      name: 'qp-skcName-like',
+      label: 'SKC名称'
+    }, {
+      name: 'qp-itemName-like',
+      label: '商品名称'
+    }, {
+      name: 'qp-colorName-in',
+      type: 'select',
+      label: '颜色',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-categoryId-in',
+      type: 'treeSelect',
+      label: '类目',
+      field: {
+        type: 'treeSelect',
+        props: {
+          treeData: [],
+          treeCheckable: true,
+          showSearch: true,
+          allowClear: true,
+          showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
+          maxTagCount: 1,
+          placeholder: '请选择',
+          style: {
+            width: '100%'
+          },
+          dropdownStyle: {
+            maxHeight: 400,
+            maxWidth: 100,
+            overflow: 'auto'
+          }
+        }
+      }
+    }, {
+      name: 'qp-classId-in',
+      type: 'select',
+      label: '品类',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-brandId-in',
+      type: 'select',
+      label: '品牌',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }];
+    Promise.all([loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/item/propertyValue"), {
+      pageSize: 5000,
+      currentPage: 1,
+      'qp-propertyId-eq': '1467042217951883265'
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/category/queryCategoryTree"), {
+      pageSize: 5000,
+      currentPage: 1
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/class/withProperty"), {
+      pageSize: 5000,
+      currentPage: 1
+    }), loadSelectSource$1("".concat(prefixUrl.formSelectFix, "/brand/queryBrandList"), {
+      pageSize: 5000,
+      currentPage: 1,
+      'ctl-withAuth': true
+    })]).then(function (x) {
+      formatSource(x, 0, 3, tableSearchForm, ['value', 'value']);
+      formatTreeDataSource(x, 1, 4, tableSearchForm);
+      formatSource(x, 2, 5, tableSearchForm, ['id', 'name']);
+      formatSource(x, 3, 6, tableSearchForm, ['id', 'name']);
+    });
+    modalTableProps = _objectSpread2({
+      modalTableTitle: '选择SKC',
+      tableSearchForm: tableSearchForm,
+      tableColumns: [{
+        title: 'SKC编码',
+        dataIndex: 'code'
+      }, {
+        title: 'SKC名称',
+        dataIndex: 'name'
+      }, {
+        title: '商品名称',
+        dataIndex: 'itemName'
+      }, {
+        title: '颜色',
+        dataIndex: 'colorName'
+      }, {
+        title: '类目',
+        dataIndex: 'categoryText'
+      }, {
+        title: '品类',
+        dataIndex: 'className'
+      }, {
+        title: '品牌',
+        dataIndex: 'brandName'
+      }]
+    }, modalTableBusProps);
+  }
   // 商品规格选择器（无弹窗）
   if (type === 'skuPropertyValue') {
     requestConfig = _objectSpread2({
@@ -13884,7 +14133,8 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
       setValue(value);
     },
     beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
-    onSaveCallback: parProps.onSaveCallback
+    onSaveCallback: parProps.onSaveCallback,
+    businessType: 'sku'
     // onSaveCallback: (rows) => {
     //   console.log('save call', rows);
     //   // return Promise.resolve(true);
@@ -14090,6 +14340,280 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
     modalTableProps: modalTableProps
   })));
 };
+var AddSkcSelect = function AddSkcSelect(parProps) {
+  var selectProps = {
+    mode: 'multiple'
+  };
+  var _useState3 = React.useState((selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode) ? [] : null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    value = _useState4[0],
+    setValue = _useState4[1];
+  var _useState5 = React.useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    propertyList = _useState6[0],
+    setPropertyList = _useState6[1];
+  React.useEffect(function () {
+    axios__default['default'].get("/items/itemPropertyValueGroup/listNoPage").then(function (result) {
+      var _result, _result2;
+      result = result.data;
+      if (((_result = result) === null || _result === void 0 ? void 0 : _result.status) && result.status !== '0' || ((_result2 = result) === null || _result2 === void 0 ? void 0 : _result2.code) && result.code !== '000000') {
+        antd.message.error(result.msg);
+        return;
+      }
+      var data = result.data || [];
+      setPropertyList(data);
+    }).catch(function (err) {});
+  }, []);
+  var initialSelectColumn = [{
+    title: 'SKC编码',
+    width: 150,
+    dataIndex: 'code'
+  }, {
+    title: 'SKC名称',
+    width: 200,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text) {
+      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    },
+    dataIndex: 'name'
+  }, {
+    title: '颜色',
+    width: 200,
+    ellipsis: {
+      showTitle: false
+    },
+    render: function render(text) {
+      return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+        placement: "topLeft",
+        title: text
+      }, text);
+    },
+    dataIndex: 'colorName'
+  }, {
+    title: '配码',
+    dataIndex: 'selectPropertyGroupCode',
+    width: 160,
+    isSelectItem: true,
+    dataSource: propertyList
+  }, {
+    title: '数量',
+    width: 100,
+    isInputItem: true,
+    dataIndex: 'count'
+  }];
+  var mTpSelectColumn = handleSelectColumn(initialSelectColumn, parProps);
+  var props = {
+    buttonText: parProps.buttonText || '新增',
+    buttonProps: parProps.buttonProps || {},
+    tableCodeList: parProps.tableCodeList || ['skcSelect-tableOptionsToChoosePartCode', 'skcSelect-tableSelectedItemPartCode'],
+    value: value,
+    // labelInValue: true, // 非必填 默认为false
+    requestConfig: _objectSpread2({
+      url: "/items/skc/skcSelect",
+      filter: 'qp-name-like',
+      otherParams: {},
+      mappingTextField: 'name',
+      mappingValueField: 'code'
+    }, parProps.requestConfig),
+    selectProps: selectProps,
+    onChange: function onChange(value) {
+      console.log(value);
+      setValue(value);
+    },
+    beforeShowModal: parProps === null || parProps === void 0 ? void 0 : parProps.beforeShowModal,
+    onSaveCallback: parProps.onSaveCallback,
+    businessType: 'skc',
+    isAllowRepeatedSelect: true
+  };
+  var modalTableProps = {
+    modalTableTitle: '选择商品',
+    tableSearchForm: [{
+      name: 'qp-code-like',
+      label: 'SKC编码'
+    }, {
+      name: 'qp-skcName-like',
+      label: 'SKC名称'
+    }, {
+      name: 'qp-itemName-like',
+      label: '商品名称'
+    }, {
+      name: 'qp-colorName-in',
+      type: 'select',
+      label: '颜色',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-categoryId-in',
+      type: 'treeSelect',
+      label: '类目',
+      field: {
+        type: 'treeSelect',
+        props: {
+          treeData: [],
+          treeCheckable: true,
+          showSearch: true,
+          allowClear: true,
+          showArrow: true,
+          treeNodeFilterProp: 'title',
+          treeDefaultExpandAll: true,
+          maxTagCount: 1,
+          placeholder: '请选择',
+          style: {
+            width: '100%'
+          },
+          dropdownStyle: {
+            maxHeight: 400,
+            maxWidth: 100,
+            overflow: 'auto'
+          }
+        }
+      }
+    }, {
+      name: 'qp-classId-in',
+      type: 'select',
+      label: '品类',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }, {
+      name: 'qp-brandId-in',
+      type: 'select',
+      label: '品牌',
+      field: {
+        type: 'select',
+        props: {
+          mode: 'multiple',
+          notFoundContent: '暂无数据',
+          allowClear: true,
+          showSearch: true,
+          showArrow: true,
+          maxTagCount: 1,
+          optionFilterProp: 'children',
+          filterOption: function filterOption(input, option) {
+            return option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+          }
+        }
+      }
+    }],
+    tableColumns: [{
+      title: 'SKC编码',
+      width: 150,
+      dataIndex: 'code'
+    }, {
+      title: 'SKC名称',
+      width: 200,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'name'
+    }, {
+      title: '商品名称',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      dataIndex: 'itemName',
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      }
+    }, {
+      title: '颜色',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'colorName'
+    }, {
+      title: '类目',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'categoryName'
+    }, {
+      title: '品类',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'className'
+    }, {
+      title: '品牌',
+      width: 100,
+      ellipsis: {
+        showTitle: false
+      },
+      render: function render(text) {
+        return /*#__PURE__*/React__default['default'].createElement(antd.Tooltip, {
+          placement: "topLeft",
+          title: text
+        }, text);
+      },
+      dataIndex: 'brandName'
+    }],
+    selectColumn: mTpSelectColumn
+  };
+  return /*#__PURE__*/React__default['default'].createElement("div", null, /*#__PURE__*/React__default['default'].createElement(AddSelect, _objectSpread2(_objectSpread2({}, props), {}, {
+    modalTableProps: modalTableProps
+  })));
+};
 
 var CommodityEntry = function CommodityEntry(props) {
   var dataValidationRef = React.useRef();
@@ -16009,43 +16533,25 @@ var DetailWrapper = /*#__PURE__*/React__default['default'].memo(function (_ref)
   var pageTitle = React.useMemo(function () {
     return getPageTitle(pathname);
   }, [pathname, title]);
-  // const breadcrumbArr = `${basePath}${pathname}`
-  //   .split('/')
-  //   .slice(1)
-  //   .map((_item, index, arr) =>
-  //     matchParamsPath(
-  //       `/${arr.slice(0, index + 1).join('/')}`,
-  //       breadcrumbNameMap,
-  //     ),
-  //   )
-  //   .filter((item) => item);
   React.useEffect(function () {}, []);
   var ShowFullScreen = function ShowFullScreen() {
-    if (window.top != window) {
-      window.parent.postMessage({
-        type: 'screenChange',
-        id: itemPath
-      }, '*');
-      setIsFnllScreen(!isFullScreen);
-    } else {
-      var _isFullScreen = document.fullScreen || document.webkitIsFullScreen || document.mozFullScreen;
-      var contentEle = document.querySelector("body");
-      // addTabsNavStyle(isFullScreen);
-      if (contentEle && !_isFullScreen) {
-        var fullScreenEle = contentEle.requestFullscreen || contentEle.mozRequestFullScreen || contentEle.webkitRequestFullScreen || contentEle.msRequestFullscreen;
-        if (fullScreenEle) {
-          fullScreenEle.call(contentEle);
-          setIsFnllScreen(true);
-          return;
-        }
+    var isFullScreen = window.top.document.fullScreen || window.top.document.webkitIsFullScreen || window.top.document.mozFullScreen;
+    var contentEle = window.top.document.querySelector("body");
+    // addTabsNavStyle(isFullScreen);
+    if (contentEle && !isFullScreen) {
+      var fullScreenEle = contentEle.requestFullscreen || contentEle.mozRequestFullScreen || contentEle.webkitRequestFullScreen || contentEle.msRequestFullscreen;
+      if (fullScreenEle) {
+        fullScreenEle.call(contentEle);
+        setIsFnllScreen(true);
+        return;
       }
-      if (document && _isFullScreen) {
-        var exitFullScreen = document.exitFullscreen || document.mozCancelFullScreen || document.webkitCancelFullScreen || document.msExitFullscreen;
-        if (exitFullScreen) {
-          exitFullScreen.call(document);
-          setIsFnllScreen(false);
-          return;
-        }
+    }
+    if (window.top.document && isFullScreen) {
+      var exitFullScreen = window.top.document.exitFullscreen || window.top.document.mozCancelFullScreen || window.top.document.webkitCancelFullScreen || window.top.document.msExitFullscreen;
+      if (exitFullScreen) {
+        exitFullScreen.call(window.top.document);
+        setIsFnllScreen(false);
+        return;
       }
     }
   };
@@ -17518,12 +18024,14 @@ var BsSulaQueryTable = (function (props) {
   var bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
   // 获取table高度
   var getTableHeight = function getTableHeight() {
-    var _document$querySelect, _document$querySelect2, _document$querySelect3;
-    var cancelHeight = window.top == window ? 303 : 223;
-    var isFullScreen = document.fullScreen || document.webkitIsFullScreen || document.mozFullScreen;
-    var h = document.body.clientHeight - (((_document$querySelect = document.querySelector('.table-bssula-summary')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 0) - (((_document$querySelect2 = document.querySelector('.ant-form ant-form-horizontal')) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.clientHeight) || 0) - (isFullScreen ? 0 : ((_document$querySelect3 = document.querySelector('.ant-pro-page-container-warp')) === null || _document$querySelect3 === void 0 ? void 0 : _document$querySelect3.clientHeight) || 0) - cancelHeight + 'px';
-    setHeight(h);
-    setValue(_objectSpread2({}, value));
+    setTimeout(function () {
+      var _document$querySelect, _document$querySelect2, _document$querySelect3, _document$querySelect4;
+      var cancelHeight = window.top == window ? 303 : 223;
+      var isFullScreen = window.top.document.fullScreen || window.top.document.webkitIsFullScreen || window.top.document.mozFullScreen;
+      var h = document.body.clientHeight - (((_document$querySelect = document.querySelector(".ant-tabs-tabpane-active .table-bssula-summary")) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 0) - (((_document$querySelect2 = document.querySelector(".ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav")) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.clientHeight) || 0) - (((_document$querySelect3 = document.querySelector(".ant-tabs-tabpane-active .ant-form ant-form-horizontal")) === null || _document$querySelect3 === void 0 ? void 0 : _document$querySelect3.clientHeight) || 0) - (isFullScreen ? 0 : ((_document$querySelect4 = document.querySelector(".ant-tabs-tabpane-active .ant-pro-page-container-warp")) === null || _document$querySelect4 === void 0 ? void 0 : _document$querySelect4.clientHeight) || 0) - cancelHeight + 'px';
+      setHeight(h);
+      setValue(_objectSpread2({}, value));
+    }, 0);
   };
   //监测是否按下esc键
   function checkFull() {
@@ -17735,34 +18243,25 @@ var BsSulaQueryTable = (function (props) {
     return tableProps;
   };
   var ShowFullScreen = function ShowFullScreen() {
-    var itemPath = props.itemPath;
-    if (window.top != window) {
-      window.parent.postMessage({
-        type: 'screenChange',
-        id: itemPath
-      }, '*');
-      setIsFnllScreen(!isFullScreen);
-    } else {
-      var _isFullScreen = document.fullScreen || document.webkitIsFullScreen || document.mozFullScreen;
-      var contentEle = document.querySelector("body");
-      // addTabsNavStyle(isFullScreen);
-      if (contentEle && !_isFullScreen) {
-        var fullScreenEle = contentEle.requestFullscreen || contentEle.mozRequestFullScreen || contentEle.webkitRequestFullScreen || contentEle.msRequestFullscreen;
-        if (fullScreenEle) {
-          fullScreenEle.call(contentEle);
-          setIsFnllScreen(true);
-          // getTableHeight(true);
-          return;
-        }
+    var isFullScreen = window.top.document.fullScreen || window.top.document.webkitIsFullScreen || window.top.document.mozFullScreen;
+    var contentEle = window.top.document.querySelector("body");
+    // addTabsNavStyle(isFullScreen);
+    if (contentEle && !isFullScreen) {
+      var fullScreenEle = contentEle.requestFullscreen || contentEle.mozRequestFullScreen || contentEle.webkitRequestFullScreen || contentEle.msRequestFullscreen;
+      if (fullScreenEle) {
+        fullScreenEle.call(contentEle);
+        setIsFnllScreen(true);
+        // getTableHeight(true);
+        return;
       }
-      if (document && _isFullScreen) {
-        var exitFullScreen = document.exitFullscreen || document.mozCancelFullScreen || document.webkitCancelFullScreen || document.msExitFullscreen;
-        if (exitFullScreen) {
-          exitFullScreen.call(document);
-          setIsFnllScreen(false);
-          // getTableHeight();
-          return;
-        }
+    }
+    if (window.top.document && isFullScreen) {
+      var exitFullScreen = window.top.document.exitFullscreen || window.top.document.mozCancelFullScreen || window.top.document.webkitCancelFullScreen || window.top.document.msExitFullscreen;
+      if (exitFullScreen) {
+        exitFullScreen.call(window.top.document);
+        setIsFnllScreen(false);
+        // getTableHeight();
+        return;
       }
     }
   };
@@ -18048,14 +18547,13 @@ function handleUserPhone() {
   return enStr;
 }
 var setLoginOutPath = function setLoginOutPath() {
-  if (window.top == window) {
+  if (window.__POWERED_BY_WUJIE__) {
+    var _window$$wujie;
+    (_window$$wujie = window.$wujie) === null || _window$$wujie === void 0 ? void 0 : _window$$wujie.props.goToLogin();
+  } else {
     umi.history.push({
       pathname: '/user/login'
     });
-  } else {
-    window.parent.postMessage({
-      type: 'go2Login'
-    }, '*');
   }
 };
 var getBreadcrumbNameMap = function getBreadcrumbNameMap(menuData) {
@@ -20587,7 +21085,8 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
   _createClass(BasicLayout, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var _this2 = this,
+      var _window$$wujie,
+        _this2 = this,
         _localStorage$getItem;
       var _this$props = this.props,
         history = _this$props.history,
@@ -20596,27 +21095,42 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         pathToRegexp = _this$props.pathToRegexp;
       var istParent = 0;
       var self = this;
-      window.top != window && window.addEventListener('message', function (e) {
-        istParent = 1;
-        if (localStorage.getItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK)) {
-          localStorage.removeItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK);
-        } else {
-          localStorage.setItem('isTabChange', true);
-        }
-        if (typeof e.data === 'string') {
-          var newKey = encodeUrlQuery(e.data.replace(/^\/\w+\//, '/'));
-          history.push(newKey);
-        } else {
-          var info = e.data;
+      // window.top != window &&
+      //   window.addEventListener('message', function (e) {
+      //     istParent = 1;
+      //     if (localStorage.getItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK)) {
+      //       localStorage.removeItem(ENUM.BROWSER_CACHE.CHILD_APP_BACK);
+      //     } else {
+      //       localStorage.setItem('isTabChange', true);
+      //     }
+      //     if (typeof e.data === 'string') {
+      //       let newKey = encodeUrlQuery(e.data.replace(/^\/\w+\//, '/'));
+      //       history.push(newKey);
+      //     } else {
+      //       const info = e.data;
+      //       if (info.type === 'remove') {
+      //         self.tabActions['remove'](info.key.replace(/^\/\w+\//, '/'));
+      //       }
+      //     }
+      //   });
+      (_window$$wujie = window.$wujie) === null || _window$$wujie === void 0 ? void 0 : _window$$wujie.bus.$on("main-route-change", function (appname, info) {
+        console.log('$on main route change ----------------------------', appname, info);
+        if (appname === itemPath) {
+          istParent = 1;
+          if (info.type === 'main') {
+            var newPath = encodeUrlQuery(info.path);
+            history.push(newPath);
+          }
           if (info.type === 'remove') {
-            self.tabActions['remove'](info.key.replace(/^\/\w+\//, '/'));
+            self.tabActions['remove'](info.path);
           }
         }
       });
       UN_LISTTEN_DRP = history.listen(function (route) {
-        if (window.__POWERED_BY_QIANKUN__) {
-          if (window.location.href.indexOf("/".concat(itemPath)) === -1) return;
-        }
+        // if ((window as any).__POWERED_BY_QIANKUN__) {
+        //   if (window.location.href.indexOf(`/${itemPath}`) === -1) return;
+        // }
+        if (route.pathname.startsWith("/".concat(itemPath, "/"))) return;
         var _this2$state = _this2.state,
           listenRouterState = _this2$state.listenRouterState,
           listenRouterKey = _this2$state.listenRouterKey,
@@ -20635,8 +21149,10 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
           currentKey = decodeURIComponent(route.pathname + _this2.parseQueryString(route.search));
         }
         if (!istParent) {
+          var _window$$wujie2;
           if (route.pathname === '/') return;
-          window.parent.postMessage("/parent/".concat(itemPath).concat(currentKey), '*');
+          (_window$$wujie2 = window.$wujie) === null || _window$$wujie2 === void 0 ? void 0 : _window$$wujie2.bus.$emit('sub-route-change', itemPath, currentKey);
+          // window.parent.postMessage(`/parent/${itemPath}${currentKey}`, '*');
         }
         // 防止出错
         if (listenRouterKey.length !== listenRouterState.length) {
@@ -20678,28 +21194,24 @@ var BasicLayout = /*#__PURE__*/function (_React$PureComponent) {
         lastTwoRouterArray.shift();
         if (!localStorage.getItem('isTabChange') && !localStorage.getItem('isMenuClick')) {
           if (lastTwoRouterArray[0] && typeof lastTwoRouterArray[0] === 'string') {
+            var _route$state;
             var needRemoveKeyArray = hideMenuArray.filter(function (itemRoute) {
               return pathToRegexp(itemRoute.path || '').test(lastTwoRouterArray[0]);
             });
             // lastTwoRouterArray[0] != lastTwoRouterArray[1] 该判断条件用于判断是否是tab删除操作，如果是tab页删除操作，删除的是不是最后一个打开的tab页，执行history.push会导致错误的将最后打开的那个tab页也删除掉
-            if (needRemoveKeyArray.length && lastTwoRouterArray[0] != lastTwoRouterArray[1]) {
-              if ((!(lastTwoRouterArray[0].indexOf('/order/mainOrder/supplement') >= 0) || !pathToRegexp('/order/mainOrder/:parmode/separateOrder/:id').test(lastTwoRouterArray[1])) && (!pathToRegexp('/order/mainOrder/:parmode/separateOrder/:id').test(lastTwoRouterArray[0]) || !(lastTwoRouterArray[1].indexOf('order/mainOrder/separateOrder/') >= 0))) {
-                var _route$state;
-                if (!((_route$state = route.state) === null || _route$state === void 0 ? void 0 : _route$state.thisHideInMenuDoNotClose)) {
-                  newListenRouterState = newListenRouterState.filter(function (item) {
-                    var _ref3 = item.key ? item.key.split('?') : [],
-                      _ref4 = _slicedToArray(_ref3, 1),
-                      pathname = _ref4[0];
-                    return pathname && pathname !== lastTwoRouterArray[0];
-                  });
-                  newListenRouterKey = newListenRouterKey.filter(function (item) {
-                    var _ref5 = item ? item.split('?') : [],
-                      _ref6 = _slicedToArray(_ref5, 1),
-                      pathname = _ref6[0];
-                    return pathname && pathname !== lastTwoRouterArray[0];
-                  });
-                }
-              }
+            if (needRemoveKeyArray.length && lastTwoRouterArray[0] != lastTwoRouterArray[1] && !((_route$state = route.state) === null || _route$state === void 0 ? void 0 : _route$state.thisHideInMenuDoNotClose)) {
+              newListenRouterState = newListenRouterState.filter(function (item) {
+                var _ref3 = item.key ? item.key.split('?') : [],
+                  _ref4 = _slicedToArray(_ref3, 1),
+                  pathname = _ref4[0];
+                return pathname && pathname !== lastTwoRouterArray[0];
+              });
+              newListenRouterKey = newListenRouterKey.filter(function (item) {
+                var _ref5 = item ? item.split('?') : [],
+                  _ref6 = _slicedToArray(_ref5, 1),
+                  pathname = _ref6[0];
+                return pathname && pathname !== lastTwoRouterArray[0];
+              });
             }
           }
           // refs?.tableRef?.current?.refreshTable();
@@ -21163,7 +21675,12 @@ var WrapperComponent = /*#__PURE__*/function (_React$Component) {
   }
   _createClass(WrapperComponent, [{
     key: "shouldComponentUpdate",
-    value: function shouldComponentUpdate() {
+    value: function shouldComponentUpdate(nextProps) {
+      var _nextProps$item, _nextProps$item$key;
+      if (window.__POWERED_BY_WUJIE__ && (nextProps === null || nextProps === void 0 ? void 0 : (_nextProps$item = nextProps.item) === null || _nextProps$item === void 0 ? void 0 : (_nextProps$item$key = _nextProps$item.key) === null || _nextProps$item$key === void 0 ? void 0 : _nextProps$item$key.indexOf('edit-template-template')) > -1) {
+        // 适配wujie环境主应用下渲染打印编辑器
+        return true;
+      }
       return false;
     }
   }, {
@@ -21176,6 +21693,7 @@ var WrapperComponent = /*#__PURE__*/function (_React$Component) {
         getDictionaryTextByValue = _this$props4.getDictionaryTextByValue,
         timeFormat = _this$props4.timeFormat,
         transparentProps = _this$props4.transparentProps;
+      console.log('child wrapper conpent', this.props);
       return /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(item.content, _objectSpread2(_objectSpread2(_objectSpread2({
         getDictionarySource: getDictionarySource,
         getDictionaryTextByValue: getDictionaryTextByValue,
@@ -29948,6 +30466,7 @@ var JsonQueryTable = /*#__PURE__*/React__default['default'].memo(function (props
 });
 
 exports.AddSelect = AddSelect;
+exports.AddSkcSelect = AddSkcSelect;
 exports.AddSkuSelect = AddSkuSelect;
 exports.BillEntry = BillEntry;
 exports.BsLayout = index$5;