@pisell/materials 1.0.549 → 1.0.550

package/es/components/dataSourceComponents/dataSourceForm/group/index.less

@@ -26,7 +26,7 @@
     .pisell-lowcode-data-source-form-group-content {
       border: 1px solid var(--Gray-300, #d0d5dd);
       border-radius: 8px;
-      padding: 20px;
+      padding: 20px 20px 0;
     }
   }
   &-info {

package/es/components/productCard/components/Header/index.js

@@ -19,7 +19,8 @@ var Header = function Header(props) {
     image = item.image,
     name = item.name,
     price = item.price,
-    symbol = item.symbol;
+    symbol = item.symbol,
+    show_delete = item.show_delete;
 
   /**
    * @title: 是否显示价格
@@ -48,7 +49,7 @@ var Header = function Header(props) {
   }, [options, product_option_string]);
   return /*#__PURE__*/React.createElement("div", {
     className: classNames("".concat(prefix, "product-header"), headerCenterStyle && "".concat(prefix, "product-options-header"))
-  }, isShowDelete && !disabledEdit ? /*#__PURE__*/React.createElement("div", {
+  }, isShowDelete && !disabledEdit || show_delete ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "product-delete"),
     onClick: function onClick(e) {
       e.stopPropagation();

package/es/components/productCard/status.js

@@ -43,7 +43,9 @@ export var defaultProduct = {
   num: 1,
   image: '',
   isShowNote: true,
-  note: ''
+  note: '',
+  is_show_duration: true,
+  is_show_week: true
 };
 
 /**

package/es/components/productCard/types.d.ts

@@ -54,6 +54,8 @@ export declare type productType = {
     holder_title?: string;
     start_date?: string;
     end_date?: string;
+    is_show_duration?: boolean;
+    is_show_week?: boolean;
 };
 /**
  * 排序总配置

package/es/components/productCard/utils.js

@@ -3,6 +3,7 @@ import { locales } from '@pisell/utils';
 import 'dayjs/locale/zh-cn';
 import 'dayjs/locale/en';
 import 'dayjs/locale/zh-tw';
+import useEngineContext from "../../hooks/useEngineContext";
 
 /**
  * @title: 是否英文
@@ -53,8 +54,11 @@ export var formatMultiDayDate = function formatMultiDayDate(item) {
  * @Date: 2024-04-26 14:04
  */
 export var getServiceTime = function getServiceTime(item, currentDate) {
+  var _utils$storage;
   if (!dayjs(currentDate).isValid()) return '';
-  var locale = (item === null || item === void 0 ? void 0 : item.locale) || 'en-US';
+  var context = useEngineContext();
+  var utils = context.appHelper.utils || {};
+  var locale = (item === null || item === void 0 ? void 0 : item.locale) || (utils === null || utils === void 0 ? void 0 : (_utils$storage = utils.storage) === null || _utils$storage === void 0 ? void 0 : _utils$storage.get('umi_locale')) || 'en-US';
   var isEn = locale === 'en-US' || locale === 'en';
   var localeTypes = {
     'en-US': 'en',
@@ -66,7 +70,17 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
   var endDate = dayjs(item === null || item === void 0 ? void 0 : item.end_date);
   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';
+  }
   var date = "".concat(startDate.format(_format), " ~ ").concat(endDate.format(_format));
   var duration = "".concat(diffInDays, " ").concat(locales.getText('pisell2.product.card.day')(diffInDays));
+
+  // 是否显示时长
+  if (item !== null && item !== void 0 && item.hasOwnProperty('is_show_duration') && !(item !== null && item !== void 0 && item.is_show_duration)) {
+    return date;
+  }
   return "".concat(date, " (").concat(duration, ")");
 };

package/lib/components/dataSourceComponents/dataSourceForm/group/index.less

@@ -26,7 +26,7 @@
     .pisell-lowcode-data-source-form-group-content {
       border: 1px solid var(--Gray-300, #d0d5dd);
       border-radius: 8px;
-      padding: 20px;
+      padding: 20px 20px 0;
     }
   }
   &-info {

package/lib/components/productCard/components/Header/index.js

@@ -50,7 +50,8 @@ var Header = (props) => {
     image,
     name,
     price,
-    symbol
+    symbol,
+    show_delete
   } = item;
   const showPrice = (0, import_react.useMemo)(() => {
     return (bundle == null ? void 0 : bundle.length) > 0 || (options == null ? void 0 : options.length) > 0;
@@ -66,7 +67,7 @@ var Header = (props) => {
         headerCenterStyle && `${prefix}product-options-header`
       )
     },
-    isShowDelete && !disabledEdit ? /* @__PURE__ */ import_react.default.createElement(
+    isShowDelete && !disabledEdit || show_delete ? /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
         className: `${prefix}product-delete`,

package/lib/components/productCard/status.js

@@ -48,7 +48,9 @@ var defaultProduct = {
   num: 1,
   image: "",
   isShowNote: true,
-  note: ""
+  note: "",
+  is_show_duration: true,
+  is_show_week: true
 };
 var defaultValue = {
   dataSource: defaultProduct,

package/lib/components/productCard/types.d.ts

@@ -54,6 +54,8 @@ export declare type productType = {
     holder_title?: string;
     start_date?: string;
     end_date?: string;
+    is_show_duration?: boolean;
+    is_show_week?: boolean;
 };
 /**
  * 排序总配置

package/lib/components/productCard/utils.js

@@ -39,6 +39,7 @@ var import_utils = require("@pisell/utils");
 var import_zh_cn = require("dayjs/locale/zh-cn");
 var import_en = require("dayjs/locale/en");
 var import_zh_tw = require("dayjs/locale/zh-tw");
+var import_useEngineContext = __toESM(require("../../hooks/useEngineContext"));
 var isEn = (item) => {
   const locale = (item == null ? void 0 : item.locale) || "en-US";
   const _isEn = locale === "en-US" || locale === "en";
@@ -59,9 +60,12 @@ var formatMultiDayDate = (item) => {
   return date;
 };
 var getServiceTime = (item, currentDate) => {
+  var _a;
   if (!(0, import_dayjs.default)(currentDate).isValid())
     return "";
-  const locale = (item == null ? void 0 : item.locale) || "en-US";
+  const context = (0, import_useEngineContext.default)();
+  const utils = context.appHelper.utils || {};
+  const locale = (item == null ? void 0 : item.locale) || ((_a = utils == null ? void 0 : utils.storage) == null ? void 0 : _a.get("umi_locale")) || "en-US";
   const isEn2 = locale === "en-US" || locale === "en";
   const localeTypes = {
     "en-US": "en",
@@ -72,9 +76,15 @@ var getServiceTime = (item, currentDate) => {
   const startDate = (0, import_dayjs.default)(item == null ? void 0 : item.start_date);
   const endDate = (0, import_dayjs.default)(item == null ? void 0 : item.end_date);
   const diffInDays = endDate.diff(startDate, "day");
-  const _format = isEn2 ? "ddd, DD/MM/YYYY" : "YYYY-MM-DD，ddd";
+  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";
+  }
   const date = `${startDate.format(_format)} ~ ${endDate.format(_format)}`;
   const duration = `${diffInDays} ${import_utils.locales.getText("pisell2.product.card.day")(diffInDays)}`;
+  if ((item == null ? void 0 : item.hasOwnProperty("is_show_duration")) && !(item == null ? void 0 : item.is_show_duration)) {
+    return date;
+  }
   return `${date} (${duration})`;
 };
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -164,6 +164,7 @@ const dataSourceForm: MetaType = {
           title: '字段',
           display: 'entry',
           type: 'group',
+          name: "_fields1",
           items: [
             {
               title: {
@@ -263,6 +264,7 @@ const dataSourceForm: MetaType = {
         },
         {
           type: 'group',
+          name: "_extraParams",
           title: '额外参数',
           display: 'entry',
           items: [

package/package.json

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