npm - @pisell/materials - Versions diffs - 6.11.100 → 6.11.101 - Mend

@pisell/materials 6.11.100 → 6.11.101

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (193) hide show

package/lib/components/productCard/cartSkuCard/components/weighing/index.js CHANGED Viewed

@@ -65,30 +65,37 @@ var Weighing = (props) => {
   const tareValue = Number((tare == null ? void 0 : tare.value) || 0);
   const isManualWeight = mode === "manual";
   const grossLabel = import_utils.locales.getText("pisell2.cart.sku-card.weighing.gross");
-  const manualLabel = import_utils.locales.getText("pisell2.cart.sku-card.weighing.manual");
   const tareLabel = import_utils.locales.getText("pisell2.cart.sku-card.weighing.tare");
   const netLabel = import_utils.locales.getText("pisell2.cart.sku-card.weighing.net");
   const unitPriceText = `${symbol || ""}${unit_price ?? "0.00"}`;
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing` }, isManualWeight ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing-row` }, /* @__PURE__ */ import_react.default.createElement("span", null, manualLabel)) : null, tareValue > 0 ? /* @__PURE__ */ import_react.default.createElement(
+  const manualPrefix = isManualWeight ? "(M) " : "";
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: `${import__.PREFIX}__weighing` }, tareValue > 0 ? /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: `${import__.PREFIX}__weighing-row ${import__.PREFIX}__weighing-row--large`
     },
-    /* @__PURE__ */ import_react.default.createElement("span", null, grossLabel, ":"),
-    /* @__PURE__ */ import_react.default.createElement("span", null, formatWeight(weight, unit))
+    /* @__PURE__ */ import_react.default.createElement("span", null, `${manualPrefix}${grossLabel}: ${formatWeight(
+      weight,
+      unit
+    )}`)
   ) : null, tareValue > 0 ? /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: `${import__.PREFIX}__weighing-row ${import__.PREFIX}__weighing-row--large`
     },
-    /* @__PURE__ */ import_react.default.createElement("span", null, tareLabel, ":"),
-    /* @__PURE__ */ import_react.default.createElement("span", null, formatWeight(tare == null ? void 0 : tare.value, (tare == null ? void 0 : tare.unit) || unit))
+    /* @__PURE__ */ import_react.default.createElement("span", null, `${tareLabel}: ${formatWeight(
+      tare == null ? void 0 : tare.value,
+      (tare == null ? void 0 : tare.unit) || unit
+    )}`)
   ) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: `${import__.PREFIX}__weighing-row ${import__.PREFIX}__weighing-row--large`
     },
-    /* @__PURE__ */ import_react.default.createElement("span", null, `${formatWeight(net_weight, unit)} ${netLabel} @ ${unitPriceText}/${unitLabel}`)
+    /* @__PURE__ */ import_react.default.createElement("span", null, `${tareValue > 0 ? "" : manualPrefix}${formatWeight(
+      net_weight,
+      unit
+    )} ${netLabel} @ ${unitPriceText}/${unitLabel}`)
   ));
 };
 var weighing_default = Weighing;

package/lib/components/productCard/cartSkuCard/components/weighing/index.less CHANGED Viewed

@@ -23,8 +23,21 @@
     }
     &--large {
-      font-size: 28px;
-      line-height: 40px;
+      font-size: 14px;
+      line-height: 20px;
+      align-items: flex-start;
+      flex-wrap: wrap;
+      overflow: visible;
+      white-space: normal;
+      text-overflow: clip;
+      > span {
+        overflow: visible;
+        white-space: normal;
+        text-overflow: clip;
+        word-break: normal;
+        overflow-wrap: normal;
+      }
     }
   }
 }

package/lib/components/productCard/lineItem/BookingLineItem.js CHANGED Viewed

@@ -152,8 +152,22 @@ var BookingLineItem = (props) => {
   const resolvedHolderOptions = holderOptions ?? (dataSource == null ? void 0 : dataSource.holderOptions) ?? (dataSource == null ? void 0 : dataSource.holders) ?? [];
   const resolvedIsFormSubject = isFormSubject ?? (dataSource == null ? void 0 : dataSource.isFormSubject);
   const bookingTitle = String((dataSource == null ? void 0 : dataSource.booking_id) || "");
+  const hasBookingTitle = Boolean(bookingTitle);
   const bookingTime = formatBookingTime(dataSource, locale);
   const resourceName = getResourceName(dataSource, translationOriginal) || "-";
+  const renderDeleteButton = () => isShowDelete ? /* @__PURE__ */ import_react.default.createElement(
+    "button",
+    {
+      className: `${PREFIX}__delete-btn`,
+      type: "button",
+      onClick: (e) => {
+        e.preventDefault();
+        e.stopPropagation();
+        onDelete == null ? void 0 : onDelete(dataSource);
+      }
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-trash-01" })
+  ) : null;
   const renderStatusButton = () => /* @__PURE__ */ import_react.default.createElement(
     import_antd.Button,
     {
@@ -196,7 +210,7 @@ var BookingLineItem = (props) => {
           onCard == null ? void 0 : onCard(dataSource);
         }
       },
-      /* @__PURE__ */ import_react.default.createElement(
+      hasBookingTitle ? /* @__PURE__ */ import_react.default.createElement(
         "div",
         {
           className: `${PREFIX}__booking-header`,
@@ -214,28 +228,25 @@ var BookingLineItem = (props) => {
             trigger: ["click"]
           },
           renderStatusButton()
-        ) : renderStatusButton(), isShowDelete ? /* @__PURE__ */ import_react.default.createElement(
-          "button",
+        ) : renderStatusButton(), renderDeleteButton()))
+      ) : null,
+      /* @__PURE__ */ import_react.default.createElement(
+        "div",
+        {
+          className: (0, import_classnames.default)(`${PREFIX}__booking-detail`, {
+            [`${PREFIX}__booking-detail--with-delete`]: !hasBookingTitle && isShowDelete
+          })
+        },
+        /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__booking-detail-content` }, /* @__PURE__ */ import_react.default.createElement(import_Resources.default, { dataSource }), /* @__PURE__ */ import_react.default.createElement(import_TimeRange.default, { dataSource }), resolvedIsFormSubject ? /* @__PURE__ */ import_react.default.createElement(
+          import_Holders.default,
           {
-            className: `${PREFIX}__delete-btn`,
-            type: "button",
-            onClick: (e) => {
-              e.preventDefault();
-              e.stopPropagation();
-              onDelete == null ? void 0 : onDelete(dataSource);
-            }
-          },
-          /* @__PURE__ */ import_react.default.createElement(import_iconfont.default, { type: "pisell2-trash-01" })
-        ) : null))
+            dataSource,
+            holderOptions: resolvedHolderOptions,
+            isFormSubject: resolvedIsFormSubject
+          }
+        ) : null),
+        !hasBookingTitle ? renderDeleteButton() : null
       ),
-      /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__booking-detail` }, /* @__PURE__ */ import_react.default.createElement(import_Resources.default, { dataSource }), /* @__PURE__ */ import_react.default.createElement(import_TimeRange.default, { dataSource }), resolvedIsFormSubject ? /* @__PURE__ */ import_react.default.createElement(
-        import_Holders.default,
-        {
-          dataSource,
-          holderOptions: resolvedHolderOptions,
-          isFormSubject: resolvedIsFormSubject
-        }
-      ) : null),
       isShowRelatedProduct && relatedProductDataSource ? /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(import_antd.Divider, { style: { margin: 0 } }), /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__related-product` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${PREFIX}__related-product-card` }, /* @__PURE__ */ import_react.default.createElement(
         import_basicInfo.default,
         {

package/lib/components/productCard/lineItem/components/TimeRange/index.d.ts ADDED Viewed

@@ -0,0 +1,12 @@
+import React from 'react';
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/en';
+import 'dayjs/locale/zh-tw';
+import 'dayjs/locale/ja';
+import 'dayjs/locale/pt';
+import '../../../cartSkuCard/components/timeRange/index.less';
+interface LineItemTimeRangeProps {
+    dataSource?: any;
+}
+declare const LineItemTimeRange: (props: LineItemTimeRangeProps) => React.JSX.Element | null;
+export default LineItemTimeRange;

package/lib/components/productCard/lineItem/index.less CHANGED Viewed

@@ -148,6 +148,28 @@
     padding: 8px;
   }
+  &__booking-detail--with-delete {
+    position: relative;
+    .pisell-line-item__booking-detail-content {
+      padding-right: 42px;
+    }
+    .pisell-line-item__delete-btn {
+      position: absolute;
+      top: 8px;
+      right: 8px;
+    }
+  }
+  &__booking-detail-content {
+    min-width: 0;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 4px;
+  }
   &__booking-field {
     min-width: 0;
   }

package/lib/components/radio/index.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Radio: (props: any) => import("react").JSX.Element;
 export default Radio;

package/lib/components/skeleton/index.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Skeleton: (props: any) => import("react").JSX.Element;
 export default Skeleton;

package/lib/components/table/Table/fields/date/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/fields/image/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: {
     field: {
         field_icon: string;

package/lib/components/table/Table/fields/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const fieldMaps: {
     text: {
         field: {

package/lib/components/table/Table/fields/link/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: {
     field: {
         field_icon: string;

package/lib/components/table/Table/fields/number/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/fields/numberRange/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/fields/oldRangePicker/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/fields/pSwitch/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const _default: {
     field: {
         field_icon: string;

package/lib/components/table/Table/fields/rangePicker/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/fields/search/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/fields/select/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/fields/text/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/table/Table/fields/treeSelect/index.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import filter from "./filterUtil";
 declare const _default: {
     field: {

package/lib/components/time-picker/index.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const TimePicker: (props: any) => import("react").JSX.Element;
 export default TimePicker;

package/lib/components/upload/index.d.ts CHANGED Viewed

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const Upload: (props: any) => import("react").JSX.Element;
 export default Upload;

package/lib/components/virtual-keyboard/Time/utils.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export declare const formatStringToTime: (value: string) => {
     valueArray: string[];
     valueString: string;

package/package.json CHANGED Viewed

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