@pisell/materials 1.0.559 → 1.0.561

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -65,7 +65,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "large" | "middle";
+        openContentSize: "small" | "middle" | "large";
         openTitle: string;
         key: string;
     } | undefined;

package/es/components/dataSourceComponents/fields/Input.Url/ReadPretty.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { UrlProps } from './type';
 import './ReadPretty.less';
+export declare const formatUrl: (url: string) => string;
 declare const UrlReadPretty: (props: UrlProps) => React.JSX.Element;
 export default UrlReadPretty;

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

@@ -3,14 +3,29 @@ import { Typography } from 'antd';
 import classNames from 'classnames';
 import "./ReadPretty.less";
 var Link = Typography.Link;
+
+// 格式化 url 确保包含协议前缀
+export var formatUrl = function formatUrl(url) {
+  if (!url) return '';
+
+  // 如果已经包含协议前缀，直接返回
+  if (url.startsWith('http://') || url.startsWith('https://')) {
+    return url;
+  }
+
+  // 默认添加 https:// 前缀
+  return "https://".concat(url);
+};
 var UrlReadPretty = function UrlReadPretty(props) {
   var value = props.value,
     renderMode = props.renderMode;
+  var formattedUrl = formatUrl(value);
   return /*#__PURE__*/React.createElement(Link, {
     className: classNames('pisell-url-read-pretty', {
       'pisell-url-read-pretty-table-view': renderMode === 'tableView'
     }),
-    href: value
+    href: formattedUrl,
+    target: "_blank"
   }, value);
 };
 export default UrlReadPretty;

package/es/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/es/components/organizationTenantSwitcher/index.d.ts

@@ -10,6 +10,8 @@ interface OrganizationTenantSwitcherProps {
     }[];
     showLogo?: boolean;
     showName?: boolean;
+    readOnly?: boolean;
+    onClick?: React.MouseEventHandler<HTMLDivElement>;
 }
 declare const OrganizationTenantSwitcher: React.FC<OrganizationTenantSwitcherProps>;
 export default OrganizationTenantSwitcher;

package/es/components/organizationTenantSwitcher/index.js

@@ -27,7 +27,10 @@ var OrganizationTenantSwitcher = function OrganizationTenantSwitcher(_ref2) {
     _ref2$showLogo = _ref2.showLogo,
     showLogo = _ref2$showLogo === void 0 ? true : _ref2$showLogo,
     _ref2$showName = _ref2.showName,
-    showName = _ref2$showName === void 0 ? true : _ref2$showName;
+    showName = _ref2$showName === void 0 ? true : _ref2$showName,
+    _ref2$readOnly = _ref2.readOnly,
+    readOnly = _ref2$readOnly === void 0 ? false : _ref2$readOnly,
+    onClick = _ref2.onClick;
   var getCurrentOrg = function getCurrentOrg() {
     return options.find(function (opt) {
       return (opt === null || opt === void 0 ? void 0 : opt.value) === value;
@@ -70,19 +73,23 @@ var OrganizationTenantSwitcher = function OrganizationTenantSwitcher(_ref2) {
         overflow: 'auto'
       }
     },
-    trigger: ['click']
+    trigger: readOnly ? [] : ['click'],
+    disabled: readOnly
   }, /*#__PURE__*/React.createElement("div", {
-    className: "organization-tenant-switcher-switch",
+    className: classNames('organization-tenant-switcher-switch', {
+      'organization-tenant-switcher-switch-readonly': readOnly
+    }),
     style: !showLogo ? {
       paddingLeft: 16
-    } : {}
+    } : {},
+    onClick: onClick
   }, showLogo && /*#__PURE__*/React.createElement(Logo, {
     logo: currentOrg === null || currentOrg === void 0 ? void 0 : currentOrg.logo,
     className: "organization-tenant-switcher-switch-logo"
   }), /*#__PURE__*/React.createElement("div", {
     className: "organization-tenant-switcher-switch-name",
     title: currentOrg === null || currentOrg === void 0 ? void 0 : currentOrg.label
-  }, showName && (currentOrg === null || currentOrg === void 0 ? void 0 : currentOrg.label)), /*#__PURE__*/React.createElement(ChevronDown, {
+  }, showName && (currentOrg === null || currentOrg === void 0 ? void 0 : currentOrg.label)), !readOnly && /*#__PURE__*/React.createElement(ChevronDown, {
     className: "organization-tenant-switcher-switch-chevron"
   })));
 };

package/es/components/organizationTenantSwitcher/index.less

@@ -17,6 +17,16 @@
     border-color: var(--Gray-200, #e5e7eb);
     box-shadow: 0px 2px 4px 0px rgba(16, 24, 40, 0.15);
   }
+
+  &-readonly {
+    border: none;
+    padding-right: 16px;
+
+    &:hover {
+      border: none;
+      box-shadow: none;
+    }
+  }
 }
 
 .organization-tenant-switcher-overlay {

package/es/components/productCard/utils.js

@@ -54,7 +54,7 @@ export var formatMultiDayDate = function formatMultiDayDate(item) {
  * @Date: 2024-04-26 14:04
  */
 export var getServiceTime = function getServiceTime(item, currentDate) {
-  var _utils$storage;
+  var _utils$storage, _item$format;
   if (!dayjs(currentDate).isValid()) return '';
   var context = useEngineContext();
   var utils = context.appHelper.utils || {};
@@ -71,9 +71,10 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
   var diffInDays = endDate.diff(startDate, 'day');
   var _format = isEn ? 'ddd, DD/MM/YYYY' : 'YYYY-MM-DD，ddd';
 
-  // 是否显示周几
-  if (item !== null && item !== void 0 && item.hasOwnProperty('is_show_week') && !(item !== null && item !== void 0 && item.is_show_week)) {
-    _format = isEn ? 'DD/MM/YYYY' : 'YYYY-MM-DD';
+  // 是否自定义格式
+  if (item !== null && item !== void 0 && item.hasOwnProperty('format') && (item === null || item === void 0 ? void 0 : (_item$format = item.format) === null || _item$format === void 0 ? void 0 : _item$format.length) > 0) {
+    var _item$format2, _item$format3;
+    _format = isEn ? item === null || item === void 0 ? void 0 : (_item$format2 = item.format) === null || _item$format2 === void 0 ? void 0 : _item$format2[0] : item === null || item === void 0 ? void 0 : (_item$format3 = item.format) === null || _item$format3 === void 0 ? void 0 : _item$format3[1];
   }
   var date = "".concat(startDate.format(_format), " ~ ").concat(endDate.format(_format));
   var duration = "".concat(diffInDays, " ").concat(locales.getText('pisell2.product.card.day')(diffInDays));

package/es/components/table/Table/utils.d.ts

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
+}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

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

@@ -65,7 +65,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         useCustomAction: boolean;
         actionType: string;
         openMode: "modal" | "drawer";
-        openContentSize: "small" | "large" | "middle";
+        openContentSize: "small" | "middle" | "large";
         openTitle: string;
         key: string;
     } | undefined;

package/lib/components/dataSourceComponents/fields/Input.Url/ReadPretty.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { UrlProps } from './type';
 import './ReadPretty.less';
+export declare const formatUrl: (url: string) => string;
 declare const UrlReadPretty: (props: UrlProps) => React.JSX.Element;
 export default UrlReadPretty;

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/organizationTenantSwitcher/index.d.ts

@@ -10,6 +10,8 @@ interface OrganizationTenantSwitcherProps {
     }[];
     showLogo?: boolean;
     showName?: boolean;
+    readOnly?: boolean;
+    onClick?: React.MouseEventHandler<HTMLDivElement>;
 }
 declare const OrganizationTenantSwitcher: React.FC<OrganizationTenantSwitcherProps>;
 export default OrganizationTenantSwitcher;

package/lib/components/organizationTenantSwitcher/index.js

@@ -57,7 +57,9 @@ var OrganizationTenantSwitcher = ({
   value,
   options,
   showLogo = true,
-  showName = true
+  showName = true,
+  readOnly = false,
+  onClick
 }) => {
   const getCurrentOrg = () => {
     return options.find((opt) => (opt == null ? void 0 : opt.value) === value);
@@ -90,13 +92,17 @@ var OrganizationTenantSwitcher = ({
           overflow: "auto"
         }
       },
-      trigger: ["click"]
+      trigger: readOnly ? [] : ["click"],
+      disabled: readOnly
     },
     /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
-        className: "organization-tenant-switcher-switch",
-        style: !showLogo ? { paddingLeft: 16 } : {}
+        className: (0, import_classnames.default)("organization-tenant-switcher-switch", {
+          "organization-tenant-switcher-switch-readonly": readOnly
+        }),
+        style: !showLogo ? { paddingLeft: 16 } : {},
+        onClick
       },
       showLogo && /* @__PURE__ */ import_react.default.createElement(
         Logo,
@@ -106,7 +112,7 @@ var OrganizationTenantSwitcher = ({
         }
       ),
       /* @__PURE__ */ import_react.default.createElement("div", { className: "organization-tenant-switcher-switch-name", title: currentOrg == null ? void 0 : currentOrg.label }, showName && (currentOrg == null ? void 0 : currentOrg.label)),
-      /* @__PURE__ */ import_react.default.createElement(import_ChevronDown.default, { className: "organization-tenant-switcher-switch-chevron" })
+      !readOnly && /* @__PURE__ */ import_react.default.createElement(import_ChevronDown.default, { className: "organization-tenant-switcher-switch-chevron" })
     )
   );
 };

package/lib/components/organizationTenantSwitcher/index.less

@@ -17,6 +17,16 @@
     border-color: var(--Gray-200, #e5e7eb);
     box-shadow: 0px 2px 4px 0px rgba(16, 24, 40, 0.15);
   }
+
+  &-readonly {
+    border: none;
+    padding-right: 16px;
+
+    &:hover {
+      border: none;
+      box-shadow: none;
+    }
+  }
 }
 
 .organization-tenant-switcher-overlay {

package/lib/components/productCard/utils.js

@@ -60,7 +60,7 @@ var formatMultiDayDate = (item) => {
   return date;
 };
 var getServiceTime = (item, currentDate) => {
-  var _a;
+  var _a, _b, _c, _d;
   if (!(0, import_dayjs.default)(currentDate).isValid())
     return "";
   const context = (0, import_useEngineContext.default)();
@@ -77,8 +77,8 @@ var getServiceTime = (item, currentDate) => {
   const endDate = (0, import_dayjs.default)(item == null ? void 0 : item.end_date);
   const diffInDays = endDate.diff(startDate, "day");
   let _format = isEn2 ? "ddd, DD/MM/YYYY" : "YYYY-MM-DD，ddd";
-  if ((item == null ? void 0 : item.hasOwnProperty("is_show_week")) && !(item == null ? void 0 : item.is_show_week)) {
-    _format = isEn2 ? "DD/MM/YYYY" : "YYYY-MM-DD";
+  if ((item == null ? void 0 : item.hasOwnProperty("format")) && ((_b = item == null ? void 0 : item.format) == null ? void 0 : _b.length) > 0) {
+    _format = isEn2 ? (_c = item == null ? void 0 : item.format) == null ? void 0 : _c[0] : (_d = item == null ? void 0 : item.format) == null ? void 0 : _d[1];
   }
   const date = `${startDate.format(_format)} ~ ${endDate.format(_format)}`;
   const duration = `${diffInDays} ${import_utils.locales.getText("pisell2.product.card.day")(diffInDays)}`;

package/lib/components/table/Table/utils.d.ts

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
+}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/lowcode/organization-tenant-switch/meta.ts

@@ -29,6 +29,13 @@ const DivMeta: ComponentMetadata = {
       defaultValue: true,
       supportVariable: true
     },
+    {
+      name: "readOnly",
+      title: "是否只读",
+      setter: "BoolSetter",
+      defaultValue: false,
+      supportVariable: true
+    },
     /*
     {
       name: "options",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.559",
+  "version": "1.0.561",
   "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/date-picker": "1.0.115",
-    "@pisell/utils": "1.0.43",
-    "@pisell/icon": "0.0.10"
+    "@pisell/icon": "0.0.10",
+    "@pisell/utils": "1.0.43"
   },
   "peerDependencies": {
     "react": "^18.0.0",