@bit-sun/business-component 3.2.0-alpha.5 → 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);
@@ -15719,7 +15719,7 @@ var BsSulaQueryTable = (function (props) {
     _useState10 = _slicedToArray(_useState9, 2),
     showExportColumn = _useState10[0],
     setShowExportColumns = _useState10[1]; // 导出列字段
-  var _useState11 = useState(''),
+  var _useState11 = useState('100vh'),
     _useState12 = _slicedToArray(_useState11, 2),
     height = _useState12[0],
     setHeight = _useState12[1];
@@ -15839,7 +15839,7 @@ var BsSulaQueryTable = (function (props) {
   };
   //组件初始挂载
   useEffect(function () {
-    getTableHeight();
+    // getTableHeight();
     setInitialTableInfo();
     setInitialSearchFieldsInfo();
     window.addEventListener('resize', function (e) {
@@ -34934,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) {
@@ -34944,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);
@@ -15742,7 +15742,7 @@ var BsSulaQueryTable = (function (props) {
     _useState10 = _slicedToArray(_useState9, 2),
     showExportColumn = _useState10[0],
     setShowExportColumns = _useState10[1]; // 导出列字段
-  var _useState11 = React$1.useState(''),
+  var _useState11 = React$1.useState('100vh'),
     _useState12 = _slicedToArray(_useState11, 2),
     height = _useState12[0],
     setHeight = _useState12[1];
@@ -15862,7 +15862,7 @@ var BsSulaQueryTable = (function (props) {
   };
   //组件初始挂载
   React$1.useEffect(function () {
-    getTableHeight();
+    // getTableHeight();
     setInitialTableInfo();
     setInitialSearchFieldsInfo();
     window.addEventListener('resize', function (e) {
@@ -34957,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) {
@@ -34967,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.5",
+  "version": "3.2.2",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -159,7 +159,7 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
   const [showSearchFields, setShowSearchFields] = useState(originSearchFields); //搜索项字段
   const [showExportColumn, setShowExportColumns] = useState([]); // 导出列字段
 
-  const [height, setHeight]: any = useState('');
+  const [height, setHeight]: any = useState('100vh');
   const sortTableRef = useRef(null);
   const searchTableRef = useRef(null);
   const exportTableRef = useRef<any>(null);
@@ -312,7 +312,7 @@ const getSettingFieldOrColumn = (savedConfig, originConfig, type: string) => {
 
   //组件初始挂载
   useEffect(() => {
-    getTableHeight();
+    // getTableHeight();
     setInitialTableInfo();
     setInitialSearchFieldsInfo();
     window.addEventListener('resize', (e) => {

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)) {