@pisell/materials 1.0.454 → 1.0.456

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

@@ -37,9 +37,12 @@ var import_utils = require("@pisell/utils");
 var import_useDataSource = __toESM(require("../hooks/useDataSource"));
 var import_useFormSetting = __toESM(require("./provider/hooks/useFormSetting"));
 var import_form = __toESM(require("../../form"));
+var import_useJsonPrefixPath = __toESM(require("./provider/hooks/useJsonPrefixPath"));
+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 { dataSource } = (0, import_useDataSource.default)();
   const fields = dataSource == null ? void 0 : dataSource.fields;
   const { mode: globalMode } = (0, import_useFormSetting.default)();
@@ -54,6 +57,7 @@ var FormItem = (props) => {
     }
     return children;
   }, [children, effectiveMode]);
-  return /* @__PURE__ */ import_react.default.createElement(import_form.default.Item, { name, label, ...other }, renderChildren);
+  const concatName = name !== void 0 ? [...prefixPath, ...(0, import_utils2.toArr)(name)] : void 0;
+  return /* @__PURE__ */ import_react.default.createElement(import_form.default.Item, { name: concatName, label, ...other }, renderChildren);
 };
 var formItem_default = FormItem;

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

@@ -33,70 +33,14 @@ __export(dataSourceForm_exports, {
 });
 module.exports = __toCommonJS(dataSourceForm_exports);
 var import_react = __toESM(require("react"));
-var import_classnames = __toESM(require("classnames"));
 var import_DataSourceProvider = __toESM(require("../provider/fields/DataSourceProvider"));
 var import_form = __toESM(require("../../form"));
-var import_FormSettingProvider = __toESM(require("./provider/formSetting/FormSettingProvider"));
-var import_useActions = __toESM(require("../hooks/useActions"));
-var import_useSetRequest = __toESM(require("../../../hooks/useSetRequest"));
+var import_BaseForm = __toESM(require("./BaseForm"));
 var import_index = require("./index.less");
 var DataSourceForm = (0, import_react.forwardRef)(
   (props, ref) => {
-    const {
-      title,
-      description,
-      dataSource,
-      showTitle,
-      showDescription,
-      groupInfoPosition,
-      variables,
-      mode,
-      children,
-      currentValue,
-      className,
-      ...others
-    } = props;
-    (0, import_useSetRequest.default)();
-    const formRef = (0, import_react.useRef)(null);
-    const { get } = (0, import_useActions.default)({
-      currentValue,
-      dataSource
-    });
-    (0, import_react.useEffect)(() => {
-      var _a;
-      (_a = formRef.current) == null ? void 0 : _a.resetFields();
-    }, [dataSource]);
-    (0, import_react.useEffect)(() => {
-      document.body.id = "body";
-    }, []);
-    (0, import_react.useImperativeHandle)(ref, () => formRef.current);
-    (0, import_react.useEffect)(() => {
-      if (["edit", "view"].includes(mode || "") && dataSource) {
-        get().then((res) => {
-          var _a;
-          (_a = formRef.current) == null ? void 0 : _a.setFieldsValue(res);
-        });
-      }
-    }, [get, mode, dataSource]);
-    return /* @__PURE__ */ import_react.default.createElement(
-      import_FormSettingProvider.default,
-      {
-        mode,
-        groupInfoPosition,
-        currentValue
-      },
-      /* @__PURE__ */ import_react.default.createElement(import_DataSourceProvider.default, { dataSource }, /* @__PURE__ */ import_react.default.createElement(
-        import_form.default,
-        {
-          ...others,
-          className: (0, import_classnames.default)("pisell-lowcode-data-source-form", className),
-          ref: formRef,
-          preserve: true
-        },
-        (title || description) && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-data-source-form-header" }, showTitle && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-data-source-form-title" }, title), showDescription && /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode-data-source-form-description" }, description)),
-        children
-      ))
-    );
+    const { dataSource, currentValue } = props;
+    return /* @__PURE__ */ import_react.default.createElement(import_DataSourceProvider.default, { dataSource, currentValue }, /* @__PURE__ */ import_react.default.createElement(import_BaseForm.default, { ...props, ref }));
   }
 );
 DataSourceForm.List = import_form.default.List;

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

@@ -0,0 +1,2 @@
+declare const useJsonPrefixPath: () => (string | number)[];
+export default useJsonPrefixPath;

package/lib/components/dataSourceComponents/dataSourceForm/provider/hooks/useJsonPrefixPath.js

@@ -0,0 +1,41 @@
+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/dataSourceForm/provider/hooks/useJsonPrefixPath.ts
+var useJsonPrefixPath_exports = {};
+__export(useJsonPrefixPath_exports, {
+  default: () => useJsonPrefixPath_default
+});
+module.exports = __toCommonJS(useJsonPrefixPath_exports);
+var import_react = require("react");
+var import_JsonWrapperContext = __toESM(require("../jsonWrapper/JsonWrapperContext"));
+var useJsonPrefixPath = () => {
+  const prefixPath = (0, import_react.useContext)(import_JsonWrapperContext.default);
+  return prefixPath;
+};
+var useJsonPrefixPath_default = useJsonPrefixPath;

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

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

package/lib/components/{table/Actions/component/ExportImport/utils/index.js → dataSourceComponents/dataSourceForm/provider/jsonWrapper/JsonWrapperContext.js}

@@ -16,16 +16,12 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/components/table/Actions/component/ExportImport/utils/index.ts
-var utils_exports = {};
-__export(utils_exports, {
-  formatApiUrl: () => formatApiUrl
-});
-module.exports = __toCommonJS(utils_exports);
-var formatApiUrl = (url) => {
-  return url || "/shop/form/data";
-};
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  formatApiUrl
+// src/components/dataSourceComponents/dataSourceForm/provider/jsonWrapper/JsonWrapperContext.ts
+var JsonWrapperContext_exports = {};
+__export(JsonWrapperContext_exports, {
+  default: () => JsonWrapperContext_default
 });
+module.exports = __toCommonJS(JsonWrapperContext_exports);
+var import_react = require("react");
+var JsonWrapperContext = (0, import_react.createContext)([]);
+var JsonWrapperContext_default = JsonWrapperContext;

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

@@ -0,0 +1,7 @@
+import React from 'react';
+export interface JsonWrapperProps {
+    prefix: string | number | (string | number)[];
+    name?: string;
+}
+declare const JsonWrapperProvider: React.FC<React.PropsWithChildren<JsonWrapperProps>>;
+export default JsonWrapperProvider;

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

@@ -0,0 +1,48 @@
+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/dataSourceForm/provider/jsonWrapper/JsonWrapperProvider.tsx
+var JsonWrapperProvider_exports = {};
+__export(JsonWrapperProvider_exports, {
+  default: () => JsonWrapperProvider_default
+});
+module.exports = __toCommonJS(JsonWrapperProvider_exports);
+var import_react = __toESM(require("react"));
+var import_formItem = __toESM(require("../../formItem"));
+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 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));
+};
+var JsonWrapperProvider_default = JsonWrapperProvider;

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

@@ -34,3 +34,4 @@ export declare const formItemNameReverse: (name: string) => string;
 export declare const withFormItem: <P extends object>(WrappedComponent: React.ComponentType<P>) => React.FC<P & WithFormItemProps>;
 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

@@ -33,6 +33,7 @@ __export(utils_exports, {
   formItemNameReverse: () => formItemNameReverse,
   getNestedValue: () => getNestedValue,
   renderValueWithMap: () => renderValueWithMap,
+  toArr: () => toArr,
   withFormItem: () => withFormItem,
   withMode: () => withMode
 });
@@ -43,6 +44,7 @@ var import_antd = require("antd");
 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 withMode = (FieldComponent, ReadPrettyComponent, transformProps) => {
   return ({ renderMode = "edit", value, onChange, ...props }) => {
     const transformedProps = (transformProps == null ? void 0 : transformProps(
@@ -91,11 +93,15 @@ var withFormItem = (WrappedComponent) => {
     typeobj,
     maxobj,
     minobj,
+    normalize,
+    getValueProps,
+    validator,
     style,
     __designMode,
     ...otherProps
   }) => {
     var _a;
+    const prefixPath = (0, import_useJsonPrefixPath.default)();
     const { dataSource } = (0, import_useDataSource.default)();
     const { fields } = dataSource || {};
     const { mode: globalMode } = (0, import_useFormSetting.default)();
@@ -108,6 +114,7 @@ var withFormItem = (WrappedComponent) => {
     const isDesignMode = __designMode === "design";
     const isHidden = effectiveMode === "hidden";
     const name = (0, import_utils.isString)(propsName) && propsName.includes(".") ? [propsName] : propsName;
+    const concatName = name !== void 0 ? [...prefixPath, ...toArr(name)] : void 0;
     const rules = [];
     if (requiredobj && requiredobj.required) {
       rules.push(requiredobj);
@@ -136,13 +143,16 @@ var withFormItem = (WrappedComponent) => {
           ...style,
           opacity: isDesignMode && isHidden ? "0.3" : 1
         },
-        name,
+        name: concatName,
         label,
         tooltip,
         noStyle,
         extra,
         hidden: isHidden && !isDesignMode,
-        rules
+        rules,
+        normalize,
+        getValueProps,
+        validator
       },
       renderComponent
     );
@@ -166,12 +176,16 @@ var renderValueWithMap = (value, valueMap) => {
   }
   return null;
 };
+function toArr(str) {
+  return Array.isArray(str) ? str : [str];
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   formItemNameReplace,
   formItemNameReverse,
   getNestedValue,
   renderValueWithMap,
+  toArr,
   withFormItem,
   withMode
 });

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

@@ -0,0 +1,4 @@
+import React from 'react';
+import { DataSourceTableProps } from './type';
+declare const BaseTable: (props: DataSourceTableProps) => React.JSX.Element;
+export default BaseTable;

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

@@ -0,0 +1,181 @@
+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/dataSourceTable/BaseTable.tsx
+var BaseTable_exports = {};
+__export(BaseTable_exports, {
+  default: () => BaseTable_default
+});
+module.exports = __toCommonJS(BaseTable_exports);
+var import_react = __toESM(require("react"));
+var import_antd = require("antd");
+var import_table = __toESM(require("../../table"));
+var import_useVariables = __toESM(require("../hooks/useVariables"));
+var import_useColumns = __toESM(require("./hooks/useColumns"));
+var import_usePagination = __toESM(require("./hooks/usePagination"));
+var import_ActionsProvider = __toESM(require("../provider/actions/ActionsProvider"));
+var import_useDrawerState = __toESM(require("./hooks/useDrawerState"));
+var import_useDesignMode = __toESM(require("./hooks/useDesignMode"));
+var import_useTableQuery = __toESM(require("./hooks/useTableQuery"));
+var import_useSetRequest = __toESM(require("../../../hooks/useSetRequest"));
+var import_locales = require("../../../locales");
+var import_useDataSource = __toESM(require("../hooks/useDataSource"));
+var import_TableSettingProvider = __toESM(require("./provider/tableSetting/TableSettingProvider"));
+var DRAWER_TITLES = {
+  detail: (0, import_locales.getText)("pisell-data-source-table-detail"),
+  edit: (0, import_locales.getText)("pisell-data-source-table-edit"),
+  add: (0, import_locales.getText)("pisell-data-source-table-add")
+};
+var BaseTable = (props) => {
+  const {
+    columns: propsColumns,
+    dataSource,
+    detailContent,
+    editContent,
+    showDetailButton,
+    showEditButton,
+    showDeleteButton,
+    showAddButton,
+    addContent,
+    __designMode,
+    ...others
+  } = props;
+  (0, import_useSetRequest.default)();
+  const { registerVariable } = (0, import_useVariables.default)();
+  const { list, destroy } = (0, import_useDataSource.default)();
+  const { data } = list;
+  const {
+    drawerVisible,
+    setDrawerVisible,
+    drawerType,
+    openDrawer,
+    closeDrawer
+  } = (0, import_useDrawerState.default)();
+  const { queryPageConfig, handleValuesChange, refreshData } = (0, import_useTableQuery.default)();
+  (0, import_useDesignMode.default)(props, { registerVariable, openDrawer, closeDrawer, data: data == null ? void 0 : data.data });
+  (0, import_react.useEffect)(() => {
+    if (dataSource) {
+      list == null ? void 0 : list.run(queryPageConfig);
+    } else {
+      list == null ? void 0 : list.mutate([]);
+    }
+  }, [dataSource, list == null ? void 0 : list.run, queryPageConfig]);
+  const handleOpenDrawer = (record, type) => {
+    openDrawer(type);
+    registerVariable == null ? void 0 : registerVariable({
+      currentRecord: record
+    });
+  };
+  const handleCloseDrawer = () => {
+    closeDrawer();
+    registerVariable == null ? void 0 : registerVariable({
+      currentRecord: null
+    });
+  };
+  const handleDelete = async (record) => {
+    registerVariable == null ? void 0 : registerVariable({
+      currentRecord: record
+    });
+    setTimeout(async () => {
+      await (destroy == null ? void 0 : destroy.run(record.id));
+      refreshData();
+    });
+  };
+  const actionsColumns = (0, import_react.useMemo)(() => {
+    return [
+      {
+        title: "操作",
+        key: "actions",
+        showDetailButton,
+        showEditButton,
+        showDeleteButton,
+        render: (_, record) => {
+          return /* @__PURE__ */ import_react.default.createElement(import_antd.Space, null, showDetailButton && /* @__PURE__ */ import_react.default.createElement(
+            import_antd.Button,
+            {
+              onClick: () => handleOpenDrawer(record, "detail"),
+              type: "link"
+            },
+            (0, import_locales.getText)("pisell-data-source-table-detail")
+          ), showEditButton && /* @__PURE__ */ import_react.default.createElement(
+            import_antd.Button,
+            {
+              onClick: () => handleOpenDrawer(record, "edit"),
+              type: "link"
+            },
+            (0, import_locales.getText)("pisell-data-source-table-edit")
+          ), showDeleteButton && /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { onClick: () => handleDelete(record), type: "link", danger: true }, (0, import_locales.getText)("pisell-data-source-table-delete")));
+        }
+      }
+    ];
+  }, [showDetailButton, showEditButton, showDeleteButton]);
+  const columns = (0, import_useColumns.default)({
+    columns: propsColumns,
+    fields: dataSource == null ? void 0 : dataSource.fields,
+    // 操作列
+    actionsColumns
+  });
+  const pagination = (0, import_usePagination.default)({ data: data == null ? void 0 : data.data });
+  const getDrawerContent = (type) => {
+    const contentMap = {
+      detail: detailContent,
+      edit: editContent,
+      add: addContent
+    };
+    return contentMap[type];
+  };
+  return /* @__PURE__ */ import_react.default.createElement(import_TableSettingProvider.default, null, showAddButton && /* @__PURE__ */ import_react.default.createElement("div", { style: { marginBottom: 16 } }, /* @__PURE__ */ import_react.default.createElement(import_antd.Button, { type: "primary", onClick: () => handleOpenDrawer(null, "add") }, (0, import_locales.getText)("pisell-data-source-table-add"))), /* @__PURE__ */ import_react.default.createElement(
+    import_table.default,
+    {
+      ...others,
+      columns,
+      dataSource: (data == null ? void 0 : data.data) || [],
+      loading: list == null ? void 0 : list.loading,
+      onValuesChange: handleValuesChange,
+      pagination
+    }
+  ), /* @__PURE__ */ import_react.default.createElement(
+    import_ActionsProvider.default,
+    {
+      visible: drawerVisible,
+      setVisible: setDrawerVisible,
+      refreshTableData: refreshData
+    },
+    /* @__PURE__ */ import_react.default.createElement(
+      import_antd.Drawer,
+      {
+        title: DRAWER_TITLES[drawerType],
+        open: drawerVisible,
+        onClose: handleCloseDrawer,
+        destroyOnClose: true
+      },
+      getDrawerContent(drawerType)
+    )
+  ));
+};
+var BaseTable_default = BaseTable;

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

@@ -24,7 +24,7 @@ __export(useDesignMode_exports, {
 module.exports = __toCommonJS(useDesignMode_exports);
 var import_react = require("react");
 var useDesignMode = (props, { registerVariable, openDrawer, closeDrawer, data }) => {
-  const { __designMode, showDetailButton, showEditButton } = props;
+  const { __designMode, showDetailButton, showEditButton, showAddButton } = props;
   (0, import_react.useEffect)(() => {
     var _a;
     if (__designMode === "design") {
@@ -51,5 +51,17 @@ var useDesignMode = (props, { registerVariable, openDrawer, closeDrawer, data })
       }
     }
   }, [showEditButton, __designMode]);
+  (0, import_react.useEffect)(() => {
+    if (__designMode === "design") {
+      if (showAddButton) {
+        openDrawer("add");
+        registerVariable == null ? void 0 : registerVariable({
+          currentRecord: null
+        });
+      } else {
+        closeDrawer();
+      }
+    }
+  }, [showAddButton, __designMode]);
 };
 var useDesignMode_default = useDesignMode;