@bit-sun/business-component 2.1.16 → 2.1.18

package/dist/components/Business/BsSulaQueryTable/setting.d.ts

@@ -10,6 +10,7 @@ declare class SortableTable extends React.Component {
         onSearchSort: boolean;
         isDefaultValue: boolean;
         defaultValue: never[];
+        bsTableCode: string;
     };
     patchUserColumnConfig: (config: any) => void;
     getConfigFromlocalstorage: () => any;

package/dist/index.esm.js

@@ -13156,6 +13156,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
 
   var props = {
     buttonText: parProps.buttonText || '新增',
+    buttonProps: parProps.buttonProps || {},
     value: value,
     // labelInValue: true, // 非必填 默认为false
     requestConfig: _objectSpread2({
@@ -16119,10 +16120,14 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       searchDataSource: false,
       onSearchSort: false,
       isDefaultValue: false,
-      defaultValue: []
+      defaultValue: [],
+      bsTableCode: '' //设置table 列的标识
+
     };
 
     _this.patchUserColumnConfig = function (config) {
+      var that = _assertThisInitialized(_this);
+
       var configvalue = config ? config.map(function (item) {
         return {
           key: item.key,
@@ -16136,7 +16141,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         url: '/user/appConfig/saveUserOrder',
         method: 'POST',
         data: {
-          code: window.location.hash,
+          code: that.state.bsTableCode,
           detail: configvalue ? JSON.stringify(configvalue) : ''
         }
       }).then(function (res) {
@@ -16154,7 +16159,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
       var configArray = JSON.parse(config);
       var configSetting = configArray.filter(function (item) {
-        return item.code === window.location.hash;
+        return item.code === _this.state.bsTableCode;
       });
 
       if (configSetting.length && configSetting[0].detail) {
@@ -16166,18 +16171,20 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
 
     _this.patchConfigToLocalstorage = function (configvalue) {
       var setShowColumns = _this.props.setShowColumns;
-      var sortDataSource = _this.state.sortDataSource;
+      var _this$state = _this.state,
+          sortDataSource = _this$state.sortDataSource,
+          bsTableCode = _this$state.bsTableCode;
       var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
       var configArray = JSON.parse(config);
       var currentSetting = configArray.filter(function (item) {
-        return item.code === window.location.hash;
+        return item.code === bsTableCode;
       });
 
       if (currentSetting.length) {
         currentSetting[0].detail = JSON.stringify(configvalue);
       } else {
         configArray.push({
-          "code": window.location.hash,
+          "code": bsTableCode,
           "detail": JSON.stringify(configvalue)
         });
       }
@@ -16435,10 +16442,10 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.handleOk = function (e) {
-      var _this$state = _this.state,
-          sortDataSource = _this$state.sortDataSource,
-          isDefaultValue = _this$state.isDefaultValue,
-          defaultValue = _this$state.defaultValue;
+      var _this$state2 = _this.state,
+          sortDataSource = _this$state2.sortDataSource,
+          isDefaultValue = _this$state2.isDefaultValue,
+          defaultValue = _this$state2.defaultValue;
 
       if (!sortDataSource.length) {
         message.warning('至少选择一列!');
@@ -16461,9 +16468,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.handleTableHeadHidden = function (title) {
-      var _this$state2 = _this.state,
-          sortDataSource = _this$state2.sortDataSource,
-          dataSource = _this$state2.dataSource;
+      var _this$state3 = _this.state,
+          sortDataSource = _this$state3.sortDataSource,
+          dataSource = _this$state3.dataSource;
 
       _this.setState({
         sortDataSource: sortDataSource.filter(function (item) {
@@ -16531,9 +16538,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.onChange = function (e, title) {
-      var _this$state3 = _this.state,
-          sortDataSource = _this$state3.sortDataSource,
-          dataSource = _this$state3.dataSource;
+      var _this$state4 = _this.state,
+          sortDataSource = _this$state4.sortDataSource,
+          dataSource = _this$state4.dataSource;
 
       if (!e.target.checked) {
         _this.setState({
@@ -16612,7 +16619,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     value: function componentDidMount() {
       var _this$props2 = this.props,
           datasource = _this$props2.datasource,
-          showColumn = _this$props2.showColumn;
+          showColumn = _this$props2.showColumn,
+          bsTableCode = _this$props2.bsTableCode;
       var config = this.getConfigFromlocalstorage();
       this.setState({
         dataSource: datasource.map(function (item) {
@@ -16656,7 +16664,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
               return innerKey && innerKey === itemKey;
             })[0]) === null || _showColumn$filter$ === void 0 ? void 0 : _showColumn$filter$.width) || item.width
           });
-        })
+        }),
+        bsTableCode: bsTableCode
       });
     }
   }, {
@@ -16664,12 +16673,12 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this2 = this;
 
-      var _this$state4 = this.state,
-          dataSource = _this$state4.dataSource,
-          searchDataSource = _this$state4.searchDataSource,
-          sortDataSource = _this$state4.sortDataSource,
-          visible = _this$state4.visible,
-          onSearchSort = _this$state4.onSearchSort;
+      var _this$state5 = this.state,
+          dataSource = _this$state5.dataSource,
+          searchDataSource = _this$state5.searchDataSource,
+          sortDataSource = _this$state5.sortDataSource,
+          visible = _this$state5.visible,
+          onSearchSort = _this$state5.onSearchSort;
       var seatchDataSource = dataSource.filter(function (item) {
         var _item$title;
 
@@ -16902,14 +16911,17 @@ var index$5 = (function (props) {
       setShowColumns = _useState12[1];
 
   var _props$isPage = props.isPage,
-      pagination = props.pagination;
+      pagination = props.pagination,
+      tableCode = props.tableCode;
 
   var _useState13 = useState('100vh'),
       _useState14 = _slicedToArray(_useState13, 2),
       height = _useState14[0],
       setHeight = _useState14[1];
 
-  var sortTableRef = useRef(null); // 获取table高度
+  var sortTableRef = useRef(null);
+  var bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
+  // 获取table高度
 
   var getTableHeight = function getTableHeight() {
     var _document$querySelect, _document$querySelect2, _document$querySelect3;
@@ -16935,7 +16947,7 @@ var index$5 = (function (props) {
     var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
     var configArray = JSON.parse(config);
     var configSetting = configArray.filter(function (item) {
-      return item.code === window.location.hash;
+      return item.code === bsTableCode;
     });
 
     if (configSetting.length && configSetting[0].detail) {
@@ -17229,7 +17241,8 @@ var index$5 = (function (props) {
           ref: sortTableRef,
           setShowColumns: setShowColumns,
           showColumn: showColumn,
-          datasource: (value === null || value === void 0 ? void 0 : value.columns) || []
+          datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
+          bsTableCode: bsTableCode
         }))))
       }
     }, {

package/dist/index.js

@@ -13170,6 +13170,7 @@ var AddSkuSelect = function AddSkuSelect(parProps) {
 
   var props = {
     buttonText: parProps.buttonText || '新增',
+    buttonProps: parProps.buttonProps || {},
     value: value,
     // labelInValue: true, // 非必填 默认为false
     requestConfig: _objectSpread2({
@@ -16133,10 +16134,14 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       searchDataSource: false,
       onSearchSort: false,
       isDefaultValue: false,
-      defaultValue: []
+      defaultValue: [],
+      bsTableCode: '' //设置table 列的标识
+
     };
 
     _this.patchUserColumnConfig = function (config) {
+      var that = _assertThisInitialized(_this);
+
       var configvalue = config ? config.map(function (item) {
         return {
           key: item.key,
@@ -16150,7 +16155,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
         url: '/user/appConfig/saveUserOrder',
         method: 'POST',
         data: {
-          code: window.location.hash,
+          code: that.state.bsTableCode,
           detail: configvalue ? JSON.stringify(configvalue) : ''
         }
       }).then(function (res) {
@@ -16168,7 +16173,7 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
       var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
       var configArray = JSON.parse(config);
       var configSetting = configArray.filter(function (item) {
-        return item.code === window.location.hash;
+        return item.code === _this.state.bsTableCode;
       });
 
       if (configSetting.length && configSetting[0].detail) {
@@ -16180,18 +16185,20 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
 
     _this.patchConfigToLocalstorage = function (configvalue) {
       var setShowColumns = _this.props.setShowColumns;
-      var sortDataSource = _this.state.sortDataSource;
+      var _this$state = _this.state,
+          sortDataSource = _this$state.sortDataSource,
+          bsTableCode = _this$state.bsTableCode;
       var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
       var configArray = JSON.parse(config);
       var currentSetting = configArray.filter(function (item) {
-        return item.code === window.location.hash;
+        return item.code === bsTableCode;
       });
 
       if (currentSetting.length) {
         currentSetting[0].detail = JSON.stringify(configvalue);
       } else {
         configArray.push({
-          "code": window.location.hash,
+          "code": bsTableCode,
           "detail": JSON.stringify(configvalue)
         });
       }
@@ -16449,10 +16456,10 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.handleOk = function (e) {
-      var _this$state = _this.state,
-          sortDataSource = _this$state.sortDataSource,
-          isDefaultValue = _this$state.isDefaultValue,
-          defaultValue = _this$state.defaultValue;
+      var _this$state2 = _this.state,
+          sortDataSource = _this$state2.sortDataSource,
+          isDefaultValue = _this$state2.isDefaultValue,
+          defaultValue = _this$state2.defaultValue;
 
       if (!sortDataSource.length) {
         antd.message.warning('至少选择一列!');
@@ -16475,9 +16482,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.handleTableHeadHidden = function (title) {
-      var _this$state2 = _this.state,
-          sortDataSource = _this$state2.sortDataSource,
-          dataSource = _this$state2.dataSource;
+      var _this$state3 = _this.state,
+          sortDataSource = _this$state3.sortDataSource,
+          dataSource = _this$state3.dataSource;
 
       _this.setState({
         sortDataSource: sortDataSource.filter(function (item) {
@@ -16545,9 +16552,9 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     };
 
     _this.onChange = function (e, title) {
-      var _this$state3 = _this.state,
-          sortDataSource = _this$state3.sortDataSource,
-          dataSource = _this$state3.dataSource;
+      var _this$state4 = _this.state,
+          sortDataSource = _this$state4.sortDataSource,
+          dataSource = _this$state4.dataSource;
 
       if (!e.target.checked) {
         _this.setState({
@@ -16626,7 +16633,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     value: function componentDidMount() {
       var _this$props2 = this.props,
           datasource = _this$props2.datasource,
-          showColumn = _this$props2.showColumn;
+          showColumn = _this$props2.showColumn,
+          bsTableCode = _this$props2.bsTableCode;
       var config = this.getConfigFromlocalstorage();
       this.setState({
         dataSource: datasource.map(function (item) {
@@ -16670,7 +16678,8 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
               return innerKey && innerKey === itemKey;
             })[0]) === null || _showColumn$filter$ === void 0 ? void 0 : _showColumn$filter$.width) || item.width
           });
-        })
+        }),
+        bsTableCode: bsTableCode
       });
     }
   }, {
@@ -16678,12 +16687,12 @@ var SortableTable$1 = /*#__PURE__*/function (_React$Component) {
     value: function render() {
       var _this2 = this;
 
-      var _this$state4 = this.state,
-          dataSource = _this$state4.dataSource,
-          searchDataSource = _this$state4.searchDataSource,
-          sortDataSource = _this$state4.sortDataSource,
-          visible = _this$state4.visible,
-          onSearchSort = _this$state4.onSearchSort;
+      var _this$state5 = this.state,
+          dataSource = _this$state5.dataSource,
+          searchDataSource = _this$state5.searchDataSource,
+          sortDataSource = _this$state5.sortDataSource,
+          visible = _this$state5.visible,
+          onSearchSort = _this$state5.onSearchSort;
       var seatchDataSource = dataSource.filter(function (item) {
         var _item$title;
 
@@ -16916,14 +16925,17 @@ var index$5 = (function (props) {
       setShowColumns = _useState12[1];
 
   var _props$isPage = props.isPage,
-      pagination = props.pagination;
+      pagination = props.pagination,
+      tableCode = props.tableCode;
 
   var _useState13 = React.useState('100vh'),
       _useState14 = _slicedToArray(_useState13, 2),
       height = _useState14[0],
       setHeight = _useState14[1];
 
-  var sortTableRef = React.useRef(null); // 获取table高度
+  var sortTableRef = React.useRef(null);
+  var bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
+  // 获取table高度
 
   var getTableHeight = function getTableHeight() {
     var _document$querySelect, _document$querySelect2, _document$querySelect3;
@@ -16949,7 +16961,7 @@ var index$5 = (function (props) {
     var config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
     var configArray = JSON.parse(config);
     var configSetting = configArray.filter(function (item) {
-      return item.code === window.location.hash;
+      return item.code === bsTableCode;
     });
 
     if (configSetting.length && configSetting[0].detail) {
@@ -17243,7 +17255,8 @@ var index$5 = (function (props) {
           ref: sortTableRef,
           setShowColumns: setShowColumns,
           showColumn: showColumn,
-          datasource: (value === null || value === void 0 ? void 0 : value.columns) || []
+          datasource: (value === null || value === void 0 ? void 0 : value.columns) || [],
+          bsTableCode: bsTableCode
         }))))
       }
     }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/AddSelectBusiness/index.tsx

@@ -18,6 +18,7 @@ export const AddSkuSelect = (parProps: any) => {
   const [value, setValue] = useState(selectProps?.mode ? [] : null);
   const props = {
     buttonText: parProps.buttonText || '新增',
+    buttonProps: parProps.buttonProps || {},
     value,
     // labelInValue: true, // 非必填 默认为false
     requestConfig: {

package/src/components/Business/BsSulaQueryTable/index.tsx

@@ -59,11 +59,12 @@ export default (props: any) => {
   const [value, setValue]: any = useState(props);
   const [showColumn, setShowColumns] = useState([]);
 
-  const { isPage = true, pagination } = props;
+  const { isPage = true, pagination, tableCode } = props;
 
   const [height, setHeight]: any = useState('100vh');
   const sortTableRef = useRef(null);
-
+  
+  const bsTableCode = tableCode || window.location.hash; //设置列字段的唯一标识
   // 获取table高度
   const getTableHeight = () => {
     const cancelHeight = window.top == window ? 303 : 223;
@@ -101,7 +102,7 @@ export default (props: any) => {
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
     let configArray = JSON.parse(config);
     let configSetting = configArray.filter(
-      (item) => item.code === window.location.hash,
+      (item) => item.code === bsTableCode,
     );
 
     if (configSetting.length && configSetting[0].detail) {
@@ -371,6 +372,7 @@ export default (props: any) => {
                     setShowColumns={setShowColumns}
                     showColumn={showColumn}
                     datasource={value?.columns || []}
+                    bsTableCode={bsTableCode}
                   />
                 </span>
               </Tooltip>

package/src/components/Business/BsSulaQueryTable/setting.tsx

@@ -42,9 +42,11 @@ class SortableTable extends React.Component {
     onSearchSort: false,
     isDefaultValue: false,
     defaultValue: [],
+    bsTableCode: '', //设置table 列的标识
   };
 
   patchUserColumnConfig = (config) => {
+    let that = this;
     let configvalue = config
       ? config.map((item) => ({
           key: item.key,
@@ -58,7 +60,7 @@ class SortableTable extends React.Component {
       url: '/user/appConfig/saveUserOrder',
       method: 'POST',
       data: {
-        code: window.location.hash,
+        code: that.state.bsTableCode,
         detail: configvalue ? JSON.stringify(configvalue) : '',
       },
     }).then((res:any) => {
@@ -74,7 +76,7 @@ class SortableTable extends React.Component {
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]';
     let configArray = JSON.parse(config);
     let configSetting = configArray.filter(
-      (item) => item.code === window.location.hash,
+      (item) => item.code === this.state.bsTableCode,
     );
 
     if (configSetting.length && configSetting[0].detail) {
@@ -85,15 +87,15 @@ class SortableTable extends React.Component {
 
   patchConfigToLocalstorage = (configvalue) => {
     const { setShowColumns } = this.props;
-    const { sortDataSource } = this.state;
+    const { sortDataSource, bsTableCode } = this.state;
     let config = localStorage.getItem(ENUM.BROWSER_CACHE.COLUMN_CONDITION) || '[]'
     let configArray = JSON.parse(config)
-    let currentSetting = configArray.filter(item => item.code === window.location.hash)
+    let currentSetting = configArray.filter(item => item.code === bsTableCode)
     if (currentSetting.length) {
       currentSetting[0].detail = JSON.stringify(configvalue)
     } else {
       configArray.push({
-        "code": window.location.hash,
+        "code": bsTableCode,
         "detail": JSON.stringify(configvalue)
       })
     }
@@ -147,7 +149,7 @@ class SortableTable extends React.Component {
   };
 
   componentDidMount() {
-    const { datasource, showColumn }: any =
+    const { datasource, showColumn, bsTableCode }: any =
       this.props;
     let config = this.getConfigFromlocalstorage();
 
@@ -196,6 +198,7 @@ class SortableTable extends React.Component {
               }
             )[0]?.width || item.width,
         })),
+      bsTableCode
     });
   }