@pisell/materials 1.0.518 → 1.0.520

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

@@ -44,7 +44,8 @@ var import_locales = require("../../../locales");
 var useActions = ({
   dataSource: propsDataSource,
   currentValue: propsCurrentValue,
-  __designMode
+  __designMode,
+  extraParams: propsExtraParams
 } = {}) => {
   const { dataSource: ctxDataSource, __designMode: ctxDesignMode } = (0, import_useDataSource.default)();
   const { parseVariable } = (0, import_useVariables.default)();
@@ -68,6 +69,15 @@ var useActions = ({
   const currentRecord = (0, import_react.useMemo)(() => {
     return parseVariable == null ? void 0 : parseVariable(currentValue, {});
   }, [currentValue, parseVariable]);
+  const extraParams = (0, import_react.useMemo)(() => {
+    return Object.entries(propsExtraParams || {}).reduce((acc, [key, value]) => {
+      acc[key] = Object.entries(value || {}).reduce((acc2, [k, v]) => {
+        acc2[k] = parseVariable == null ? void 0 : parseVariable(v, {});
+        return acc2;
+      }, {});
+      return acc;
+    }, {});
+  }, [propsExtraParams, parseVariable]);
   const getParsedActions = (0, import_ahooks.useMemoizedFn)(() => {
     return parseActions(originalActions, { currentRecord });
   });
@@ -132,7 +142,12 @@ var useActions = ({
         const getApi = genCustomApi(actions == null ? void 0 : actions.get);
         return getApi({});
       }
-      return {};
+      const res = await (0, import_serve.getNocobaseData)({
+        key: name || "",
+        query: extraParams == null ? void 0 : extraParams.get,
+        headers: getHeaders()
+      });
+      return (res == null ? void 0 : res.data) || {};
     } else if (currentValue) {
       return parseVariable == null ? void 0 : parseVariable(currentValue, {});
     }
@@ -151,7 +166,7 @@ var useActions = ({
       const updateApi = genCustomApi(actions == null ? void 0 : actions.update);
       return updateApi(formatCreateUpdateParams(values));
     } else {
-      const id = values == null ? void 0 : values.id;
+      const id = (extraParams == null ? void 0 : extraParams.filterByTk) || (values == null ? void 0 : values.id);
       if (!id || !name) {
         (0, import_pisellToast.default)({
           content: (0, import_locales.getText)("pisell-action-get-data")
@@ -160,9 +175,9 @@ var useActions = ({
       }
       return (0, import_serve.updateNocobaseData)({
         key: name,
-        id,
         data: formatCreateUpdateParams(values),
-        headers: getHeaders()
+        headers: getHeaders(),
+        query: { filterByTk: id, ...extraParams == null ? void 0 : extraParams.update }
       });
     }
   });

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

@@ -88,6 +88,13 @@ export declare type DataSourceContextProps = {
         list?: boolean;
         get?: boolean;
     };
+    extraParams?: {
+        list?: Record<string, any>;
+        get?: Record<string, any>;
+        update?: Record<string, any>;
+        create?: Record<string, any>;
+        destroy?: Record<string, any>;
+    };
     __id?: string;
     __designMode?: string;
 };

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

@@ -44,6 +44,7 @@ var DataSourceProvider = (props) => {
     children,
     dataSource: propsDataSource,
     currentValue,
+    extraParams,
     actions: externalActions,
     overrideData,
     autoRun,
@@ -55,7 +56,8 @@ var DataSourceProvider = (props) => {
   const standardActions = (0, import_useActions.default)({
     dataSource,
     currentValue,
-    __designMode
+    __designMode,
+    extraParams
   });
   const list = (externalActions == null ? void 0 : externalActions.list) || standardActions.list;
   const get = (externalActions == null ? void 0 : externalActions.get) || standardActions.get;

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

@@ -35,6 +35,7 @@ module.exports = __toCommonJS(VariablesProvider_exports);
 var import_react = __toESM(require("react"));
 var import_utils = require("@pisell/utils");
 var import_ahooks = require("ahooks");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var import_VariablesContext = __toESM(require("./VariablesContext"));
 var import_utils2 = require("../../dataSourceForm/utils");
 var import_utils3 = require("../../../../utils");
@@ -46,9 +47,54 @@ var defaultCustomizer = (objValue, srcValue) => {
 };
 var VARIABLE_PATTERN = /{{([^}]+)}}/g;
 var VariablesProvider = (props) => {
+  var _a;
   const { children, variables } = props;
-  const variablesRef = (0, import_react.useRef)(variables || {});
+  const context = (0, import_useEngineContext.default)();
+  const { getApp } = ((_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) || {};
+  const initialQuery = (0, import_react.useMemo)(() => {
+    var _a2, _b, _c;
+    const currentLocation = (_c = (_b = (_a2 = getApp == null ? void 0 : getApp()) == null ? void 0 : _a2.history) == null ? void 0 : _b.instance) == null ? void 0 : _c.location;
+    if (currentLocation == null ? void 0 : currentLocation.search) {
+      const searchParams = new URLSearchParams(currentLocation.search);
+      const query = {};
+      searchParams.forEach((value2, key) => {
+        query[key] = value2;
+      });
+      return query;
+    }
+    return {};
+  }, []);
+  const variablesRef = (0, import_react.useRef)(
+    (0, import_utils3.mergeWith)(
+      variables,
+      {
+        global: {
+          query: initialQuery
+        }
+      },
+      defaultCustomizer
+    )
+  );
   const listenersRef = (0, import_react.useRef)(/* @__PURE__ */ new Set());
+  const setQueryVariable = (0, import_ahooks.useMemoizedFn)((search) => {
+    const searchParams = new URLSearchParams(search);
+    const query = {};
+    searchParams.forEach((value2, key) => {
+      query[key] = value2;
+    });
+    registerVariable({
+      global: query
+    });
+  });
+  (0, import_react.useEffect)(() => {
+    var _a2, _b, _c;
+    const unlisten = (_c = (_b = (_a2 = getApp == null ? void 0 : getApp()) == null ? void 0 : _a2.history) == null ? void 0 : _b.instance) == null ? void 0 : _c.listen((location) => {
+      setQueryVariable(location.search);
+    });
+    return () => {
+      unlisten == null ? void 0 : unlisten();
+    };
+  }, []);
   const registerVariable = (0, import_ahooks.useMemoizedFn)((value2) => {
     variablesRef.current = (0, import_utils3.mergeWith)(
       variablesRef.current,
@@ -82,11 +128,11 @@ var VariablesProvider = (props) => {
   );
   const parseVariable = (0, import_ahooks.useMemoizedFn)(
     (str, localVariables = {}) => {
-      var _a;
+      var _a2;
       if (!(0, import_utils.isString)(str)) {
         return str;
       }
-      if (((_a = str.match(VARIABLE_PATTERN)) == null ? void 0 : _a[0]) === str) {
+      if (((_a2 = str.match(VARIABLE_PATTERN)) == null ? void 0 : _a2[0]) === str) {
         const key = (0, import_utils4.getVariableKey)(str);
         if (!key)
           return str;

package/lib/components/profileMenu/index.js

@@ -65,6 +65,7 @@ var ProfileMenu = ({
   const renderAvatar = (avatarProps) => /* @__PURE__ */ import_react.default.createElement(
     import_pisellAvatar.default,
     {
+      style: { margin: "0 6px" },
       size: "md",
       src: (avatarProps == null ? void 0 : avatarProps.src) || "",
       alt: (avatarProps == null ? void 0 : avatarProps.alt) || "",

package/lowcode/data-source-form/meta.ts

@@ -261,6 +261,58 @@ const dataSourceForm: MetaType = {
             },
           },
         },
+        {
+          type: 'group',
+          title: '额外参数',
+          display: 'entry',
+          items: [
+            // {
+            //   name: 'extraParams.list',
+            //   title: {
+            //     type: 'i18n',
+            //     'en-US': 'List Params',
+            //     'zh-CN': '列表参数',
+            //   },
+            //   setter: 'StringSetter'
+            // },
+            {
+              name: 'extraParams.get',
+              title: {
+                type: 'i18n',
+                'en-US': 'Get Params',
+                'zh-CN': '获取参数',
+              },
+              setter: 'JsonSetter'
+            },
+            {
+              name: 'extraParams.update',
+              title: {
+                type: 'i18n',
+                'en-US': 'Update Params',
+                'zh-CN': '更新参数',
+              },
+              setter: 'JsonSetter'
+            },
+            // {
+            //   name: 'extraParams.create',
+            //   title: {
+            //     type: 'i18n',
+            //     'en-US': 'Create Params',
+            //     'zh-CN': '创建参数',
+            //   },
+            //   setter: 'StringSetter'
+            // },
+            // {
+            //   name: 'extraParams.destroy',
+            //   title: {
+            //     type: 'i18n',
+            //     'en-US': 'Destroy Params',
+            //     'zh-CN': '删除参数',
+            //   },
+            //   setter: 'StringSetter'
+            // }
+          ]
+        }
       ],
     },
     {

package/lowcode/data-source-form/utils.ts

@@ -227,10 +227,10 @@ export const createFormItemSchema = (
     } else {
       props.styleType = 'antd';
       props.showSearch = true;
-      props.isShowDropdown = true;
       props.optionFilterProp = 'label';
       if (props.mode === "multiple") {
         props.selectAll = true;
+        props.isShowDropdown = true;
       }
     }
     props.optionSourceType = 'default';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.518",
+  "version": "1.0.520",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",