@pisell/materials 1.0.601 → 1.0.602

package/es/components/dataSourceComponents/fields/Input.Subdomain/WithMode.js

@@ -51,6 +51,7 @@ import useEngineContext from "../../../../hooks/useEngineContext";
  * />
  */
 var Subdomain = function Subdomain(props) {
+  var _coreData$tenant;
   var propsOnBlur = props.onBlur,
     propsOnChange = props.onChange,
     _props$rootDomain = props.rootDomain,
@@ -79,30 +80,53 @@ var Subdomain = function Subdomain(props) {
     var _context$appHelper$ut, _context$appHelper$ut2, _context$appHelper$ut3, _context$appHelper$ut4, _context$appHelper$ut5, _context$appHelper$ut6, _context$appHelper$ut7, _context$appHelper$ut8;
     return (_context$appHelper$ut = context.appHelper.utils) === null || _context$appHelper$ut === void 0 ? void 0 : (_context$appHelper$ut2 = _context$appHelper$ut.getApp) === null || _context$appHelper$ut2 === void 0 ? void 0 : (_context$appHelper$ut3 = _context$appHelper$ut2.call(_context$appHelper$ut)) === null || _context$appHelper$ut3 === void 0 ? void 0 : (_context$appHelper$ut4 = _context$appHelper$ut3.data) === null || _context$appHelper$ut4 === void 0 ? void 0 : (_context$appHelper$ut5 = _context$appHelper$ut4.store) === null || _context$appHelper$ut5 === void 0 ? void 0 : (_context$appHelper$ut6 = _context$appHelper$ut5.getStore) === null || _context$appHelper$ut6 === void 0 ? void 0 : (_context$appHelper$ut7 = _context$appHelper$ut6.call(_context$appHelper$ut5)) === null || _context$appHelper$ut7 === void 0 ? void 0 : (_context$appHelper$ut8 = _context$appHelper$ut7.getDataByModel) === null || _context$appHelper$ut8 === void 0 ? void 0 : _context$appHelper$ut8.call(_context$appHelper$ut7, 'core', 'core');
   }, [context]);
-
+  console.log('%c [ coreData ]-79', 'font-size:13px; background:#7b0629; color:#bf4a6d;', coreData);
   // 3. 获取 tenantData
-  var tenantData = useMemo(function () {
-    var _coreData$tenant;
-    if (rootDomain === 'saas' && coreData !== null && coreData !== void 0 && (_coreData$tenant = coreData.tenant) !== null && _coreData$tenant !== void 0 && _coreData$tenant.id) {
-      return useTenantData(coreData.tenant.id);
-    }
-    return undefined;
-  }, [rootDomain, coreData]);
+  var tenantData = useTenantData(rootDomain, coreData === null || coreData === void 0 ? void 0 : (_coreData$tenant = coreData.tenant) === null || _coreData$tenant === void 0 ? void 0 : _coreData$tenant.id);
 
   // 4. parseExternalValue 函数
-  var parseExternalValue = useCallback(function (val) {
-    if (!val) return {
-      subdomain: '',
-      suffix: coreData ? coreData.tenant_domain : ''
-    };
-    var parts = val.split('.');
-    var subdomain = parts.length > 1 ? parts[0] : val;
-    var suffix = parts.length > 1 ? ".".concat(parts.slice(1).join('.')) : coreData ? coreData.tenant_domain : '';
-    return {
-      subdomain: subdomain,
-      suffix: suffix
-    };
-  }, [coreData]);
+  var parseExternalValue = function parseExternalValue(val) {
+    // 如果值为空或只有空格或只有点号，返回默认值
+    if (!val || !val.trim() || val.trim() === '.') {
+      return {
+        subdomain: '',
+        suffix: suffixEmpty()
+      };
+    }
+    try {
+      // 将连续的点替换为单个点
+      var normalizedVal = val.replace(/\.+/g, '.');
+      var parts = normalizedVal.split('.');
+
+      // 如果第一部分为空（以点号开头），且有后续部分
+      if (parts[0] === '' && parts.length > 1) {
+        return {
+          subdomain: '',
+          suffix: ".".concat(parts.slice(1).join('.'))
+        };
+      }
+
+      // 如果只有一个部分，作为子域名
+      if (parts.length === 1) {
+        return {
+          subdomain: parts[0].trim(),
+          suffix: suffixEmpty()
+        };
+      }
+
+      // 有多个部分，第一个作为子域名，其余作为后缀
+      return {
+        subdomain: parts[0].trim(),
+        suffix: ".".concat(parts.slice(1).join('.'))
+      };
+    } catch (error) {
+      console.error('Error parsing value:', error);
+      return {
+        subdomain: '',
+        suffix: suffixEmpty()
+      };
+    }
+  };
 
   // 5. 处理 value 和 domain 变化
   useEffect(function () {
@@ -117,20 +141,29 @@ var Subdomain = function Subdomain(props) {
         var _newSuffix = '';
         switch (rootDomain) {
           case 'xzero':
-            _newSuffix = coreData ? ".".concat(coreData.tenant_domain) : suffixEmpty();
+            _newSuffix = coreData !== null && coreData !== void 0 && coreData.tenant_domain ? ".".concat(coreData.tenant_domain) : suffixEmpty();
             break;
           case 'saas':
-            _newSuffix = tenantData ? ".".concat(tenantData['saas.domain']) : suffixEmpty();
+            _newSuffix = tenantData !== null && tenantData !== void 0 && tenantData['saas.domain'] ? ".".concat(tenantData['saas.domain']) : suffixEmpty();
+            break;
+          case 'custom':
+            if (customDomain) {
+              var normalizedDomain = customDomain.replace(/\.+/g, '.');
+              _newSuffix = normalizedDomain.startsWith('.') ? normalizedDomain : ".".concat(normalizedDomain);
+            } else {
+              _newSuffix = suffixEmpty();
+            }
             break;
           default:
-            _newSuffix = customDomain ? customDomain.startsWith('.') ? customDomain : ".".concat(customDomain) : suffixEmpty();
+            _newSuffix = suffixEmpty();
         }
         setSuffix(_newSuffix);
       }
     } catch (error) {
       console.error('Error updating domain:', error);
+      setSuffix(suffixEmpty());
     }
-  }, [value, rootDomain, customDomain, tenantData, coreData, parseExternalValue]);
+  }, [value, rootDomain, customDomain, tenantData, coreData]);
 
   // 6. 处理输入变化
   var handleChange = useCallback(function (e) {

package/es/components/dataSourceComponents/fields/Input.Subdomain/serve.d.ts

@@ -8,4 +8,4 @@ export interface TenantData {
 /**
  * 自定义 Hook，用于获取租户数据
  */
-export declare const useTenantData: (id: string) => TenantData | undefined;
+export declare const useTenantData: (rootDomain: string, tenantId?: string) => TenantData | undefined;

package/es/components/dataSourceComponents/fields/Input.Subdomain/serve.js

@@ -45,19 +45,19 @@ export var getTenantData = /*#__PURE__*/function () {
 /**
  * 自定义 Hook，用于获取租户数据
  */
-export var useTenantData = function useTenantData(id) {
+export var useTenantData = function useTenantData(rootDomain, tenantId) {
   var _useRequest = useRequest(function () {
-      return getTenantData(id);
+      // 只有在 saas 模式且有 tenantId 时才发起请求
+      if (rootDomain === 'saas' && tenantId) {
+        return getTenantData(tenantId);
+      }
+      return Promise.resolve(undefined);
     }, {
-      cacheKey: 'tenant-data',
+      cacheKey: "tenant-data-".concat(tenantId),
       staleTime: 1000 * 60 * 5,
       // 5分钟后数据过期
       cacheTime: 1000 * 60 * 60 // 1小时后清除缓存
     }),
-    data = _useRequest.data,
-    error = _useRequest.error;
-  if (error) {
-    console.error("Error fetching tenant data:", error);
-  }
-  return data; // 返回租户数据
+    data = _useRequest.data;
+  return data;
 };

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

@@ -20,7 +20,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "custom" | "xzero" | "saas";
+            rootDomain: "custom" | "saas" | "xzero";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -78,7 +78,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "custom" | "xzero" | "saas";
+        rootDomain: "custom" | "saas" | "xzero";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;

package/lib/components/dataSourceComponents/fields/Input.Subdomain/WithMode.js

@@ -40,6 +40,7 @@ var import_utils = require("../../dataSourceForm/utils");
 var import_useDataSource = __toESM(require("../../hooks/useDataSource"));
 var import_useEngineContext = __toESM(require("../../../../hooks/useEngineContext"));
 var Subdomain = (props) => {
+  var _a;
   const {
     onBlur: propsOnBlur,
     onChange: propsOnChange,
@@ -55,24 +56,45 @@ var Subdomain = (props) => {
   const [subdomain, setSubdomain] = (0, import_react.useState)("");
   const [suffix, setSuffix] = (0, import_react.useState)("");
   const coreData = (0, import_react.useMemo)(() => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    return (_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");
+    var _a2, _b, _c, _d, _e, _f, _g, _h;
+    return (_h = (_g = (_f = (_e = (_d = (_c = (_b = (_a2 = context.appHelper.utils) == null ? void 0 : _a2.getApp) == null ? void 0 : _b.call(_a2)) == 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");
   }, [context]);
-  const tenantData = (0, import_react.useMemo)(() => {
-    var _a;
-    if (rootDomain === "saas" && ((_a = coreData == null ? void 0 : coreData.tenant) == null ? void 0 : _a.id)) {
-      return (0, import_serve.useTenantData)(coreData.tenant.id);
+  console.log("%c [ coreData ]-79", "font-size:13px; background:#7b0629; color:#bf4a6d;", coreData);
+  const tenantData = (0, import_serve.useTenantData)(rootDomain, (_a = coreData == null ? void 0 : coreData.tenant) == null ? void 0 : _a.id);
+  const parseExternalValue = (val) => {
+    if (!val || !val.trim() || val.trim() === ".") {
+      return {
+        subdomain: "",
+        suffix: suffixEmpty()
+      };
     }
-    return void 0;
-  }, [rootDomain, coreData]);
-  const parseExternalValue = (0, import_react.useCallback)((val) => {
-    if (!val)
-      return { subdomain: "", suffix: coreData ? coreData.tenant_domain : "" };
-    const parts = val.split(".");
-    const subdomain2 = parts.length > 1 ? parts[0] : val;
-    const suffix2 = parts.length > 1 ? `.${parts.slice(1).join(".")}` : coreData ? coreData.tenant_domain : "";
-    return { subdomain: subdomain2, suffix: suffix2 };
-  }, [coreData]);
+    try {
+      const normalizedVal = val.replace(/\.+/g, ".");
+      const parts = normalizedVal.split(".");
+      if (parts[0] === "" && parts.length > 1) {
+        return {
+          subdomain: "",
+          suffix: `.${parts.slice(1).join(".")}`
+        };
+      }
+      if (parts.length === 1) {
+        return {
+          subdomain: parts[0].trim(),
+          suffix: suffixEmpty()
+        };
+      }
+      return {
+        subdomain: parts[0].trim(),
+        suffix: `.${parts.slice(1).join(".")}`
+      };
+    } catch (error) {
+      console.error("Error parsing value:", error);
+      return {
+        subdomain: "",
+        suffix: suffixEmpty()
+      };
+    }
+  };
   (0, import_react.useEffect)(() => {
     try {
       if (value) {
@@ -83,20 +105,29 @@ var Subdomain = (props) => {
         let newSuffix = "";
         switch (rootDomain) {
           case "xzero":
-            newSuffix = coreData ? `.${coreData.tenant_domain}` : suffixEmpty();
+            newSuffix = (coreData == null ? void 0 : coreData.tenant_domain) ? `.${coreData.tenant_domain}` : suffixEmpty();
             break;
           case "saas":
-            newSuffix = tenantData ? `.${tenantData["saas.domain"]}` : suffixEmpty();
+            newSuffix = (tenantData == null ? void 0 : tenantData["saas.domain"]) ? `.${tenantData["saas.domain"]}` : suffixEmpty();
+            break;
+          case "custom":
+            if (customDomain) {
+              const normalizedDomain = customDomain.replace(/\.+/g, ".");
+              newSuffix = normalizedDomain.startsWith(".") ? normalizedDomain : `.${normalizedDomain}`;
+            } else {
+              newSuffix = suffixEmpty();
+            }
             break;
           default:
-            newSuffix = customDomain ? customDomain.startsWith(".") ? customDomain : `.${customDomain}` : suffixEmpty();
+            newSuffix = suffixEmpty();
         }
         setSuffix(newSuffix);
       }
     } catch (error) {
       console.error("Error updating domain:", error);
+      setSuffix(suffixEmpty());
     }
-  }, [value, rootDomain, customDomain, tenantData, coreData, parseExternalValue]);
+  }, [value, rootDomain, customDomain, tenantData, coreData]);
   const handleChange = (0, import_react.useCallback)((e) => {
     try {
       const inputValue = e.target.value.toLowerCase();

package/lib/components/dataSourceComponents/fields/Input.Subdomain/serve.d.ts

@@ -8,4 +8,4 @@ export interface TenantData {
 /**
  * 自定义 Hook，用于获取租户数据
  */
-export declare const useTenantData: (id: string) => TenantData | undefined;
+export declare const useTenantData: (rootDomain: string, tenantId?: string) => TenantData | undefined;

package/lib/components/dataSourceComponents/fields/Input.Subdomain/serve.js

@@ -40,17 +40,22 @@ var getTenantData = async (id) => {
     throw error;
   }
 };
-var useTenantData = (id) => {
-  const { data, error } = (0, import_ahooks.useRequest)(() => getTenantData(id), {
-    cacheKey: "tenant-data",
-    staleTime: 1e3 * 60 * 5,
-    // 5分钟后数据过期
-    cacheTime: 1e3 * 60 * 60
-    // 1小时后清除缓存
-  });
-  if (error) {
-    console.error("Error fetching tenant data:", error);
-  }
+var useTenantData = (rootDomain, tenantId) => {
+  const { data } = (0, import_ahooks.useRequest)(
+    () => {
+      if (rootDomain === "saas" && tenantId) {
+        return getTenantData(tenantId);
+      }
+      return Promise.resolve(void 0);
+    },
+    {
+      cacheKey: `tenant-data-${tenantId}`,
+      staleTime: 1e3 * 60 * 5,
+      // 5分钟后数据过期
+      cacheTime: 1e3 * 60 * 60
+      // 1小时后清除缓存
+    }
+  );
   return data;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -20,7 +20,7 @@ declare const formFieldMap: {
         Subdomain: import("react").FC<import("antd").InputProps & {
             onChange: (value: string) => void;
             onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-            rootDomain: "custom" | "xzero" | "saas";
+            rootDomain: "custom" | "saas" | "xzero";
             customDomain?: string | undefined;
             value?: string | undefined;
             tenantId: string;
@@ -78,7 +78,7 @@ declare const getFieldComponent: (fieldComponent: string) => import("react").FC<
     Subdomain: import("react").FC<import("antd").InputProps & {
         onChange: (value: string) => void;
         onBlur?: ((e: import("react").FocusEvent<HTMLInputElement, Element>) => void) | undefined;
-        rootDomain: "custom" | "xzero" | "saas";
+        rootDomain: "custom" | "saas" | "xzero";
         customDomain?: string | undefined;
         value?: string | undefined;
         tenantId: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.601",
+  "version": "1.0.602",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -70,8 +70,8 @@
     "swiper": "^8.4.7",
     "react-barcode": "^1.5.3",
     "@pisell/icon": "0.0.10",
-    "@pisell/date-picker": "1.0.115",
-    "@pisell/utils": "1.0.43"
+    "@pisell/utils": "1.0.43",
+    "@pisell/date-picker": "1.0.115"
   },
   "peerDependencies": {
     "react": "^18.0.0",