@arim-aisdc/public-components 2.0.13 → 2.0.15

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/ConfigProvider/context.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="react" />
 import type { VariablesJsonType } from './type';
+import { ThemeType } from "../../../dist/components/ThemeProvider";
 export interface ConfigConsumerProps {
     userId?: string;
     tableKeyPrefixCls?: string;
@@ -12,7 +13,7 @@ export interface ConfigConsumerProps {
     /**项目根节名称 */
     root?: string;
     /** 空数据图标组件 */
-    renderEmpty?: () => React.ReactNode;
+    renderEmpty?: (theme?: ThemeType) => React.ReactNode;
 }
 export declare const DEFAULT_CONTEXT: {
     theme: string;

package/dist/components/Icon/IconDemo/index.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+export type IconType = 'colours' | 'gray';
+export type IconProps = {
+    type?: IconType;
+    name?: string;
+    prefix?: string;
+};
+declare const IconDemo: React.FC<IconProps>;
+export default IconDemo;

package/dist/components/Icon/IconDemo/index.js

@@ -0,0 +1,22 @@
+import { Icon } from "../../..";
+import React from 'react';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+var IconDemo = function IconDemo() {
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx("h5", {
+      children: "\u5355\u8272\u56FE\u6807"
+    }), /*#__PURE__*/_jsx(Icon, {
+      prefix: "gray",
+      name: "hebingjiaoci"
+    }), /*#__PURE__*/_jsx("h5", {
+      children: "\u5F69\u8272\u56FE\u6807"
+    }), /*#__PURE__*/_jsx(Icon, {
+      type: "colours",
+      prefix: "",
+      name: ""
+    })]
+  });
+};
+export default IconDemo;

package/dist/components/Icon/index.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+export type IconType = 'colours' | 'gray';
+export type IconProps = {
+    type?: IconType;
+    name?: string;
+    prefix?: string;
+};
+declare const Icon: React.FC<IconProps>;
+export default Icon;

package/dist/components/Icon/index.js

@@ -0,0 +1,20 @@
+import React, { useMemo } from 'react';
+import { useConfig } from "../ConfigProvider";
+import { jsx as _jsx } from "react/jsx-runtime";
+var Icon = function Icon(_ref) {
+  var _ref$type = _ref.type,
+    type = _ref$type === void 0 ? 'gray' : _ref$type,
+    name = _ref.name,
+    prefix = _ref.prefix;
+  var _useConfig = useConfig(),
+    theme = _useConfig.theme;
+  var iconPrefix = useMemo(function () {
+    if (type === 'gray') return prefix;
+    if (type === 'colours') return "".concat(prefix, "-").concat(theme);
+    return undefined;
+  }, [theme]);
+  return /*#__PURE__*/_jsx("i", {
+    className: "iconfont-".concat(iconPrefix, " icon-").concat(iconPrefix, "-").concat(name)
+  });
+};
+export default Icon;

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/dist/components/TableMax/TableBody/index.js

@@ -231,7 +231,7 @@ var TableBody = function TableBody(_ref) {
         children: loading ? /*#__PURE__*/_jsx(Spin, {}) : /*#__PURE__*/_jsx("span", {
           className: "empty-content",
           ref: dropRef,
-          children: renderEmpty ? renderEmpty() : /*#__PURE__*/_jsxs(_Fragment, {
+          children: renderEmpty ? renderEmpty(theme) : /*#__PURE__*/_jsxs(_Fragment, {
             children: [/*#__PURE__*/_jsx("img", {
               className: "empty-img",
               src: theme === 'dark' ? DataEmptyDarkPng : DataEmptyLightPng

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/index.d.ts

@@ -29,6 +29,8 @@ export { default as ConditionExpression } from './components/ConditionExpression
 export * from './components/ConfigProvider';
 export * from './components/Filter';
 export { default as SchemaForm } from './components/SchemaForm';
+export * from './components/Icon';
+export { default as Icon } from './components/Icon';
 export { default as useCenterModalState } from './hooks/useCenterModalState';
 export * from './hooks/useEventBus';
 export { default as useEventBus } from './hooks/useEventBus';

package/dist/index.js

@@ -30,6 +30,8 @@ export { default as ConditionExpression } from "./components/ConditionExpression
 export * from "./components/ConfigProvider";
 export * from "./components/Filter";
 export { default as SchemaForm } from "./components/SchemaForm";
+export * from "./components/Icon";
+export { default as Icon } from "./components/Icon";
 
 // hooks
 export { default as useCenterModalState } from "./hooks/useCenterModalState";

package/package.json

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