@pisell/materials 1.0.472 → 1.0.473

package/lib/components/dataSourceComponents/fields/Input.Phone/index.js

@@ -0,0 +1,38 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/dataSourceComponents/fields/Input.Phone/index.tsx
+var Input_exports = {};
+__export(Input_exports, {
+  default: () => Input_default
+});
+module.exports = __toCommonJS(Input_exports);
+var import_utils = require("../../dataSourceForm/utils");
+var import_WithMode = __toESM(require("./WithMode"));
+var Phone = (0, import_utils.withFormItem)(import_WithMode.default);
+var Input_default = Phone;

package/lib/components/dataSourceComponents/fields/Input.Phone/type.d.ts

@@ -0,0 +1,5 @@
+import { InputProps as AntInputProps } from 'antd';
+import { ModeType } from "../../dataSourceForm/type";
+export interface InputProps extends AntInputProps {
+    renderMode: ModeType;
+}

package/lib/components/dataSourceComponents/fields/Input.Phone/type.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/dataSourceComponents/fields/Input.Phone/type.ts
+var type_exports = {};
+module.exports = __toCommonJS(type_exports);

package/lib/components/dataSourceComponents/fields/InputNumber/index.js

@@ -34,5 +34,9 @@ __export(InputNumber_exports, {
 module.exports = __toCommonJS(InputNumber_exports);
 var import_utils = require("../../dataSourceForm/utils");
 var import_WithMode = __toESM(require("./WithMode"));
-var InputNumber = (0, import_utils.withFormItem)(import_WithMode.default);
+var InputNumber = (0, import_utils.withFormItem)(import_WithMode.default, {
+  innerStyle: {
+    width: "100%"
+  }
+});
 var InputNumber_default = InputNumber;

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

@@ -1,7 +1,7 @@
 import React from 'react';
 declare const SelectWithDataSource: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: string | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
 } & {

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

@@ -1,23 +1,64 @@
 /// <reference types="react" />
+declare const formFieldMap: {
+    Checkbox: import("react").FC<{}> & {
+        Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+    } & {
+        Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+    };
+    ColorPicker: import("react").FC<import("antd").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    DatePicker: import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps>;
+    Input: import("react").FC<import("./Input/type").InputProps> & {
+        JSON: import("react").FC<any>;
+        Password: import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+        TextArea: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+        URL: import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+        Email: import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+        Phone: import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    };
+    Radio: import("react").FC<{}> & {
+        Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+    } & {
+        Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+    };
+    Select: (props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
+        options?: any;
+        optionSourceType?: "default" | "custom" | "api" | undefined;
+        labelField: string;
+        valueField: string;
+    } & {
+        dataSource?: any;
+    }) => import("react").JSX.Element;
+    InputNumber: import("react").FC<any>;
+    Percent: import("react").FC<any>;
+    TimePicker: import("react").FC<import("antd").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    'Input.JSON': import("react").FC<any>;
+    'Input.URL': import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    'Input.Password': import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    'Radio.Group': import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+    'Checkbox.Group': import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
+    DateRangePicker: import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+};
 declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
-}) | import("react").FC<import("antd").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<{}> & {
-    JSON: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+}) | import("react").FC<import("antd").ColorPickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<(import("antd").DatePickerProps & import("../dataSourceForm/utils").WithModeProps) & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | (import("react").FC<import("./Input/type").InputProps> & {
+    JSON: import("react").FC<any>;
     Password: import("react").FC<import("antd/es/input").PasswordProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     TextArea: import("react").FC<import("antd/es/input").TextAreaProps & import("react").RefAttributes<import("antd/es/input/TextArea").TextAreaRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     URL: import("react").FC<import("antd").InputProps & import("react").RefAttributes<import("antd").InputRef> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    Email: import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+    Phone: import("react").FC<import("antd").InputProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 }) | import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Radio/type").RadioGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 }) | ((props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
     options?: any;
-    optionSourceType?: string | undefined;
+    optionSourceType?: "default" | "custom" | "api" | undefined;
     labelField: string;
     valueField: string;
 } & {
     dataSource?: any;
-}) => import("react").JSX.Element) | import("react").FC<import("antd").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
-export { getFieldComponent };
+}) => import("react").JSX.Element) | import("react").FC<import("antd").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("./DateRangePicker/type").DateRangePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+export { getFieldComponent, formFieldMap };

package/lib/components/dataSourceComponents/fields/index.js

@@ -29,6 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/dataSourceComponents/fields/index.ts
 var fields_exports = {};
 __export(fields_exports, {
+  formFieldMap: () => formFieldMap,
   getFieldComponent: () => getFieldComponent
 });
 module.exports = __toCommonJS(fields_exports);
@@ -40,6 +41,7 @@ var import_Radio = __toESM(require("./Radio"));
 var import_Select = __toESM(require("./Select"));
 var import_InputNumber = __toESM(require("./InputNumber"));
 var import_TimePicker = __toESM(require("./TimePicker"));
+var import_DateRangePicker = __toESM(require("./DateRangePicker"));
 var formFieldMap = {
   Checkbox: import_Checkbox.default,
   ColorPicker: import_ColorPicker.default,
@@ -48,17 +50,20 @@ var formFieldMap = {
   Radio: import_Radio.default,
   Select: import_Select.default,
   InputNumber: import_InputNumber.default,
+  Percent: import_InputNumber.default,
   TimePicker: import_TimePicker.default,
   "Input.JSON": import_Input.default.JSON,
   "Input.URL": import_Input.default.URL,
   "Input.Password": import_Input.default.Password,
   "Radio.Group": import_Radio.default.Group,
-  "Checkbox.Group": import_Checkbox.default.Group
+  "Checkbox.Group": import_Checkbox.default.Group,
+  DateRangePicker: import_DateRangePicker.default
 };
 var getFieldComponent = (fieldComponent) => {
   return formFieldMap[fieldComponent];
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  formFieldMap,
   getFieldComponent
 });

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

@@ -0,0 +1,18 @@
+import { Field } from '../provider/dataSource/DataSourceContext';
+import { formFieldMap } from './index';
+export declare type FormFieldComponentType = keyof typeof formFieldMap;
+export declare type FilterFunctionReturnType = {
+    $eq?: any;
+    $includes?: string;
+    $in?: (string | number)[];
+    $anyOf?: (string | number)[];
+    $isTruly?: boolean;
+    $dateAfter?: string;
+    $dateBefore?: string;
+    $and?: Array<{
+        $dateAfter?: string;
+        $dateBefore?: string;
+    }>;
+};
+export declare type FilterFunction = (value: any, field: Field) => FilterFunctionReturnType | null;
+export declare type FormFieldFilterFuncMapType = Record<FormFieldComponentType, FilterFunction>;

package/lib/components/dataSourceComponents/fields/type.js

@@ -0,0 +1,17 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/dataSourceComponents/fields/type.ts
+var type_exports = {};
+module.exports = __toCommonJS(type_exports);

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

@@ -0,0 +1,3 @@
+import { FormFieldFilterFuncMapType } from './type';
+declare const formFieldFilterFuncMap: FormFieldFilterFuncMapType;
+export { formFieldFilterFuncMap };

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

@@ -0,0 +1,134 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/dataSourceComponents/fields/utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  formFieldFilterFuncMap: () => formFieldFilterFuncMap
+});
+module.exports = __toCommonJS(utils_exports);
+var import_utils = require("@pisell/utils");
+var formFieldFilterFuncMap = {
+  Checkbox: (value) => {
+    const key = value ? "$isTruly" : "$isFalsy";
+    return {
+      [key]: true
+    };
+  },
+  ColorPicker: (value) => {
+    return {
+      $eq: value
+    };
+  },
+  DatePicker: (value) => {
+    const [start, end] = value;
+    if (!start || !end) {
+      return null;
+    }
+    const startDate = (0, import_utils.isString)(start) ? start : start.format("YYYY-MM-DD HH:mm:ss");
+    const endDate = (0, import_utils.isString)(end) ? end : end.format("YYYY-MM-DD HH:mm:ss");
+    return {
+      $and: [
+        {
+          $dateAfter: startDate
+        },
+        {
+          $dateBefore: endDate
+        }
+      ]
+    };
+  },
+  Input: (value) => {
+    return {
+      $includes: value
+    };
+  },
+  Radio: (value) => {
+    return {
+      $eq: value
+    };
+  },
+  Select: (value, field) => {
+    const key = field.type === "string" ? "$in" : "$anyOf";
+    const formatValue = Array.isArray(value) ? value : [value];
+    return {
+      [key]: formatValue
+    };
+  },
+  Percent: (value) => {
+    return {
+      $eq: value
+    };
+  },
+  InputNumber: (value) => {
+    return {
+      $eq: value
+    };
+  },
+  TimePicker: (value) => {
+    return {
+      $eq: value
+    };
+  },
+  "Input.JSON": (value) => {
+    return {
+      $includes: value
+    };
+  },
+  "Input.URL": (value) => {
+    return {
+      $includes: value
+    };
+  },
+  "Input.Password": (value) => {
+    return {
+      $includes: value
+    };
+  },
+  DateRangePicker: (value) => {
+    const [start, end] = value;
+    const startDate = (0, import_utils.isString)(start) ? start : start.format("YYYY-MM-DD HH:mm:ss");
+    const endDate = (0, import_utils.isString)(end) ? end : end.format("YYYY-MM-DD HH:mm:ss");
+    return {
+      $and: [
+        {
+          $dateAfter: startDate
+        },
+        {
+          $dateBefore: endDate
+        }
+      ]
+    };
+  },
+  "Radio.Group": (value) => {
+    const formatValue = Array.isArray(value) ? value : [value];
+    return {
+      $in: formatValue
+    };
+  },
+  "Checkbox.Group": (value) => {
+    const formatValue = Array.isArray(value) ? value : [value];
+    return {
+      $anyOf: formatValue
+    };
+  }
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formFieldFilterFuncMap
+});

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

@@ -47,16 +47,20 @@ var useActions = ({
   const { parseVariable } = (0, import_useVariables.default)();
   const { parseActions } = (0, import_useParseActionsVariable.default)();
   const currentDataSource = propsDataSource || ctxDataSource;
-  const currentValue = propsCurrentValue;
+  const currentValue = propsCurrentValue || "server";
   const {
     isCustomApi,
     actions: originalActions,
     options,
     headerDataSource,
     name,
-    dataSourceKey
+    dataSourceKey,
+    fields
   } = currentDataSource || {};
-  const { formatListResult, formatListParams } = (0, import_useFormat.default)({ dataSourceKey });
+  const { formatListResult, formatListParams } = (0, import_useFormat.default)({
+    dataSourceKey: dataSourceKey || "",
+    fields: fields || []
+  });
   const getParsedActions = (0, import_ahooks.useMemoizedFn)(() => {
     return parseActions(originalActions, {});
   });
@@ -93,6 +97,8 @@ var useActions = ({
       const createApi = genCustomApi(actions == null ? void 0 : actions.create);
       return createApi(values);
     } else {
+      if (!name)
+        return {};
       return (0, import_serve.createNocobaseData)({
         key: name,
         data: values,
@@ -126,14 +132,15 @@ var useActions = ({
       return updateApi(values);
     } else {
       const id = values == null ? void 0 : values.id;
-      if (!id) {
+      if (!id || !name) {
         import_antd.message.error("请先获取数据");
         return Promise.reject();
       }
       return (0, import_serve.updateNocobaseData)({
         key: name,
         id,
-        data: values
+        data: values,
+        headers: getHeaders()
       });
     }
   });
@@ -168,6 +175,8 @@ var useActions = ({
       const deleteApi = genCustomApi(actions == null ? void 0 : actions.destroy);
       return deleteApi({});
     }
+    if (!name)
+      return;
     return (0, import_serve.deleteNocobaseData)(name, id, getHeaders());
   });
   return {

package/lib/components/dataSourceComponents/hooks/useComponentId.d.ts

@@ -0,0 +1,2 @@
+declare const useComponentId: (props: Record<string, any>) => any;
+export default useComponentId;

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

@@ -0,0 +1,32 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/components/dataSourceComponents/hooks/useComponentId.ts
+var useComponentId_exports = {};
+__export(useComponentId_exports, {
+  default: () => useComponentId_default
+});
+module.exports = __toCommonJS(useComponentId_exports);
+var import_react = require("react");
+var useComponentId = (props) => {
+  const { __id, componentId } = props;
+  return (0, import_react.useMemo)(() => {
+    return __id || componentId;
+  }, [__id, componentId]);
+};
+var useComponentId_default = useComponentId;

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

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { Result } from 'ahooks/es/useRequest/src/types';
 import { ActionsItem } from '../../dataSourceForm/serve';
-interface Field {
+export interface Field {
     name: string;
     type: string;
     allowNull: boolean;
@@ -57,6 +57,7 @@ export declare type DataSourceType = {
     introspected: boolean;
     isCustomApi: boolean;
     key: string;
+    tableName: string;
     logging: boolean;
     name: string;
     title: string;
@@ -72,9 +73,25 @@ export declare type DataSourceContextProps = {
     dataSource: DataSourceType;
     children?: React.ReactNode;
     currentValue?: string;
+    actions?: {
+        list?: () => Promise<any>;
+        get?: () => Promise<any>;
+        update?: () => Promise<any>;
+        create?: () => Promise<any>;
+        destroy?: () => Promise<any>;
+    };
+    overrideData?: {
+        list?: any;
+        get?: any;
+    };
+    autoRun?: {
+        list?: boolean;
+        get?: boolean;
+    };
+    __id?: string;
 };
 export interface DataSourceContextType {
-    dataSource: DataSourceType;
+    dataSource?: DataSourceType;
     list: Result<any, any>;
     destroy: Result<any, any>;
     get: Result<any, any>;

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

@@ -2,7 +2,7 @@ import React from 'react';
 import { DataSourceContextProps } from './DataSourceContext';
 /**
  * @title: DataSource Provider
- * @description: 提供页面配置的数据源
+ * @description: 提供页面配置的数据源，支持外部传入Promise接口、自动调用配置和直接数据
  */
 declare const DataSourceProvider: React.FC<DataSourceContextProps>;
 export default DataSourceProvider;

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

@@ -38,29 +38,35 @@ var import_utils = require("@pisell/utils");
 var import_DataSourceContext = __toESM(require("./DataSourceContext"));
 var import_useActions = __toESM(require("../../hooks/useActions"));
 var import_useVariables = __toESM(require("../../hooks/useVariables"));
-var import_useDataSource = __toESM(require("../../hooks/useDataSource"));
 var import_useSetRequest = __toESM(require("../../../../hooks/useSetRequest"));
 var DataSourceProvider = (props) => {
-  const { children, dataSource: propsDataSource, currentValue } = props;
+  const {
+    children,
+    dataSource: propsDataSource,
+    currentValue,
+    actions: externalActions,
+    overrideData,
+    autoRun
+  } = props;
   (0, import_useSetRequest.default)();
   const { parseVariable } = (0, import_useVariables.default)();
-  const { dataSource: ctxDataSource } = (0, import_useDataSource.default)();
-  const dataSource = (0, import_utils.isString)(propsDataSource) ? parseVariable == null ? void 0 : parseVariable(propsDataSource, {
-    global: {
-      currentDataSource: ctxDataSource
-    }
-  }) : propsDataSource;
-  const { list, get, update, create, destroy } = (0, import_useActions.default)({
+  const dataSource = (0, import_utils.isString)(propsDataSource) ? parseVariable == null ? void 0 : parseVariable(propsDataSource) : propsDataSource;
+  const standardActions = (0, import_useActions.default)({
     dataSource,
     currentValue
   });
+  const list = (externalActions == null ? void 0 : externalActions.list) || standardActions.list;
+  const get = (externalActions == null ? void 0 : externalActions.get) || standardActions.get;
+  const update = (externalActions == null ? void 0 : externalActions.update) || standardActions.update;
+  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: true
-  });
-  const destroyResult = (0, import_ahooks.useRequest)(destroy, {
-    manual: true
+    manual: (0, import_utils.isBoolean)(autoRun == null ? void 0 : autoRun.list) ? !(autoRun == null ? void 0 : autoRun.list) : true
   });
   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
+  });
+  const destroyResult = (0, import_ahooks.useRequest)(destroy, {
     manual: true
   });
   const updateResult = (0, import_ahooks.useRequest)(update, {
@@ -72,9 +78,15 @@ var DataSourceProvider = (props) => {
   const value = (0, import_react.useMemo)(() => {
     return {
       dataSource,
-      list: listResult,
+      list: {
+        ...listResult,
+        data: (overrideData == null ? void 0 : overrideData.list) || listResult.data
+      },
+      get: {
+        ...getResult,
+        data: (overrideData == null ? void 0 : overrideData.get) || getResult.data
+      },
       destroy: destroyResult,
-      get: getResult,
       update: updateResult,
       create: createResult
     };
@@ -84,7 +96,8 @@ var DataSourceProvider = (props) => {
     destroyResult,
     getResult,
     updateResult,
-    createResult
+    createResult,
+    overrideData
   ]);
   return /* @__PURE__ */ import_react.default.createElement(import_DataSourceContext.default.Provider, { value }, children);
 };

package/lib/components/dataSourceComponents/provider/variables/VariablesContext.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="react" />
 export interface VariablesContextType {
+    children?: React.ReactNode;
     variables?: Record<string, any>;
     registerVariable?: (value: Record<string, any>) => void;
+    parseVariable?: (str: string, localVariables?: Record<string, any>) => any;
     registerValueVariable?: (componentId: string, value: Record<string, any>) => void;
     registerFunctionVariable?: (componentId: string, value: Record<string, any>) => void;
-    parseVariable?: (str: string, localVariables: Record<string, any>) => any;
-    children?: React.ReactNode;
+    subscribeVariables?: (listener: (allVariables: Record<string, any>, updateVariables: Record<string, any>) => void) => () => void;
 }
 export declare const VariablesContext: import("react").Context<VariablesContextType>;
 export default VariablesContext;