@pisell/materials 1.0.464 → 1.0.466

package/es/components/dataSourceComponents/provider/variables/utils.js

@@ -0,0 +1,19 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+// 生成组件的value变量
+export var genComponentValueVariable = function genComponentValueVariable(componentId, value) {
+  if (!value || !componentId) return {};
+  return _defineProperty({}, componentId, {
+    value: value
+  });
+};
+
+// 生成组件的函数变量
+export var genComponentFunctionVariable = function genComponentFunctionVariable(componentId, value) {
+  if (!value || !componentId) return {};
+  return _defineProperty({}, componentId, {
+    functions: value
+  });
+};

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

@@ -42,7 +42,7 @@ var import_utils2 = require("./utils");
 var FormItem = (props) => {
   var _a;
   const { children, name, label: propsLabel, mode: propsMode, ...other } = props;
-  const prefixPath = (0, import_useJsonPrefixPath.default)();
+  const { path: prefixPath = [] } = (0, import_useJsonPrefixPath.default)();
   const { dataSource } = (0, import_useDataSource.default)();
   const fields = dataSource == null ? void 0 : dataSource.fields;
   const { mode: globalMode } = (0, import_useFormSetting.default)();

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

@@ -33,7 +33,7 @@ __export(dataSourceForm_exports, {
 });
 module.exports = __toCommonJS(dataSourceForm_exports);
 var import_react = __toESM(require("react"));
-var import_DataSourceProvider = __toESM(require("../provider/fields/DataSourceProvider"));
+var import_DataSourceProvider = __toESM(require("../provider/dataSource/DataSourceProvider"));
 var import_form = __toESM(require("../../form"));
 var import_BaseForm = __toESM(require("./BaseForm"));
 var import_index = require("./index.less");

package/lib/components/dataSourceComponents/dataSourceForm/provider/hooks/useJsonPrefixPath.d.ts

@@ -1,2 +1,5 @@
-declare const useJsonPrefixPath: () => (string | number)[];
+declare const useJsonPrefixPath: () => {
+    path: (string | number)[];
+    level: number;
+};
 export default useJsonPrefixPath;

package/lib/components/dataSourceComponents/dataSourceForm/provider/jsonWrapper/JsonWrapperContext.d.ts

@@ -1,3 +1,6 @@
 /// <reference types="react" />
-declare const JsonWrapperContext: import("react").Context<(string | number)[]>;
+declare const JsonWrapperContext: import("react").Context<{
+    path: (string | number)[];
+    level: number;
+}>;
 export default JsonWrapperContext;

package/lib/components/dataSourceComponents/dataSourceForm/provider/jsonWrapper/JsonWrapperContext.js

@@ -23,5 +23,8 @@ __export(JsonWrapperContext_exports, {
 });
 module.exports = __toCommonJS(JsonWrapperContext_exports);
 var import_react = require("react");
-var JsonWrapperContext = (0, import_react.createContext)([]);
+var JsonWrapperContext = (0, import_react.createContext)({
+  path: [],
+  level: 0
+});
 var JsonWrapperContext_default = JsonWrapperContext;

package/lib/components/dataSourceComponents/dataSourceForm/provider/jsonWrapper/JsonWrapperProvider.js

@@ -38,11 +38,15 @@ var import_utils = require("../../utils");
 var import_JsonWrapperContext = __toESM(require("./JsonWrapperContext"));
 var JsonWrapperProvider = (props) => {
   const { children, prefix, label } = props;
-  const prefixPath = (0, import_react.useContext)(import_JsonWrapperContext.default);
+  const { path: prefixPath = [], level = 0 } = (0, import_react.useContext)(import_JsonWrapperContext.default) || {};
   const concatPath = (0, import_react.useMemo)(
     () => [...prefixPath, ...(0, import_utils.toArr)(prefix)],
     [prefixPath, prefix]
   );
-  return /* @__PURE__ */ import_react.default.createElement(import_JsonWrapperContext.default.Provider, { value: concatPath }, /* @__PURE__ */ import_react.default.createElement(import_formItem.default, { label }, children));
+  const contextValue = (0, import_react.useMemo)(() => ({
+    path: concatPath,
+    level: level + 1
+  }), [concatPath, level]);
+  return /* @__PURE__ */ import_react.default.createElement(import_JsonWrapperContext.default.Provider, { value: contextValue }, /* @__PURE__ */ import_react.default.createElement(import_formItem.default, { label, style: { paddingLeft: `${level * 12}px` } }, /* @__PURE__ */ import_react.default.createElement("div", { style: { paddingLeft: `${level * 12}px` } }, children)));
 };
 var JsonWrapperProvider_default = JsonWrapperProvider;

package/lib/components/dataSourceComponents/dataSourceForm/submitButton/index.js

@@ -101,11 +101,13 @@ var SubmitButton = (props) => {
   const validateFields = () => {
     return form.validateFields();
   };
-  const handleValideFieldsSubmit = async () => {
+  const handleValideFieldsSubmit = async (values) => {
     try {
       await validateFields();
-      const values = form.getFieldsValue(true);
-      console.log(values, "values");
+      const allValues = form.getFieldsValue(true);
+      if (allValues.id) {
+        values.id = allValues.id;
+      }
       await onSubmit(values);
       if (refreshData) {
         refreshTableData == null ? void 0 : refreshTableData();
@@ -125,7 +127,7 @@ var SubmitButton = (props) => {
     }
   };
   const onSubmitClick = async () => {
-    await validateFields();
+    const values = await validateFields();
     if (confirmConfig == null ? void 0 : confirmConfig.enable) {
       return import_pisellModal.default.confirm({
         title: confirmConfig.title,
@@ -133,11 +135,11 @@ var SubmitButton = (props) => {
         okText: confirmConfig.okText,
         cancelText: confirmConfig.cancelText,
         onOk: () => {
-          handleValideFieldsSubmit();
+          handleValideFieldsSubmit(values);
         }
       });
     }
-    handleValideFieldsSubmit();
+    handleValideFieldsSubmit(values);
   };
   if (status === "hidden" || mode === "view") {
     return null;

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { DataSourceType } from "../provider/fields/DataSourceContext";
+import { DataSourceType } from "../provider/dataSource/DataSourceContext";
 export declare type ModeType = 'edit' | 'add' | 'view' | 'disabled' | 'hidden';
 export interface DataSourceFormProps {
     title: string;

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

@@ -32,6 +32,15 @@ export declare const formItemNameReverse: (name: string) => string;
  * @Date: 2024-11-23 17:14:25
  */
 export declare const withFormItem: <P extends object>(WrappedComponent: React.ComponentType<P>) => React.FC<P & WithFormItemProps>;
+export declare const withDataSource: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
+    dataSource?: any;
+}) => React.JSX.Element;
+export declare const withOptions: <P extends unknown>(WrappedComponent: React.ComponentType<P>) => (props: P & {
+    options?: any;
+    optionSourceType?: string | undefined;
+    labelField: string;
+    valueField: string;
+}) => React.JSX.Element;
 export declare const getNestedValue: (obj: Record<string, any>, path: string) => Record<string, any>;
 export declare const renderValueWithMap: (value: any, valueMap?: Record<string, string>) => React.JSX.Element | null;
 export declare function toArr(str: string | number | (string | number)[]): (string | number)[];

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

@@ -34,8 +34,10 @@ __export(utils_exports, {
   getNestedValue: () => getNestedValue,
   renderValueWithMap: () => renderValueWithMap,
   toArr: () => toArr,
+  withDataSource: () => withDataSource,
   withFormItem: () => withFormItem,
-  withMode: () => withMode
+  withMode: () => withMode,
+  withOptions: () => withOptions
 });
 module.exports = __toCommonJS(utils_exports);
 var import_react = __toESM(require("react"));
@@ -45,6 +47,7 @@ var import_form = __toESM(require("../../form"));
 var import_useDataSource = __toESM(require("../hooks/useDataSource"));
 var import_useFormSetting = __toESM(require("./provider/hooks/useFormSetting"));
 var import_useJsonPrefixPath = __toESM(require("./provider/hooks/useJsonPrefixPath"));
+var import_DataSourceProvider = __toESM(require("../provider/dataSource/DataSourceProvider"));
 var withMode = (FieldComponent, ReadPrettyComponent, transformProps) => {
   return ({ renderMode = "edit", value, onChange, ...props }) => {
     const transformedProps = (transformProps == null ? void 0 : transformProps(
@@ -101,7 +104,7 @@ var withFormItem = (WrappedComponent) => {
     ...otherProps
   }) => {
     var _a;
-    const prefixPath = (0, import_useJsonPrefixPath.default)();
+    const { path: prefixPath = [] } = (0, import_useJsonPrefixPath.default)();
     const { dataSource } = (0, import_useDataSource.default)();
     const { fields } = dataSource || {};
     const { mode: globalMode } = (0, import_useFormSetting.default)();
@@ -158,6 +161,43 @@ var withFormItem = (WrappedComponent) => {
     );
   };
 };
+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 }));
+  };
+};
+var withOptions = (WrappedComponent) => {
+  return (props) => {
+    var _a;
+    const {
+      options: propsOptions,
+      optionSourceType,
+      labelField,
+      valueField
+    } = props;
+    const { list } = (0, import_useDataSource.default)();
+    (0, import_react.useEffect)(() => {
+      if (optionSourceType === "api") {
+        list.run({
+          page: 1,
+          pageSize: 200
+        });
+      }
+    }, []);
+    const options = (0, import_react.useMemo)(() => {
+      var _a2, _b;
+      if (optionSourceType !== "api") {
+        return propsOptions;
+      }
+      return ((_b = (_a2 = list.data) == null ? void 0 : _a2.data) == null ? void 0 : _b.map((item) => ({
+        label: item[labelField],
+        value: item[valueField]
+      }))) || [];
+    }, [propsOptions, optionSourceType, (_a = list == null ? void 0 : list.data) == null ? void 0 : _a.data]);
+    return /* @__PURE__ */ import_react.default.createElement(import_DataSourceProvider.default, { dataSource: options }, /* @__PURE__ */ import_react.default.createElement(WrappedComponent, { ...props, options }));
+  };
+};
 var getNestedValue = (obj, path) => {
   const keys = path.split(".");
   let value = obj;
@@ -186,6 +226,8 @@ function toArr(str) {
   getNestedValue,
   renderValueWithMap,
   toArr,
+  withDataSource,
   withFormItem,
-  withMode
+  withMode,
+  withOptions
 });

package/lib/components/dataSourceComponents/dataSourceTable/BaseTable.js

@@ -63,9 +63,10 @@ var BaseTable = (props) => {
     showAddButton,
     addContent,
     __designMode,
+    componentId,
     ...others
   } = props;
-  const { registerVariable } = (0, import_useVariables.default)();
+  const { registerValueVariable } = (0, import_useVariables.default)();
   const { list, destroy } = (0, import_useDataSource.default)();
   const { data } = list;
   const { dataSourceKey, dataSourceKeyRef } = (0, import_useDataSourceKey.default)();
@@ -78,7 +79,7 @@ var BaseTable = (props) => {
   } = (0, import_useDrawerState.default)();
   const { queryPageConfig, handleValuesChange, refreshData } = (0, import_useTableQuery.default)();
   (0, import_useDesignMode.default)(props, {
-    registerVariable,
+    registerValueVariable,
     openDrawer,
     closeDrawer,
     data: data == null ? void 0 : data.data
@@ -94,20 +95,20 @@ var BaseTable = (props) => {
     }
   }, [queryPageConfig]);
   const handleOpenDrawer = (record, type) => {
-    openDrawer(type);
-    registerVariable == null ? void 0 : registerVariable({
+    registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
       currentRecord: record
     });
+    openDrawer(type);
   };
   const handleCloseDrawer = () => {
     closeDrawer();
-    registerVariable == null ? void 0 : registerVariable({
+    registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
       currentRecord: null
     });
   };
   const handleDelete = async (record) => {
     try {
-      registerVariable == null ? void 0 : registerVariable({
+      registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
         currentRecord: record
       });
       setTimeout(async () => {

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

@@ -1,2 +1,2 @@
-declare const useDesignMode: (props: any, { registerVariable, openDrawer, closeDrawer, data }: any) => void;
+declare const useDesignMode: (props: any, { registerValueVariable, openDrawer, closeDrawer, data }: any) => void;
 export default useDesignMode;

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

@@ -23,14 +23,20 @@ __export(useDesignMode_exports, {
 });
 module.exports = __toCommonJS(useDesignMode_exports);
 var import_react = require("react");
-var useDesignMode = (props, { registerVariable, openDrawer, closeDrawer, data }) => {
-  const { __designMode, showDetailButton, showEditButton, showAddButton } = props;
+var useDesignMode = (props, { registerValueVariable, openDrawer, closeDrawer, data }) => {
+  const {
+    __designMode,
+    componentId,
+    showDetailButton,
+    showEditButton,
+    showAddButton
+  } = props;
   (0, import_react.useEffect)(() => {
     var _a;
     if (__designMode === "design") {
       if (showDetailButton) {
         openDrawer("detail");
-        registerVariable == null ? void 0 : registerVariable({
+        registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
           currentRecord: ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a[0]) || null
         });
       } else {
@@ -43,7 +49,7 @@ var useDesignMode = (props, { registerVariable, openDrawer, closeDrawer, data })
     if (__designMode === "design") {
       if (showEditButton) {
         openDrawer("edit");
-        registerVariable == null ? void 0 : registerVariable({
+        registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
           currentRecord: ((_a = data == null ? void 0 : data.data) == null ? void 0 : _a[0]) || null
         });
       } else {
@@ -55,7 +61,7 @@ var useDesignMode = (props, { registerVariable, openDrawer, closeDrawer, data })
     if (__designMode === "design") {
       if (showAddButton) {
         openDrawer("add");
-        registerVariable == null ? void 0 : registerVariable({
+        registerValueVariable == null ? void 0 : registerValueVariable(componentId, {
           currentRecord: null
         });
       } else {

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

@@ -34,7 +34,7 @@ __export(dataSourceTable_exports, {
 module.exports = __toCommonJS(dataSourceTable_exports);
 var import_react = __toESM(require("react"));
 var import_BaseTable = __toESM(require("./BaseTable"));
-var import_DataSourceProvider = __toESM(require("../provider/fields/DataSourceProvider"));
+var import_DataSourceProvider = __toESM(require("../provider/dataSource/DataSourceProvider"));
 var DataSourceTable = (props) => {
   const { dataSource } = props;
   return /* @__PURE__ */ import_react.default.createElement(import_DataSourceProvider.default, { dataSource }, /* @__PURE__ */ import_react.default.createElement(import_BaseTable.default, { ...props }));

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { ColumnType } from "antd/es/table";
-import { DataSourceType } from "../provider/fields/DataSourceContext";
+import { DataSourceType } from "../provider/dataSource/DataSourceContext";
 export interface DataSourceTableProps {
     dataSource: DataSourceType;
     columns: ColumnType<any>[];
@@ -12,4 +12,5 @@ export interface DataSourceTableProps {
     editContent?: React.ReactNode;
     addContent?: React.ReactNode;
     __designMode: string;
+    componentId: string;
 }

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

@@ -0,0 +1,6 @@
+import React from 'react';
+export interface DataSourceWrapperProps {
+    children: React.ReactNode;
+}
+declare const DataSourceWrapper: (props: DataSourceWrapperProps) => React.JSX.Element;
+export default DataSourceWrapper;

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

@@ -0,0 +1,40 @@
+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/dataSourceWrapper/index.tsx
+var dataSourceWrapper_exports = {};
+__export(dataSourceWrapper_exports, {
+  default: () => dataSourceWrapper_default
+});
+module.exports = __toCommonJS(dataSourceWrapper_exports);
+var import_react = __toESM(require("react"));
+var DataSourceWrapper = (props) => {
+  const { children } = props;
+  return /* @__PURE__ */ import_react.default.createElement("div", null, children);
+};
+var dataSourceWrapper_default = DataSourceWrapper;

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

@@ -36,5 +36,7 @@ var import_WithMode = __toESM(require("./WithMode"));
 var import_utils = require("../../dataSourceForm/utils");
 var Checkbox = (0, import_utils.withFormItem)(import_WithMode.default);
 var CheckboxGroupWithFormItem = (0, import_utils.withFormItem)(import_WithMode.default.Group);
-Checkbox.Group = CheckboxGroupWithFormItem;
+var CheckboxGroupWithOptions = (0, import_utils.withOptions)(CheckboxGroupWithFormItem);
+var CheckboxGroupWithDataSource = (0, import_utils.withDataSource)(CheckboxGroupWithOptions);
+Checkbox.Group = CheckboxGroupWithDataSource;
 var Checkbox_default = Checkbox;

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

@@ -36,5 +36,7 @@ var import_WithMode = __toESM(require("./WithMode"));
 var import_utils = require("../../dataSourceForm/utils");
 var Radio = (0, import_utils.withFormItem)(import_WithMode.default);
 var RadioGroupWithFormItem = (0, import_utils.withFormItem)(import_WithMode.default.Group);
-Radio.Group = RadioGroupWithFormItem;
+var RadioGroupWithOptions = (0, import_utils.withOptions)(RadioGroupWithFormItem);
+var RadioGroupWithDataSource = (0, import_utils.withDataSource)(RadioGroupWithOptions);
+Radio.Group = RadioGroupWithDataSource;
 var Radio_default = Radio;

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

@@ -1,3 +1,10 @@
 import React from 'react';
-declare const Select: React.FC<import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../../dataSourceForm/utils").WithModeProps & import("../../dataSourceForm/utils").WithFormItemProps>;
-export default Select;
+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;
+    labelField: string;
+    valueField: string;
+} & {
+    dataSource?: any;
+}) => React.JSX.Element;
+export default SelectWithDataSource;

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

@@ -34,5 +34,7 @@ __export(Select_exports, {
 module.exports = __toCommonJS(Select_exports);
 var import_utils = require("../../dataSourceForm/utils");
 var import_WithMode = __toESM(require("./WithMode"));
-var Select = (0, import_utils.withFormItem)(import_WithMode.default);
-var Select_default = Select;
+var SelectWithFormItem = (0, import_utils.withFormItem)(import_WithMode.default);
+var SelectWithOptions = (0, import_utils.withOptions)(SelectWithFormItem);
+var SelectWithDataSource = (0, import_utils.withDataSource)(SelectWithOptions);
+var Select_default = SelectWithDataSource;

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

@@ -12,5 +12,12 @@ declare const getFieldComponent: (fieldComponent: string) => 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>;
-}) | import("react").FC<import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps> | import("react").FC<import("antd").TimePickerProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
+}) | ((props: import("antd").SelectProps<any, import("antd/es/select").DefaultOptionType> & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps & {
+    options?: any;
+    optionSourceType?: string | 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 };

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

@@ -1,4 +1,4 @@
-import { DataSourceType } from '../provider/fields/DataSourceContext';
+import { DataSourceType } from '../provider/dataSource/DataSourceContext';
 export interface UseActionsParams {
     dataSource?: DataSourceType;
     currentValue?: 'server' | 'local';

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

@@ -110,10 +110,7 @@ var useActions = ({
         const getApi = genCustomApi(actions == null ? void 0 : actions.get);
         return getApi({});
       }
-      return (0, import_serve.getNocobaseData)({
-        key: name,
-        id: "1"
-      });
+      return {};
     } else if (currentValue) {
       return parseVariable == null ? void 0 : parseVariable(currentValue, {});
     }

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

@@ -1,5 +1,5 @@
 /**
  * 获取当前dataSource
  */
-declare const useDataSource: () => import("../provider/fields/DataSourceContext").DataSourceContextType;
+declare const useDataSource: () => import("../provider/dataSource/DataSourceContext").DataSourceContextType;
 export default useDataSource;

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

@@ -33,7 +33,7 @@ __export(useDataSource_exports, {
 });
 module.exports = __toCommonJS(useDataSource_exports);
 var import_react = require("react");
-var import_DataSourceContext = __toESM(require("../provider/fields/DataSourceContext"));
+var import_DataSourceContext = __toESM(require("../provider/dataSource/DataSourceContext"));
 var useDataSource = () => {
   const config = (0, import_react.useContext)(import_DataSourceContext.default);
   return config;

package/lib/components/dataSourceComponents/provider/{fields → dataSource}/DataSourceContext.js

@@ -16,7 +16,7 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/components/dataSourceComponents/provider/fields/DataSourceContext.ts
+// src/components/dataSourceComponents/provider/dataSource/DataSourceContext.ts
 var DataSourceContext_exports = {};
 __export(DataSourceContext_exports, {
   DataSourceContext: () => DataSourceContext,

package/lib/components/dataSourceComponents/provider/{fields → dataSource}/DataSourceProvider.js

@@ -26,7 +26,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/components/dataSourceComponents/provider/fields/DataSourceProvider.tsx
+// src/components/dataSourceComponents/provider/dataSource/DataSourceProvider.tsx
 var DataSourceProvider_exports = {};
 __export(DataSourceProvider_exports, {
   default: () => DataSourceProvider_default

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

@@ -2,6 +2,8 @@
 export interface VariablesContextType {
     variables?: Record<string, any>;
     registerVariable?: (value: Record<string, any>) => void;
+    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;
 }

package/lib/components/dataSourceComponents/provider/variables/VariablesContext.js

@@ -28,6 +28,10 @@ var initialContext = {
   variables: {},
   registerVariable: () => {
   },
+  registerValueVariable: () => {
+  },
+  registerFunctionVariable: () => {
+  },
   parseVariable: () => {
   }
 };

package/lib/components/dataSourceComponents/provider/variables/VariablesProvider.js

@@ -34,10 +34,11 @@ __export(VariablesProvider_exports, {
 module.exports = __toCommonJS(VariablesProvider_exports);
 var import_react = __toESM(require("react"));
 var import_utils = require("@pisell/utils");
+var import_ahooks = require("ahooks");
 var import_VariablesContext = __toESM(require("./VariablesContext"));
 var import_utils2 = require("../../dataSourceForm/utils");
 var import_utils3 = require("../../../../utils");
-var import_ahooks = require("ahooks");
+var import_utils4 = require("./utils");
 var defaultCustomizer = (objValue, srcValue) => {
   if ((0, import_utils.isArr)(srcValue)) {
     return srcValue;
@@ -63,7 +64,20 @@ var VariablesProvider = (props) => {
       value2,
       defaultCustomizer
     );
+    console.log("注册变量", value2, "全部变量", variablesRef.current);
   });
+  const registerValueVariable = (0, import_ahooks.useMemoizedFn)(
+    (componentId, value2) => {
+      const variable = (0, import_utils4.genComponentValueVariable)(componentId, value2);
+      registerVariable == null ? void 0 : registerVariable(variable);
+    }
+  );
+  const registerFunctionVariable = (0, import_ahooks.useMemoizedFn)(
+    (componentId, value2) => {
+      const variable = (0, import_utils4.genComponentFunctionVariable)(componentId, value2);
+      registerVariable == null ? void 0 : registerVariable(variable);
+    }
+  );
   const parseVariable = (0, import_ahooks.useMemoizedFn)(
     (str, localVariables = {}) => {
       var _a;
@@ -95,9 +109,16 @@ var VariablesProvider = (props) => {
     () => ({
       variables: variablesRef.current,
       registerVariable,
-      parseVariable
+      parseVariable,
+      registerValueVariable,
+      registerFunctionVariable
     }),
-    [registerVariable, parseVariable]
+    [
+      registerVariable,
+      parseVariable,
+      registerValueVariable,
+      registerFunctionVariable
+    ]
   );
   return /* @__PURE__ */ import_react.default.createElement(import_VariablesContext.default.Provider, { value }, children);
 };

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

@@ -0,0 +1,10 @@
+export declare const genComponentValueVariable: (componentId: string, value: Record<string, any>) => {
+    [x: string]: {
+        value: Record<string, any>;
+    };
+};
+export declare const genComponentFunctionVariable: (componentId: string, value: Record<string, any>) => {
+    [x: string]: {
+        functions: Record<string, any>;
+    };
+};