@pisell/materials 1.0.631 → 1.0.633

package/es/components/dataSourceComponents/dataSourceForm/utils.js

@@ -357,7 +357,12 @@ export var withDataSource = function withDataSource(WrappedComponent) {
   return function (props) {
     var dataSource = props.dataSource;
     return /*#__PURE__*/React.createElement(DataSourceProvider, {
-      dataSource: dataSource
+      dataSource: dataSource,
+      requestOptions: {
+        list: {
+          cacheKey: "".concat(dataSource === null || dataSource === void 0 ? void 0 : dataSource.headerDataSource, "-").concat(dataSource === null || dataSource === void 0 ? void 0 : dataSource.name, "-").concat(dataSource === null || dataSource === void 0 ? void 0 : dataSource.tableName)
+        }
+      }
     }, /*#__PURE__*/React.createElement(WrappedComponent, props));
   };
 };
@@ -376,7 +381,7 @@ export var withOptions = function withOptions(WrappedComponent) {
       if (optionSourceType === 'api') {
         list.run(_objectSpread({
           page: 1,
-          pageSize: 200
+          pageSize: 500
         }, extraParams));
       }
     }, []);
@@ -436,7 +441,7 @@ export var renderValueWithMap = function renderValueWithMap(value, valueMap, ren
         style: textStyle
       }, valueMap === null || valueMap === void 0 ? void 0 : valueMap[item]), index < value.length - 1 && ', ');
     }));
-  } else if (isString(value)) {
+  } else if (isString(value) || isNumber(value)) {
     return /*#__PURE__*/React.createElement("span", {
       className: "pisell-form-read-pretty-text"
     }, /*#__PURE__*/React.createElement("span", {

package/es/components/dataSourceComponents/dataSourceTable/hooks/useColumns.js

@@ -12,8 +12,7 @@ var genFieldProps = function genFieldProps(field, fieldProps) {
     renderMode: 'tableView',
     noStyle: true
   };
-  if (!field) return props;
-  if (['Select', 'Radio.Group', 'Checkbox.Group'].includes(field.uiSchema['x-component']) && field.uiSchema.enum.length > 0) {
+  if (field && ['Select', 'Radio.Group', 'Checkbox.Group'].includes(field.uiSchema['x-component']) && field.uiSchema.enum.length > 0) {
     if (['Radio.Group', 'Checkbox.Group'].includes(field.uiSchema['x-component'])) {
       props.direction = 'horizontal';
     }

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -47,7 +47,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.js

@@ -220,6 +220,7 @@ var useTableProps = function useTableProps(props) {
         buttonProps = button.buttonProps,
         beforeOpen = button.beforeOpen;
       return _objectSpread(_objectSpread(_objectSpread({}, button), buttonProps), {}, {
+        title: button.label,
         onClick: function onClick() {
           if (actionType === 'add') {
             var result = true;

package/es/components/dataSourceComponents/fields/Select/index.d.ts

@@ -4,7 +4,6 @@ declare const SelectWithDataSource: (props: import("antd").SelectProps<any, impo
     optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
-    extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
 }) => React.JSX.Element;

package/es/components/dataSourceComponents/fields/index.d.ts

@@ -38,7 +38,6 @@ declare const formFieldMap: {
         optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
-        extraParams?: Record<string, any> | undefined;
     } & {
         dataSource?: any;
     }) => import("react").JSX.Element;
@@ -95,7 +94,6 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
-    extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
 }) => import("react").JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;

package/es/components/dataSourceComponents/hooks/useValueMap.js

@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { isString } from '@pisell/utils';
+import { isNumber, isString } from '@pisell/utils';
 
 /**
  * 将 options 转换为 valueMap
@@ -12,7 +12,7 @@ var useValueMap = function useValueMap(options) {
     return (options === null || options === void 0 ? void 0 : options.reduce(function (acc, item) {
       var itemValue = item.value;
       var itemLabel = item.label;
-      if (isString(itemValue) && isString(itemLabel)) {
+      if ((isString(itemValue) || isNumber(itemValue)) && isString(itemLabel)) {
         acc[itemValue] = itemLabel;
       }
       return acc;

package/es/components/dataSourceComponents/provider/dataSource/DataSourceContext.d.ts

@@ -80,6 +80,13 @@ export declare type DataSourceContextProps = {
         create?: () => Promise<any>;
         destroy?: () => Promise<any>;
     };
+    requestOptions?: {
+        list?: any;
+        get?: any;
+        update?: any;
+        create?: any;
+        destroy?: any;
+    };
     overrideData?: {
         list?: any;
         get?: any;

package/es/components/dataSourceComponents/provider/dataSource/DataSourceProvider.js

@@ -24,6 +24,7 @@ var DataSourceProvider = function DataSourceProvider(props) {
     externalActions = props.actions,
     overrideData = props.overrideData,
     autoRun = props.autoRun,
+    requestOptions = props.requestOptions,
     __designMode = props.__designMode;
   useSetRequest();
   var _useVariables = useVariables(),
@@ -44,9 +45,9 @@ var DataSourceProvider = function DataSourceProvider(props) {
   var update = (externalActions === null || externalActions === void 0 ? void 0 : externalActions.update) || standardActions.update;
   var create = (externalActions === null || externalActions === void 0 ? void 0 : externalActions.create) || standardActions.create;
   var destroy = (externalActions === null || externalActions === void 0 ? void 0 : externalActions.destroy) || standardActions.destroy;
-  var listResult = useRequest(list, {
+  var listResult = useRequest(list, _objectSpread({
     manual: isBoolean(autoRun === null || autoRun === void 0 ? void 0 : autoRun.list) ? !(autoRun !== null && autoRun !== void 0 && autoRun.list) : true
-  });
+  }, requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.list));
   var getResult = useRequest(get, {
     manual: isBoolean(autoRun === null || autoRun === void 0 ? void 0 : autoRun.get) ? !(autoRun !== null && autoRun !== void 0 && autoRun.get) : true
   });

package/lib/components/dataSourceComponents/dataSourceForm/utils.js

@@ -403,7 +403,11 @@ var withFormItem = (WrappedComponent, overlayProps) => {
 var withDataSource = (WrappedComponent) => {
   return (props) => {
     const { dataSource } = props;
-    return /* @__PURE__ */ import_react.default.createElement(import_DataSourceProvider.default, { dataSource }, /* @__PURE__ */ import_react.default.createElement(WrappedComponent, { ...props }));
+    return /* @__PURE__ */ import_react.default.createElement(import_DataSourceProvider.default, { dataSource, requestOptions: {
+      list: {
+        cacheKey: `${dataSource == null ? void 0 : dataSource.headerDataSource}-${dataSource == null ? void 0 : dataSource.name}-${dataSource == null ? void 0 : dataSource.tableName}`
+      }
+    } }, /* @__PURE__ */ import_react.default.createElement(WrappedComponent, { ...props }));
   };
 };
 var withOptions = (WrappedComponent) => {
@@ -422,7 +426,7 @@ var withOptions = (WrappedComponent) => {
       if (optionSourceType === "api") {
         list.run({
           page: 1,
-          pageSize: 200,
+          pageSize: 500,
           ...extraParams
         });
       }
@@ -462,7 +466,7 @@ var renderValueWithMap = (value, valueMap, renderMode) => {
       },
       valueMap == null ? void 0 : valueMap[item]
     ), index < value.length - 1 && ", ")));
-  } else if ((0, import_utils.isString)(value)) {
+  } else if ((0, import_utils.isString)(value) || (0, import_utils.isNumber)(value)) {
     return /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-form-read-pretty-text" }, /* @__PURE__ */ import_react.default.createElement("span", { className: "pisell-form-read-pretty-value", style: textStyle }, (valueMap == null ? void 0 : valueMap[value]) || value));
   }
   return null;

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useColumns.js

@@ -39,9 +39,7 @@ var genFieldProps = (field, fieldProps) => {
     renderMode: "tableView",
     noStyle: true
   };
-  if (!field)
-    return props;
-  if (["Select", "Radio.Group", "Checkbox.Group"].includes(
+  if (field && ["Select", "Radio.Group", "Checkbox.Group"].includes(
     field.uiSchema["x-component"]
   ) && field.uiSchema.enum.length > 0) {
     if (["Radio.Group", "Checkbox.Group"].includes(field.uiSchema["x-component"])) {
@@ -76,7 +74,10 @@ var useColumns = ({
       const field = fieldMap[column == null ? void 0 : column.dataIndex];
       const title = (column == null ? void 0 : column.title) || (field == null ? void 0 : field.title);
       const FieldComponent = (0, import_fields.getFieldComponent)(column == null ? void 0 : column.fieldComponent) || "div";
-      const fieldProps = genFieldProps(field, (_a = column.other) == null ? void 0 : _a.fieldProps);
+      const fieldProps = genFieldProps(
+        field,
+        (_a = column.other) == null ? void 0 : _a.fieldProps
+      );
       return {
         ...column,
         title,

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -47,7 +47,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.js

@@ -207,6 +207,7 @@ var useTableProps = (props) => {
       return {
         ...button,
         ...buttonProps,
+        title: button.label,
         onClick: () => {
           if (actionType === "add") {
             let result = true;

package/lib/components/dataSourceComponents/fields/Select/index.d.ts

@@ -4,7 +4,6 @@ declare const SelectWithDataSource: (props: import("antd").SelectProps<any, impo
     optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
-    extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
 }) => React.JSX.Element;

package/lib/components/dataSourceComponents/fields/index.d.ts

@@ -38,7 +38,6 @@ declare const formFieldMap: {
         optionSourceType?: "default" | "custom" | "api" | undefined;
         labelField: string;
         valueField: string;
-        extraParams?: Record<string, any> | undefined;
     } & {
         dataSource?: any;
     }) => import("react").JSX.Element;
@@ -95,7 +94,6 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
-    extraParams?: Record<string, any> | undefined;
 } & {
     dataSource?: any;
 }) => import("react").JSX.Element) | import("react").FC<import("./TimePicker/type").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Upload/type").UploadProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;

package/lib/components/dataSourceComponents/hooks/useValueMap.js

@@ -29,7 +29,7 @@ var useValueMap = (options) => {
     return (options == null ? void 0 : options.reduce((acc, item) => {
       const itemValue = item.value;
       const itemLabel = item.label;
-      if ((0, import_utils.isString)(itemValue) && (0, import_utils.isString)(itemLabel)) {
+      if (((0, import_utils.isString)(itemValue) || (0, import_utils.isNumber)(itemValue)) && (0, import_utils.isString)(itemLabel)) {
         acc[itemValue] = itemLabel;
       }
       return acc;

package/lib/components/dataSourceComponents/provider/dataSource/DataSourceContext.d.ts

@@ -80,6 +80,13 @@ export declare type DataSourceContextProps = {
         create?: () => Promise<any>;
         destroy?: () => Promise<any>;
     };
+    requestOptions?: {
+        list?: any;
+        get?: any;
+        update?: any;
+        create?: any;
+        destroy?: any;
+    };
     overrideData?: {
         list?: any;
         get?: any;

package/lib/components/dataSourceComponents/provider/dataSource/DataSourceProvider.js

@@ -48,6 +48,7 @@ var DataSourceProvider = (props) => {
     actions: externalActions,
     overrideData,
     autoRun,
+    requestOptions,
     __designMode
   } = props;
   (0, import_useSetRequest.default)();
@@ -65,7 +66,8 @@ var DataSourceProvider = (props) => {
   const create = (externalActions == null ? void 0 : externalActions.create) || standardActions.create;
   const destroy = (externalActions == null ? void 0 : externalActions.destroy) || standardActions.destroy;
   const listResult = (0, import_ahooks.useRequest)(list, {
-    manual: (0, import_utils.isBoolean)(autoRun == null ? void 0 : autoRun.list) ? !(autoRun == null ? void 0 : autoRun.list) : true
+    manual: (0, import_utils.isBoolean)(autoRun == null ? void 0 : autoRun.list) ? !(autoRun == null ? void 0 : autoRun.list) : true,
+    ...requestOptions == null ? void 0 : requestOptions.list
   });
   const getResult = (0, import_ahooks.useRequest)(get, {
     manual: (0, import_utils.isBoolean)(autoRun == null ? void 0 : autoRun.get) ? !(autoRun == null ? void 0 : autoRun.get) : true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.631",
+  "version": "1.0.633",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,9 +70,9 @@
     "swiper": "^8.4.7",
     "react-barcode": "^1.5.3",
     "vod-js-sdk-v6": "^1.4.11",
+    "@pisell/utils": "1.0.43",
     "@pisell/date-picker": "1.0.115",
-    "@pisell/icon": "0.0.10",
-    "@pisell/utils": "1.0.43"
+    "@pisell/icon": "0.0.10"
   },
   "peerDependencies": {
     "react": "^18.0.0",