@bit-sun/business-component 3.2.0-alpha.4 → 3.2.2

package/dist/index.esm.js

@@ -4578,9 +4578,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     if (labelInValue) {
       var formatResult = value.map(function (i) {
         return {
-          key: i[mappingValueField],
-          label: i[mappingTextField],
-          value: i[mappingValueField]
+          key: i[mappingValueField] || i.key,
+          label: i[mappingTextField] || i.label,
+          value: i[mappingValueField] || i.value
         };
       });
       onChange(selectMode ? formatResult : formatResult[0], value, source);
@@ -15615,9 +15615,6 @@ var ResizeableTitle$2 = function ResizeableTitle(props) {
 };
 var BsSulaQueryTable = (function (props) {
   var _props$expandable, _value$exportConfig7;
-  var _useState = useState('max-height' + uuid()),
-    _useState2 = _slicedToArray(_useState, 1),
-    randomKey = _useState2[0];
   var bsTableCode = (props === null || props === void 0 ? void 0 : props.tableCode) || window.location.hash; //设置列字段的唯一标识
   // 获取 table columns中所有的 key  防止有的地方是 dataindex
   var checkedList = useMemo(function () {
@@ -15693,39 +15690,39 @@ var BsSulaQueryTable = (function (props) {
     return _toConsumableArray(originConfig);
   };
   var refs = useRef(null);
-  var _useState3 = useState(''),
-    _useState4 = _slicedToArray(_useState3, 2),
-    pagePath = _useState4[0],
-    setPagePath = _useState4[1];
+  var _useState = useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    pagePath = _useState2[0],
+    setPagePath = _useState2[1];
   var _useLocation = useLocation(),
     pathname = _useLocation.pathname,
     _useLocation$state = _useLocation.state,
     state = _useLocation$state === void 0 ? {} : _useLocation$state;
-  var _useState5 = useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    isFullScreen = _useState6[0],
-    setIsFnllScreen = _useState6[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isFullScreen = _useState4[0],
+    setIsFnllScreen = _useState4[1];
   // @ts-nocheck
   var value = props;
   var _props$fields = props.fields,
     fields = _props$fields === void 0 ? [] : _props$fields;
-  var _useState7 = useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    showColumn = _useState8[0],
-    setShowColumns = _useState8[1]; // 列字段
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    showColumn = _useState6[0],
+    setShowColumns = _useState6[1]; // 列字段
   var originSearchFields = getSettingFieldOrColumn(getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION), fields, 'searchFields');
-  var _useState9 = useState(originSearchFields),
+  var _useState7 = useState(originSearchFields),
+    _useState8 = _slicedToArray(_useState7, 2),
+    showSearchFields = _useState8[0],
+    setShowSearchFields = _useState8[1]; //搜索项字段
+  var _useState9 = useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    showSearchFields = _useState10[0],
-    setShowSearchFields = _useState10[1]; //搜索项字段
-  var _useState11 = useState([]),
+    showExportColumn = _useState10[0],
+    setShowExportColumns = _useState10[1]; // 导出列字段
+  var _useState11 = useState('100vh'),
     _useState12 = _slicedToArray(_useState11, 2),
-    showExportColumn = _useState12[0],
-    setShowExportColumns = _useState12[1]; // 导出列字段
-  var _useState13 = useState('100vh'),
-    _useState14 = _slicedToArray(_useState13, 2),
-    height = _useState14[0],
-    setHeight = _useState14[1];
+    height = _useState12[0],
+    setHeight = _useState12[1];
   var sortTableRef = useRef(null);
   var searchTableRef = useRef(null);
   var exportTableRef = useRef(null);
@@ -15733,34 +15730,15 @@ var BsSulaQueryTable = (function (props) {
   // 获取table高度
   var getTableHeight = function getTableHeight() {
     setTimeout(function () {
-      var clientBodyTopHeight = document.querySelector(".".concat(randomKey, " .ant-table-body")).getBoundingClientRect().top;
-      setHeight("calc(100vh - " + (clientBodyTopHeight + 67) + "px)");
-      // const cancelHeight = window.top == window ? 303 : 223;
-      // const isFullScreen: any =
-      //   window.top.document.fullScreen ||
-      //   window.top.document.webkitIsFullScreen ||
-      //   window.top.document.mozFullScreen;
-      // // wujie子应用iframe首次加载获取不到client以及dom元素高度兼容处理
-      // let realIframeClientHeight = document.body.clientHeight ? document.body.clientHeight : window.top?.document.body.clientHeight - 76;
-      // let summaryHeight = document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`) ?
-      //   (document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`)?.clientHeight || 22) : 0;
-      // let listTabHeight = document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`) ?
-      //   (document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`)?.clientHeight || 48) : 0;
-      // const h =
-      //   realIframeClientHeight -
-      //   summaryHeight -
-      //   listTabHeight -
-      //   (document.querySelector(
-      //     `.ant-tabs-tabpane-active .ant-form ant-form-horizontal`,
-      //   )?.clientHeight || 0) -
-      //   (isFullScreen
-      //     ? 0
-      //     : document.querySelector(
-      //         `.ant-tabs-tabpane-active .ant-pro-page-container-warp`,
-      //       )?.clientHeight || 0) -
-      //   cancelHeight +
-      //   'px';
-      // setHeight(h);
+      var _window$top, _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;
+      // wujie子应用iframe首次加载获取不到client以及dom元素高度兼容处理
+      var realIframeClientHeight = document.body.clientHeight ? document.body.clientHeight : ((_window$top = window.top) === null || _window$top === void 0 ? void 0 : _window$top.document.body.clientHeight) - 76;
+      var summaryHeight = document.querySelector(".ant-tabs-tabpane-active .table-bssula-summary") ? ((_document$querySelect = document.querySelector(".ant-tabs-tabpane-active .table-bssula-summary")) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 22 : 0;
+      var listTabHeight = document.querySelector(".ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav") ? ((_document$querySelect2 = document.querySelector(".ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav")) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.clientHeight) || 48 : 0;
+      var h = realIframeClientHeight - summaryHeight - listTabHeight - (((_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);
     }, 0);
   };
   //监测是否按下esc键
@@ -15861,7 +15839,7 @@ var BsSulaQueryTable = (function (props) {
   };
   //组件初始挂载
   useEffect(function () {
-    getTableHeight();
+    // getTableHeight();
     setInitialTableInfo();
     setInitialSearchFieldsInfo();
     window.addEventListener('resize', function (e) {
@@ -16219,10 +16197,9 @@ var BsSulaQueryTable = (function (props) {
     });
   }, [
   // value,
-  checkedList, showColumn, props.statusMapping, showSearchFields, expandedRowKeys, height]);
+  checkedList, showColumn, props.statusMapping, showSearchFields, expandedRowKeys]);
   return /*#__PURE__*/React$1.createElement("div", {
-    id: "bs-sula-query-table",
-    className: randomKey
+    id: "bs-sula-query-table"
   }, /*#__PURE__*/React$1.createElement(MemoQueryTable, _objectSpread2({}, memoConfig)), /*#__PURE__*/React$1.createElement(SortableTable$1, {
     ref: sortTableRef,
     setShowColumns: setShowColumns,
@@ -34957,6 +34934,21 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             }) : pCode;
           }
         }
+        if ((configItem === null || configItem === void 0 ? void 0 : configItem.inputType) === 30) {
+          var _pCode$split;
+          var _newPCode = Array.isArray(pCode) ? pCode === null || pCode === void 0 ? void 0 : pCode.map(function (s) {
+            return isObj(s) ? s : {
+              key: s,
+              value: s
+            };
+          }) : pCode === null || pCode === void 0 ? void 0 : (_pCode$split = pCode.split(',')) === null || _pCode$split === void 0 ? void 0 : _pCode$split.map(function (s) {
+            return {
+              key: s,
+              value: s
+            };
+          });
+          return _newPCode || pCode || defaultValue;
+        }
         return pCode || defaultValue;
       };
       var handleEdit = function handleEdit(code, val, functionItem) {
@@ -34967,7 +34959,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           });
           return;
         }
-        if (Array.isArray(val)) {
+        if (Array.isArray(val) && (val === null || val === void 0 ? void 0 : val.length)) {
           value = val.map(function (m) {
             return m.value || m;
           }).join(',');

package/dist/index.js

@@ -4601,9 +4601,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     if (labelInValue) {
       var formatResult = value.map(function (i) {
         return {
-          key: i[mappingValueField],
-          label: i[mappingTextField],
-          value: i[mappingValueField]
+          key: i[mappingValueField] || i.key,
+          label: i[mappingTextField] || i.label,
+          value: i[mappingValueField] || i.value
         };
       });
       onChange(selectMode ? formatResult : formatResult[0], value, source);
@@ -15638,9 +15638,6 @@ var ResizeableTitle$2 = function ResizeableTitle(props) {
 };
 var BsSulaQueryTable = (function (props) {
   var _props$expandable, _value$exportConfig7;
-  var _useState = React$1.useState('max-height' + uuid()),
-    _useState2 = _slicedToArray(_useState, 1),
-    randomKey = _useState2[0];
   var bsTableCode = (props === null || props === void 0 ? void 0 : props.tableCode) || window.location.hash; //设置列字段的唯一标识
   // 获取 table columns中所有的 key  防止有的地方是 dataindex
   var checkedList = React$1.useMemo(function () {
@@ -15716,39 +15713,39 @@ var BsSulaQueryTable = (function (props) {
     return _toConsumableArray(originConfig);
   };
   var refs = React$1.useRef(null);
-  var _useState3 = React$1.useState(''),
-    _useState4 = _slicedToArray(_useState3, 2),
-    pagePath = _useState4[0],
-    setPagePath = _useState4[1];
+  var _useState = React$1.useState(''),
+    _useState2 = _slicedToArray(_useState, 2),
+    pagePath = _useState2[0],
+    setPagePath = _useState2[1];
   var _useLocation = umi.useLocation(),
     pathname = _useLocation.pathname,
     _useLocation$state = _useLocation.state,
     state = _useLocation$state === void 0 ? {} : _useLocation$state;
-  var _useState5 = React$1.useState(false),
-    _useState6 = _slicedToArray(_useState5, 2),
-    isFullScreen = _useState6[0],
-    setIsFnllScreen = _useState6[1];
+  var _useState3 = React$1.useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isFullScreen = _useState4[0],
+    setIsFnllScreen = _useState4[1];
   // @ts-nocheck
   var value = props;
   var _props$fields = props.fields,
     fields = _props$fields === void 0 ? [] : _props$fields;
-  var _useState7 = React$1.useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    showColumn = _useState8[0],
-    setShowColumns = _useState8[1]; // 列字段
+  var _useState5 = React$1.useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    showColumn = _useState6[0],
+    setShowColumns = _useState6[1]; // 列字段
   var originSearchFields = getSettingFieldOrColumn(getConfigFromlocalstorage(ENUM.BROWSER_CACHE.SEARCH_FIELDS_CONDITION), fields, 'searchFields');
-  var _useState9 = React$1.useState(originSearchFields),
+  var _useState7 = React$1.useState(originSearchFields),
+    _useState8 = _slicedToArray(_useState7, 2),
+    showSearchFields = _useState8[0],
+    setShowSearchFields = _useState8[1]; //搜索项字段
+  var _useState9 = React$1.useState([]),
     _useState10 = _slicedToArray(_useState9, 2),
-    showSearchFields = _useState10[0],
-    setShowSearchFields = _useState10[1]; //搜索项字段
-  var _useState11 = React$1.useState([]),
+    showExportColumn = _useState10[0],
+    setShowExportColumns = _useState10[1]; // 导出列字段
+  var _useState11 = React$1.useState('100vh'),
     _useState12 = _slicedToArray(_useState11, 2),
-    showExportColumn = _useState12[0],
-    setShowExportColumns = _useState12[1]; // 导出列字段
-  var _useState13 = React$1.useState('100vh'),
-    _useState14 = _slicedToArray(_useState13, 2),
-    height = _useState14[0],
-    setHeight = _useState14[1];
+    height = _useState12[0],
+    setHeight = _useState12[1];
   var sortTableRef = React$1.useRef(null);
   var searchTableRef = React$1.useRef(null);
   var exportTableRef = React$1.useRef(null);
@@ -15756,34 +15753,15 @@ var BsSulaQueryTable = (function (props) {
   // 获取table高度
   var getTableHeight = function getTableHeight() {
     setTimeout(function () {
-      var clientBodyTopHeight = document.querySelector(".".concat(randomKey, " .ant-table-body")).getBoundingClientRect().top;
-      setHeight("calc(100vh - " + (clientBodyTopHeight + 67) + "px)");
-      // const cancelHeight = window.top == window ? 303 : 223;
-      // const isFullScreen: any =
-      //   window.top.document.fullScreen ||
-      //   window.top.document.webkitIsFullScreen ||
-      //   window.top.document.mozFullScreen;
-      // // wujie子应用iframe首次加载获取不到client以及dom元素高度兼容处理
-      // let realIframeClientHeight = document.body.clientHeight ? document.body.clientHeight : window.top?.document.body.clientHeight - 76;
-      // let summaryHeight = document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`) ?
-      //   (document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`)?.clientHeight || 22) : 0;
-      // let listTabHeight = document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`) ?
-      //   (document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`)?.clientHeight || 48) : 0;
-      // const h =
-      //   realIframeClientHeight -
-      //   summaryHeight -
-      //   listTabHeight -
-      //   (document.querySelector(
-      //     `.ant-tabs-tabpane-active .ant-form ant-form-horizontal`,
-      //   )?.clientHeight || 0) -
-      //   (isFullScreen
-      //     ? 0
-      //     : document.querySelector(
-      //         `.ant-tabs-tabpane-active .ant-pro-page-container-warp`,
-      //       )?.clientHeight || 0) -
-      //   cancelHeight +
-      //   'px';
-      // setHeight(h);
+      var _window$top, _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;
+      // wujie子应用iframe首次加载获取不到client以及dom元素高度兼容处理
+      var realIframeClientHeight = document.body.clientHeight ? document.body.clientHeight : ((_window$top = window.top) === null || _window$top === void 0 ? void 0 : _window$top.document.body.clientHeight) - 76;
+      var summaryHeight = document.querySelector(".ant-tabs-tabpane-active .table-bssula-summary") ? ((_document$querySelect = document.querySelector(".ant-tabs-tabpane-active .table-bssula-summary")) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 22 : 0;
+      var listTabHeight = document.querySelector(".ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav") ? ((_document$querySelect2 = document.querySelector(".ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav")) === null || _document$querySelect2 === void 0 ? void 0 : _document$querySelect2.clientHeight) || 48 : 0;
+      var h = realIframeClientHeight - summaryHeight - listTabHeight - (((_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);
     }, 0);
   };
   //监测是否按下esc键
@@ -15884,7 +15862,7 @@ var BsSulaQueryTable = (function (props) {
   };
   //组件初始挂载
   React$1.useEffect(function () {
-    getTableHeight();
+    // getTableHeight();
     setInitialTableInfo();
     setInitialSearchFieldsInfo();
     window.addEventListener('resize', function (e) {
@@ -16242,10 +16220,9 @@ var BsSulaQueryTable = (function (props) {
     });
   }, [
   // value,
-  checkedList, showColumn, props.statusMapping, showSearchFields, expandedRowKeys, height]);
+  checkedList, showColumn, props.statusMapping, showSearchFields, expandedRowKeys]);
   return /*#__PURE__*/React__default['default'].createElement("div", {
-    id: "bs-sula-query-table",
-    className: randomKey
+    id: "bs-sula-query-table"
   }, /*#__PURE__*/React__default['default'].createElement(MemoQueryTable, _objectSpread2({}, memoConfig)), /*#__PURE__*/React__default['default'].createElement(SortableTable$1, {
     ref: sortTableRef,
     setShowColumns: setShowColumns,
@@ -34980,6 +34957,21 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             }) : pCode;
           }
         }
+        if ((configItem === null || configItem === void 0 ? void 0 : configItem.inputType) === 30) {
+          var _pCode$split;
+          var _newPCode = Array.isArray(pCode) ? pCode === null || pCode === void 0 ? void 0 : pCode.map(function (s) {
+            return isObj(s) ? s : {
+              key: s,
+              value: s
+            };
+          }) : pCode === null || pCode === void 0 ? void 0 : (_pCode$split = pCode.split(',')) === null || _pCode$split === void 0 ? void 0 : _pCode$split.map(function (s) {
+            return {
+              key: s,
+              value: s
+            };
+          });
+          return _newPCode || pCode || defaultValue;
+        }
         return pCode || defaultValue;
       };
       var handleEdit = function handleEdit(code, val, functionItem) {
@@ -34990,7 +34982,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           });
           return;
         }
-        if (Array.isArray(val)) {
+        if (Array.isArray(val) && (val === null || val === void 0 ? void 0 : val.length)) {
           value = val.map(function (m) {
             return m.value || m;
           }).join(',');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "3.2.0-alpha.4",
+  "version": "3.2.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -60,7 +60,6 @@ const ResizeableTitle = (props) => {
 };
 
 export default (props: any) => {
-  const [randomKey, ] = useState('max-height' + uuid());
   const bsTableCode = props?.tableCode || window.location.hash; //设置列字段的唯一标识
 
    // 获取 table columns中所有的 key  防止有的地方是 dataindex
@@ -170,37 +169,35 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
   // 获取table高度
   const getTableHeight = () => {
     setTimeout(() => {
-      const clientBodyTopHeight = document.querySelector(`.${randomKey} .ant-table-body`).getBoundingClientRect().top;
-      setHeight("calc(100vh - " + (clientBodyTopHeight + 67) + "px)");
-      // const cancelHeight = window.top == window ? 303 : 223;
-      // const isFullScreen: any =
-      //   window.top.document.fullScreen ||
-      //   window.top.document.webkitIsFullScreen ||
-      //   window.top.document.mozFullScreen;
-
-      // // wujie子应用iframe首次加载获取不到client以及dom元素高度兼容处理
-      // let realIframeClientHeight = document.body.clientHeight ? document.body.clientHeight : window.top?.document.body.clientHeight - 76;
-      // let summaryHeight = document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`) ?
-      //   (document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`)?.clientHeight || 22) : 0;
-      // let listTabHeight = document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`) ?
-      //   (document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`)?.clientHeight || 48) : 0;
-
-
-      // const h =
-      //   realIframeClientHeight -
-      //   summaryHeight -
-      //   listTabHeight -
-      //   (document.querySelector(
-      //     `.ant-tabs-tabpane-active .ant-form ant-form-horizontal`,
-      //   )?.clientHeight || 0) -
-      //   (isFullScreen
-      //     ? 0
-      //     : document.querySelector(
-      //         `.ant-tabs-tabpane-active .ant-pro-page-container-warp`,
-      //       )?.clientHeight || 0) -
-      //   cancelHeight +
-      //   'px';
-      // setHeight(h);
+      const cancelHeight = window.top == window ? 303 : 223;
+      const isFullScreen: any =
+        window.top.document.fullScreen ||
+        window.top.document.webkitIsFullScreen ||
+        window.top.document.mozFullScreen;
+
+      // wujie子应用iframe首次加载获取不到client以及dom元素高度兼容处理
+      let realIframeClientHeight = document.body.clientHeight ? document.body.clientHeight : window.top?.document.body.clientHeight - 76;
+      let summaryHeight = document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`) ?
+        (document.querySelector(`.ant-tabs-tabpane-active .table-bssula-summary`)?.clientHeight || 22) : 0;
+      let listTabHeight = document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`) ?
+        (document.querySelector(`.ant-tabs-tabpane-active .list_top_tab .ant-tabs-nav`)?.clientHeight || 48) : 0;
+
+
+      const h =
+        realIframeClientHeight -
+        summaryHeight -
+        listTabHeight -
+        (document.querySelector(
+          `.ant-tabs-tabpane-active .ant-form ant-form-horizontal`,
+        )?.clientHeight || 0) -
+        (isFullScreen
+          ? 0
+          : document.querySelector(
+              `.ant-tabs-tabpane-active .ant-pro-page-container-warp`,
+            )?.clientHeight || 0) -
+        cancelHeight +
+        'px';
+      setHeight(h);
     }, 0);
   };
 
@@ -315,7 +312,7 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
 
   //组件初始挂载
   useEffect(() => {
-    getTableHeight();
+    // getTableHeight();
     setInitialTableInfo();
     setInitialSearchFieldsInfo();
     window.addEventListener('resize', (e) => {
@@ -741,11 +738,10 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
       props.statusMapping,
       showSearchFields,
       expandedRowKeys,
-      height
     ],
   );
   return (
-    <div id="bs-sula-query-table" className={randomKey}>
+    <div id="bs-sula-query-table">
       <MemoQueryTable {...memoConfig} />
       <SortableTable
         ref={sortTableRef}

package/src/components/Functional/SearchSelect/index.tsx

@@ -478,7 +478,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
   const formaData = (value: any, source: any) => {
     if (labelInValue) {
-      const formatResult = value.map((i: any) => ({ key: i[mappingValueField], label: i[mappingTextField], value: i[mappingValueField] }))
+      const formatResult = value.map((i: any) => ({ key: i[mappingValueField] || i.key, label: i[mappingTextField] || i.label, value: i[mappingValueField] || i.value }))
       onChange(selectMode ? formatResult : formatResult[0], value,source)
     } else {
       const formatResult = selectMode ? value.map((i: any) => i.value) : _.get(value[0], 'value')

package/src/components/Solution/RuleComponent/index.js

@@ -1021,6 +1021,10 @@ class RuleObjectComponent extends Component {
           return pCode ? newPCode?.map((i) => moment(i)) : pCode;
         }
       }
+      if(configItem?.inputType === 30) {
+        const newPCode = Array.isArray(pCode) ? pCode?.map(s => isObj(s) ? s : ({ key: s, value: s })) : pCode?.split(',')?.map(s => ({ key: s, value: s }));
+        return newPCode || pCode || defaultValue;
+      }
       return pCode || defaultValue;
     };
     const handleEdit = (code, val, functionItem) => {
@@ -1031,7 +1035,7 @@ class RuleObjectComponent extends Component {
         });
         return;
       }
-      if (Array.isArray(val)) {
+      if (Array.isArray(val) && val?.length) {
         value = val.map((m) => m.value || m).join(',');
       }
       if (isObj(val)) {

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

@@ -1,121 +0,0 @@
----
-nav:
-  title: '组件'
-  order: 1
-group:
-  title: 业务组件
-  order: 0
-title: BsSulaQueryTable 查询表格
-order: 3
----
-
-# BsSulaQueryTable 查询表格
-
-## 基础用法
-
-```tsx
-import React from 'react';
-import BsSulaQueryTable from './index';
-
-export default () => {
-  const config = {
-    needPageHeader: false,
-    summary: [{
-      label: '总金额',
-      count: 100
-    },{
-      label: '运费',
-      count: 100
-    }],
-    statusMapping: [{
-      label: '初始化',
-      key: 'qp-status-eq',
-      count: 100, // 该状态单据总数，业务代码侧计算
-    },{
-      label: '待审核',
-      key: 'qp-status-eq',
-      count: 200,
-    }],
-    remoteDataSource: {
-      url: `/user/managementApplication`,
-      method: 'GET',
-      convertParams: {
-        type: 'tableConvertParamsType',
-        initialParams: {
-          sorter: 'desc-createTime',
-        },
-      },
-      converter: 'bs-tableConvertType',
-    },
-    rowSelection: {},
-    actionsRender: [
-      {
-        type: 'button',
-        props: {
-          type: 'primary',
-          children: '新增销售单',
-        },
-        code: 'DRP_Sale_Bill_add',
-        action: [
-          {
-            type: 'route',
-            path: '/sales-management/sales-slip/create',
-          },
-        ],
-      },
-    ],
-    fields: [
-      {
-        name: 'qp-code-eq',
-        label: '应用编码',
-        field: {
-          type: 'input',
-          props: {
-            allowClear: true,
-            maxLength: 32,
-            placeholder: '请输入应用编码',
-          },
-        },
-      },
-    ],
-    columns: [
-      {
-        dataIndex: 'code',
-        title: '应用编码',
-        tableHeadFilterKey: 'qp-code-eq',
-      },
-      {
-        dataIndex: 'operator',
-        title: '操作',
-        fixed: 'right',
-        render: [
-          {
-            type: 'link',
-            code: 'User_ApplicationList_edit',
-            props: {
-              type: 'primary',
-              children: '编辑',
-            },
-            visible: '#{record.status === 1}',
-          },
-        ],
-      },
-    ],
-    rowKey: 'id',
-    tableProps: {
-      initialPaging: {
-        pagination: {
-          pageSize: 10,
-        }
-      }
-    }
-  };
-
-  return (
-    <div>
-      <BsSulaQueryTable {...config} />
-    </div>
-  )
-}
-
-```