@pisell/materials 2.2.37 → 2.2.39

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

@@ -5,11 +5,11 @@
     display: flex;
     align-items: center;
     gap: 8px;
-    padding-right: 24px;
+    padding-right: 0 !important;
   }
 
   &-product-options-header {
-    align-items: initial;
+    align-items: normal;
   }
 
   &-product-delete {
@@ -45,6 +45,7 @@
     line-height: 24px;
     display: flex;
     flex-direction: column;
+    padding-right: 24px;
   }
 
   &-product-title-price {

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

@@ -1,4 +1,7 @@
 import dayjs from 'dayjs';
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/en';
+import 'dayjs/locale/zh-tw';
 declare type RType = (url: string, data?: {} | undefined, config?: {} | undefined) => Promise<any>;
 declare class Request {
     private request;

package/es/components/productCard/utils.js

@@ -16,6 +16,9 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import dayjs from 'dayjs';
 import { locales } from '@pisell/utils';
 import { intersectionBy } from 'lodash';
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/en';
+import 'dayjs/locale/zh-tw';
 var Request = /*#__PURE__*/function () {
   function Request() {
     _classCallCheck(this, Request);
@@ -149,7 +152,13 @@ export var getServiceTime = function getServiceTime(item, currentDate) {
   if (!currentDate || !(item !== null && item !== void 0 && (_item$_extend = item._extend) !== null && _item$_extend !== void 0 && _item$_extend.start_time) || !dayjs(currentDate).isValid()) return '';
   var locale = (item === null || item === void 0 ? void 0 : item.locale) || 'en-US';
   var isEn = locale === 'en-US' || locale === 'en';
-  dayjs.locale(locale);
+  var localeTypes = {
+    'en-US': 'en',
+    'zh-CN': 'zh-cn',
+    'zh-HK': 'zh-tw'
+  };
+  dayjs.locale(localeTypes[locale]);
+  console.log(locale, 'wh_locale');
   var startDate = dayjs((currentDate === null || currentDate === void 0 ? void 0 : currentDate.format('YYYY-MM-DD')) + ' ' + getServeStartTime(item === null || item === void 0 ? void 0 : (_item$_extend2 = item._extend) === null || _item$_extend2 === void 0 ? void 0 : _item$_extend2.start_time));
   var startTime = startDate.format('HH:mm');
 

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

@@ -155,7 +155,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 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/productCard/components/Header/index.less

@@ -5,11 +5,11 @@
     display: flex;
     align-items: center;
     gap: 8px;
-    padding-right: 24px;
+    padding-right: 0 !important;
   }
 
   &-product-options-header {
-    align-items: initial;
+    align-items: normal;
   }
 
   &-product-delete {
@@ -45,6 +45,7 @@
     line-height: 24px;
     display: flex;
     flex-direction: column;
+    padding-right: 24px;
   }
 
   &-product-title-price {

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

@@ -1,4 +1,7 @@
 import dayjs from 'dayjs';
+import 'dayjs/locale/zh-cn';
+import 'dayjs/locale/en';
+import 'dayjs/locale/zh-tw';
 declare type RType = (url: string, data?: {} | undefined, config?: {} | undefined) => Promise<any>;
 declare class Request {
     private request;

package/lib/components/productCard/utils.js

@@ -60,6 +60,9 @@ module.exports = __toCommonJS(utils_exports);
 var import_dayjs = __toESM(require("dayjs"));
 var import_utils = require("@pisell/utils");
 var import_lodash = require("lodash");
+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 Request = class {
   constructor() {
     this.request = {};
@@ -142,7 +145,13 @@ var getServiceTime = (item, currentDate) => {
     return "";
   const locale = (item == null ? void 0 : item.locale) || "en-US";
   const isEn = locale === "en-US" || locale === "en";
-  import_dayjs.default.locale(locale);
+  const localeTypes = {
+    "en-US": "en",
+    "zh-CN": "zh-cn",
+    "zh-HK": "zh-tw"
+  };
+  import_dayjs.default.locale(localeTypes[locale]);
+  console.log(locale, "wh_locale");
   const startDate = (0, import_dayjs.default)(
     (currentDate == null ? void 0 : currentDate.format("YYYY-MM-DD")) + " " + getServeStartTime((_b = item == null ? void 0 : item._extend) == null ? void 0 : _b.start_time)
   );

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

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

package/package.json

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