@arim-aisdc/public-components 2.0.13 → 2.0.14

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | JSX.Element | Element;
+    text: string | Element | JSX.Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/QueryFilter/QueryFilter.js

@@ -50,7 +50,8 @@ var QueryFilter = function QueryFilter(_ref, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var Option = Select.Option;
+  var Option = Select.Option,
+    OptGroup = Select.OptGroup;
   var RangePicker = DatePicker.RangePicker;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -229,17 +230,37 @@ var QueryFilter = function QueryFilter(_ref, ref) {
           optionFilterProp: item.optionFilterProp || 'value',
           optionLabelProp: item.optionLabelProp || 'children',
           children: item.setting.map(function (el, num) {
-            var _item$fieldNames, _item$fieldNames2, _item$fieldNames3, _item$fieldNames4;
-            var value = item !== null && item !== void 0 && (_item$fieldNames = item.fieldNames) !== null && _item$fieldNames !== void 0 && _item$fieldNames.value ? el[item === null || item === void 0 || (_item$fieldNames2 = item.fieldNames) === null || _item$fieldNames2 === void 0 ? void 0 : _item$fieldNames2.value] : el.value;
-            var label = item !== null && item !== void 0 && (_item$fieldNames3 = item.fieldNames) !== null && _item$fieldNames3 !== void 0 && _item$fieldNames3.label ? el[item === null || item === void 0 || (_item$fieldNames4 = item.fieldNames) === null || _item$fieldNames4 === void 0 ? void 0 : _item$fieldNames4.label] : el.label;
-            return /*#__PURE__*/_jsx(Option, {
-              value: value,
-              label: label,
-              children: el.color ? /*#__PURE__*/_jsx(Badge, {
-                color: el.color,
-                text: label
-              }) : label
-            }, num);
+            var _el$options;
+            if (el !== null && el !== void 0 && el.options && (el === null || el === void 0 || (_el$options = el.options) === null || _el$options === void 0 ? void 0 : _el$options.length) > 0) {
+              return /*#__PURE__*/_jsx(OptGroup, {
+                label: el.label,
+                children: el.options.map(function (el2) {
+                  var _item$fieldNames, _item$fieldNames2, _item$fieldNames3, _item$fieldNames4;
+                  var value = item !== null && item !== void 0 && (_item$fieldNames = item.fieldNames) !== null && _item$fieldNames !== void 0 && _item$fieldNames.value ? el2[item === null || item === void 0 || (_item$fieldNames2 = item.fieldNames) === null || _item$fieldNames2 === void 0 ? void 0 : _item$fieldNames2.value] : el2.value;
+                  var label = item !== null && item !== void 0 && (_item$fieldNames3 = item.fieldNames) !== null && _item$fieldNames3 !== void 0 && _item$fieldNames3.label ? el2[item === null || item === void 0 || (_item$fieldNames4 = item.fieldNames) === null || _item$fieldNames4 === void 0 ? void 0 : _item$fieldNames4.label] : el2.label;
+                  return /*#__PURE__*/_jsx(Option, {
+                    value: value,
+                    label: label,
+                    children: el2.color ? /*#__PURE__*/_jsx(Badge, {
+                      color: el2.color,
+                      text: label
+                    }) : label
+                  }, value);
+                })
+              }, num);
+            } else {
+              var _item$fieldNames5, _item$fieldNames6, _item$fieldNames7, _item$fieldNames8;
+              var value = item !== null && item !== void 0 && (_item$fieldNames5 = item.fieldNames) !== null && _item$fieldNames5 !== void 0 && _item$fieldNames5.value ? el[item === null || item === void 0 || (_item$fieldNames6 = item.fieldNames) === null || _item$fieldNames6 === void 0 ? void 0 : _item$fieldNames6.value] : el.value;
+              var label = item !== null && item !== void 0 && (_item$fieldNames7 = item.fieldNames) !== null && _item$fieldNames7 !== void 0 && _item$fieldNames7.label ? el[item === null || item === void 0 || (_item$fieldNames8 = item.fieldNames) === null || _item$fieldNames8 === void 0 ? void 0 : _item$fieldNames8.label] : el.label;
+              return /*#__PURE__*/_jsx(Option, {
+                value: value,
+                label: label,
+                children: el.color ? /*#__PURE__*/_jsx(Badge, {
+                  color: el.color,
+                  text: label
+                }) : label
+              }, num);
+            }
           })
         });
         break;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",