@pisell/materials 6.0.5 → 6.0.7

package/lib/components/dataSourceComponents/fields/Input.Url/ReadPretty.js

@@ -29,7 +29,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/dataSourceComponents/fields/Input.Url/ReadPretty.tsx
 var ReadPretty_exports = {};
 __export(ReadPretty_exports, {
-  default: () => ReadPretty_default
+  default: () => ReadPretty_default,
+  formatUrl: () => formatUrl
 });
 module.exports = __toCommonJS(ReadPretty_exports);
 var import_react = __toESM(require("react"));
@@ -37,17 +38,31 @@ var import_antd = require("antd");
 var import_classnames = __toESM(require("classnames"));
 var import_ReadPretty = require("./ReadPretty.less");
 var { Link } = import_antd.Typography;
+var formatUrl = (url) => {
+  if (!url)
+    return "";
+  if (url.startsWith("http://") || url.startsWith("https://")) {
+    return url;
+  }
+  return `https://${url}`;
+};
 var UrlReadPretty = (props) => {
   const { value, renderMode } = props;
+  const formattedUrl = formatUrl(value);
   return /* @__PURE__ */ import_react.default.createElement(
     Link,
     {
       className: (0, import_classnames.default)("pisell-url-read-pretty", {
         "pisell-url-read-pretty-table-view": renderMode === "tableView"
       }),
-      href: value
+      href: formattedUrl,
+      target: "_blank"
     },
     value
   );
 };
 var ReadPretty_default = UrlReadPretty;
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  formatUrl
+});

package/lib/components/dataSourceComponents/fields/Input.Url/ReadPretty.less

@@ -1,5 +1,5 @@
 .pisell-url-read-pretty {
-  color: var(--Gray-900, #101828);
+  //color: var(--Gray-900, #101828);
   font-size: 16px;
   font-weight: 600;
   line-height: 24px; /* 150% */

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

@@ -34,7 +34,11 @@ __export(Select_exports, {
 module.exports = __toCommonJS(Select_exports);
 var import_utils = require("../../dataSourceForm/utils");
 var import_WithMode = __toESM(require("./WithMode"));
-var SelectWithFormItem = (0, import_utils.withFormItem)(import_WithMode.default);
+var SelectWithFormItem = (0, import_utils.withFormItem)(import_WithMode.default, {
+  innerProps: {
+    getPopupContainer: (triggerNode) => triggerNode.parentElement
+  }
+});
 var SelectWithOptions = (0, import_utils.withOptions)(SelectWithFormItem);
 var SelectWithDataSource = (0, import_utils.withDataSource)(SelectWithOptions);
 var Select_default = SelectWithDataSource;

package/lib/components/dataSourceComponents/fields/Upload/serve.d.ts

@@ -8,7 +8,10 @@ export interface MediaType {
     maxsize: number;
 }
 export declare const useMediaConfig: () => {
-    data: any;
+    data: {
+        upload_onetime_limit: any;
+        upload_maxsize: any;
+    };
 };
 export declare const useMediaTypes: () => {
     data: MediaType[];

package/lib/components/dataSourceComponents/fields/Upload/serve.js

@@ -1,6 +1,8 @@
+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)
@@ -14,6 +16,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   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/Upload/serve.ts
@@ -27,6 +37,7 @@ module.exports = __toCommonJS(serve_exports);
 var import_ahooks = require("ahooks");
 var import_utils = require("./utils");
 var import_utils2 = require("../../../table/utils");
+var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var getMediaTypeList = async () => {
   const { data } = await import_utils2.request.getRequest().get(
     `/media_type:list`,
@@ -41,19 +52,16 @@ var getMediaTypeList = async () => {
   );
   return data;
 };
-var getMediaConfig = async () => {
-  const data = await import_utils2.request.getRequest().get(`/core/module/media/config`, {});
-  return data;
-};
 var useMediaConfig = () => {
-  const { data } = (0, import_ahooks.useRequest)(getMediaConfig, {
-    cacheKey: "media-config",
-    staleTime: 1e3 * 60 * 5,
-    // 5分钟后数据过期
-    cacheTime: 1e3 * 60 * 60
-    // 1小时后清除缓存
-  });
-  return { data };
+  var _a, _b, _c, _d, _e, _f, _g, _h;
+  const context = (0, import_useEngineContext.default)();
+  const data = (_h = (_g = (_f = (_e = (_d = (_c = (_b = (_a = context.appHelper.utils) == null ? void 0 : _a.getApp) == null ? void 0 : _b.call(_a)) == null ? void 0 : _c.data) == null ? void 0 : _d.store) == null ? void 0 : _e.getStore) == null ? void 0 : _f.call(_e)) == null ? void 0 : _g.getDataByModel) == null ? void 0 : _h.call(_g, "core", "core");
+  return {
+    data: {
+      upload_onetime_limit: data == null ? void 0 : data.media_upload_onetime_limit,
+      upload_maxsize: data == null ? void 0 : data.media_upload_maxsize
+    }
+  };
 };
 var useMediaTypes = () => {
   const { data } = (0, import_ahooks.useRequest)(getMediaTypeList, {

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

@@ -3,8 +3,9 @@ export interface UseActionsParams {
     dataSource?: DataSourceType;
     currentValue?: 'server' | 'local';
     __designMode?: string;
+    extraParams?: Record<string, any>;
 }
-declare const useActions: ({ dataSource: propsDataSource, currentValue: propsCurrentValue, __designMode, }?: UseActionsParams) => {
+declare const useActions: ({ dataSource: propsDataSource, currentValue: propsCurrentValue, __designMode, extraParams: propsExtraParams, }?: UseActionsParams) => {
     create: (values: Record<string, any>) => Promise<any>;
     get: () => Promise<any>;
     update: (values: Record<string, any>) => Promise<any>;

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 });
   });
@@ -88,7 +98,7 @@ var useActions = ({
           headers,
           body
         });
-        if (dataSourceKey === "mypisell-api") {
+        if (["pisell2-api", "mypisell-api"].includes(dataSourceKey)) {
           return result.data;
         }
         return result;
@@ -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 }
       });
     }
   });
@@ -182,7 +197,10 @@ var useActions = ({
       return formatListResult(
         await (0, import_serve.getNocobaseDataList)({
           key: name,
-          params: formatParams,
+          params: {
+            ...formatParams,
+            ...(extraParams == null ? void 0 : extraParams.list) || {}
+          },
           headers: getHeaders()
         })
       );

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,14 +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)({});
+  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)(() => {
-    if (variables) {
-      variablesRef.current = variables;
-    }
-  }, [variables]);
+    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,
@@ -87,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/login-and-register/index.d.ts

@@ -0,0 +1,82 @@
+import React from 'react';
+import './index.less';
+/**
+ * loginAndRegister组件的属性接口
+ */
+export interface loginAndRegisterProps {
+    /** Logo相关配置 */
+    showLogo?: boolean;
+    logo?: string;
+    logoPosition?: 'left' | 'center' | 'right';
+    logoSize?: {
+        width?: number;
+        height?: number;
+    };
+    /** 标题相关配置 */
+    title?: string;
+    showTitle?: boolean;
+    titleAlign?: 'left' | 'center' | 'right';
+    /** 副标题相关配置 */
+    subtitle?: string;
+    showSubtitle?: boolean;
+    subtitleAlign?: 'left' | 'center' | 'right';
+    /** 登录方式配置 */
+    loginMethods?: ('email' | 'google' | 'facebook' | 'apple')[];
+    defaultLoginMethod?: 'email' | 'google' | 'facebook' | 'apple';
+    /** 表单配置 */
+    emailLabel?: string;
+    passwordLabel?: string;
+    emailPlaceholder?: string;
+    passwordPlaceholder?: string;
+    emailRules?: any[];
+    buttonText?: string;
+    rememberMeText?: string;
+    forgotPasswordText?: string;
+    showRememberMe?: boolean;
+    showForgotPassword?: boolean;
+    /** 社交登录配置 */
+    socialLoginTexts?: {
+        google?: string;
+        facebook?: string;
+        apple?: string;
+    };
+    /** 底部配置 */
+    showFooter?: boolean;
+    showSignUp?: boolean;
+    signUpText?: string;
+    signUpLink?: string;
+    signUpPosition?: 'left' | 'center' | 'right';
+    otherLinks?: Array<{
+        text: string;
+        url: string;
+    }>;
+    otherLinksPosition?: 'left' | 'center' | 'right';
+    /** 登录/注册切换配置 */
+    showTabs?: boolean;
+    loginTabText?: string;
+    registerTabText?: string;
+    /** 注册表单配置 */
+    registerEmailPlaceholder?: string;
+    registerPasswordPlaceholder?: string;
+    registerButtonText?: string;
+    /** 事件回调 */
+    onLogin?: (values: {
+        email: string;
+        loginMethod: string;
+    }) => void;
+    onSocialLogin?: (type: 'google' | 'facebook' | 'apple') => void;
+    onSignUp?: () => void;
+    onRegister?: (values: {
+        email: string;
+        password: string;
+    }) => void;
+    /** 新增背景图片属性 */
+    backgroundImage?: string;
+}
+/**
+ * Saas登录组件
+ * @param props - 组件属性
+ * @returns React组件
+ */
+declare const loginAndRegister: React.FC<loginAndRegisterProps>;
+export default loginAndRegister;