cnhis-design-vue 3.3.3-beta.19 → 3.3.3-beta.22

package/es/components/table-filter/src/tool/date.js

@@ -0,0 +1,139 @@
+import moment from 'moment';
+
+function parseExpressions(expressions, format) {
+  if (!expressions || !Array.isArray(expressions)) {
+    console.warn("parseExpressions: \u8F93\u5165\u4E0D\u662F\u6570\u7EC4\uFF0C\u8FD4\u56DE\u7A7A\u503C");
+    return null;
+  }
+  return expressions.map((expr, index) => {
+    try {
+      if (expr === null || expr === void 0 || expr === "") {
+        console.warn(`parseExpressions: \u7D22\u5F15 ${index} \u7684\u8868\u8FBE\u5F0F\u4E3A\u7A7A\uFF0C\u8DF3\u8FC7`);
+        return null;
+      }
+      const exprStr = String(expr).trim();
+      const dateTimestamp = parseDateString(exprStr);
+      if (dateTimestamp !== null) {
+        return moment(Math.floor(dateTimestamp)).format(format);
+      }
+      const result = safeEval(exprStr);
+      if (!result)
+        return null;
+      if (typeof result === "number" && !isNaN(result)) {
+        return moment(Math.floor(result)).format(format);
+      } else {
+        console.warn(`parseExpressions: \u7D22\u5F15 ${index} \u7684\u8868\u8FBE\u5F0F "${exprStr}" \u6267\u884C\u7ED3\u679C\u4E0D\u662F\u6709\u6548\u6570\u5B57`);
+        return null;
+      }
+    } catch (error) {
+      console.error(`parseExpressions: \u89E3\u6790\u7D22\u5F15 ${index} \u7684\u8868\u8FBE\u5F0F\u65F6\u51FA\u9519:`, error == null ? void 0 : error.message);
+      return null;
+    }
+  }).filter(Boolean);
+}
+function isEffectiveTime(timestamp) {
+  return timestamp >= -22089888e5 && timestamp < 41024448e5;
+}
+function parseDateString(dateStr) {
+  if (/^\d+$/.test(dateStr)) {
+    const timestamp = parseInt(dateStr, 10);
+    return isEffectiveTime(timestamp) ? timestamp : null;
+  }
+  const datePatterns = [
+    /^(\d{4})-(\d{1,2})-(\d{1,2})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})$/,
+    /^(\d{4})-(\d{1,2})-(\d{1,2})\s+(\d{1,2}):(\d{1,2})$/,
+    /^(\d{4})-(\d{1,2})-(\d{1,2})$/,
+    /^(\d{4})-(\d{1,2})$/,
+    /^(\d{4})$/,
+    /^(\d{1,2}):(\d{1,2}):(\d{1,2})$/,
+    /^(\d{1,2}):(\d{1,2})$/
+  ];
+  for (let i = 0; i < datePatterns.length; i++) {
+    const pattern = datePatterns[i];
+    const match = dateStr.match(pattern);
+    if (match) {
+      let year, month, day, hour, minute, second;
+      if (i <= 4) {
+        year = parseInt(match[1], 10);
+        month = match[2] ? parseInt(match[2], 10) : 1;
+        day = match[3] ? parseInt(match[3], 10) : 1;
+        hour = match[4] ? parseInt(match[4], 10) : 0;
+        minute = match[5] ? parseInt(match[5], 10) : 0;
+        second = match[6] ? parseInt(match[6], 10) : 0;
+      } else {
+        const now = new Date();
+        year = now.getFullYear();
+        month = now.getMonth() + 1;
+        day = now.getDate();
+        hour = parseInt(match[1], 10);
+        minute = parseInt(match[2], 10);
+        second = match[3] ? parseInt(match[3], 10) : 0;
+      }
+      if (year < 1900 || year > 2100 || month < 1 || month > 12 || day < 1 || day > 31 || hour < 0 || hour > 23 || minute < 0 || minute > 59 || second < 0 || second > 59) {
+        return null;
+      }
+      try {
+        const date = new Date(year, month - 1, day, hour, minute, second);
+        if (date.getFullYear() === year && date.getMonth() === month - 1 && date.getDate() === day) {
+          return date.getTime();
+        }
+      } catch (error) {
+        return null;
+      }
+    }
+  }
+  return null;
+}
+function safeEval(expression) {
+  try {
+    const result = new Function("return " + expression)();
+    if (typeof result === "number" && !isNaN(result) && isFinite(result)) {
+      return isEffectiveTime(result) ? result : null;
+    } else {
+      console.warn(`safeEval: \u8868\u8FBE\u5F0F "${expression}" \u6267\u884C\u7ED3\u679C\u4E0D\u662F\u6709\u6548\u6570\u5B57`);
+      return null;
+    }
+  } catch (error) {
+    console.error(`safeEval: \u8868\u8FBE\u5F0F "${expression}" \u6267\u884C\u5931\u8D25:`, error == null ? void 0 : error.message);
+    return null;
+  }
+}
+function getTimestamp(list) {
+  if (!(list == null ? void 0 : list.length))
+    return [];
+  return list.map((v) => v === null ? null : new Date(v).getTime());
+}
+const parseDateShortcuts = (row) => {
+  const {
+    dateShortcuts,
+    optionSetting,
+    format = "YYYY-MM-DD HH:mm:ss"
+  } = row;
+  if (!(dateShortcuts == null ? void 0 : dateShortcuts.length))
+    return [];
+  return dateShortcuts == null ? void 0 : dateShortcuts.map((v) => {
+    const {
+      name,
+      expressions
+    } = v;
+    if (!name || !(expressions == null ? void 0 : expressions.length))
+      return null;
+    const resultExp = parseExpressions(expressions, format);
+    if (!(resultExp == null ? void 0 : resultExp.length)) {
+      return null;
+    }
+    if (expressions.length !== resultExp.length) {
+      console.warn("expressions\u4E2D\u5B58\u5728\u65E0\u6548\u503C");
+      return null;
+    }
+    return {
+      name,
+      value: JSON.stringify(expressions),
+      parseValue: resultExp,
+      unit: optionSetting,
+      timestamp: getTimestamp(resultExp)
+    };
+  }).filter(Boolean);
+};
+
+export { parseDateShortcuts };

package/es/components/table-filter/src/tool/transformData.d.ts

@@ -11,6 +11,7 @@ export declare const transformDataToFront: (dataType: string, rawData?: any[]) =
     type: any;
     optionSetting: any;
     openAdvancedFilter: any;
+    dateShortcuts: any;
     filterOutDisplay: any;
     filterOutRequired: any;
     width: any;

package/es/components/table-filter/src/tool/transformData.js

@@ -1,9 +1,9 @@
-import { DataTypeEnums, WidgetTypeEnums, WidgetOptionEnums } from '../types/enums.js';
+import { DataTypeEnums, WidgetTypeEnums, WidgetOptionEnums, WidgetValEnums } from '../types/enums.js';
 
 const transformDataToFront = (dataType, rawData = []) => {
   if (dataType === DataTypeEnums.API) {
     return rawData.map((data) => {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
       const optionList = (_b = (_a = data.optionInfo) == null ? void 0 : _a.list) != null ? _b : [];
       let customType = data.type;
       if (data.type === WidgetTypeEnums.LABEL) {
@@ -32,12 +32,13 @@ const transformDataToFront = (dataType, rawData = []) => {
         type: customType,
         optionSetting: data.optionType,
         openAdvancedFilter: data.isShowSearch,
+        dateShortcuts: (_g = data.dateShortcuts) != null ? _g : [],
         filterOutDisplay: data.filterExplicit,
         filterOutRequired: data.explicitRequired,
         width: data.width,
         defValCfg: {
-          value: data.type === WidgetTypeEnums.SELECT && data.optionType === WidgetOptionEnums.MULTIPLE ? (_h = (_g = data.defaultValue) == null ? void 0 : _g.valueList) != null ? _h : [] : (_k = (_j = (_i = data.defaultValue) == null ? void 0 : _i.valueList) == null ? void 0 : _j[0]) != null ? _k : null,
-          presetVal: data.type === WidgetTypeEnums.SELECT && data.optionType === WidgetOptionEnums.MULTIPLE ? ((_l = data.defaultValue) == null ? void 0 : _l.unit) ? [(_m = data.defaultValue) == null ? void 0 : _m.unit] : [] : (_o = (_n = data.defaultValue) == null ? void 0 : _n.unit) != null ? _o : null
+          value: data.type === WidgetTypeEnums.SELECT && data.optionType === WidgetOptionEnums.MULTIPLE ? (_i = (_h = data.defaultValue) == null ? void 0 : _h.valueList) != null ? _i : [] : (_l = (_k = (_j = data.defaultValue) == null ? void 0 : _j.valueList) == null ? void 0 : _k[0]) != null ? _l : null,
+          presetVal: data.type === WidgetTypeEnums.SELECT && data.optionType === WidgetOptionEnums.MULTIPLE ? ((_m = data.defaultValue) == null ? void 0 : _m.unit) ? [(_n = data.defaultValue) == null ? void 0 : _n.unit] : [] : (_p = (_o = data.defaultValue) == null ? void 0 : _o.unit) != null ? _p : null
         },
         mappingConfig: {
           mappingMethod: null,
@@ -124,7 +125,7 @@ const getParamCfg = (p_name, params) => {
 };
 const transformConditions = (rawConditions, params) => {
   return rawConditions.map((item) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const cfg = getParamCfg(item.field_key, params);
     let val = item.value;
     if (val && !Array.isArray(val)) {
@@ -139,7 +140,8 @@ const transformConditions = (rawConditions, params) => {
       condition: item.con,
       value,
       presetVal: (_b = item.unit) != null ? _b : null,
-      dynamicBaseList: (_c = item == null ? void 0 : item.dynamicBaseList) != null ? _c : []
+      customDate: (_c = item == null ? void 0 : item.customDate) != null ? _c : null,
+      dynamicBaseList: (_d = item == null ? void 0 : item.dynamicBaseList) != null ? _d : []
     };
     if (Object.keys(item).includes("isAccurateSearch")) {
       obj.isAccurateSearch = item.isAccurateSearch;
@@ -154,8 +156,9 @@ const transformRawConditions = (conditions) => {
       field_key: item.key,
       con: item.condition,
       value: Array.isArray(item.value) ? item.value : item.value ? [item.value] : [],
-      unit: item.presetVal,
-      dynamicBaseList: item.dynamicBaseList || []
+      unit: (item == null ? void 0 : item.customDate) ? WidgetValEnums.CUSTOM : item.presetVal,
+      dynamicBaseList: item.dynamicBaseList || [],
+      customDate: item == null ? void 0 : item.customDate
     };
     if (Object.keys(item).includes("isAccurateSearch")) {
       obj.isAccurateSearch = item.isAccurateSearch;

package/es/components/table-filter/src/types/enums.d.ts

@@ -45,6 +45,7 @@ export declare const WidgetOptionEnums: {
     SELECT_TIME: string;
     PAST_TIME: string;
     FUTURE_TIME: string;
+    CUSTOM_TIME: string;
 };
 export declare const WidgetValEnums: {
     CUSTOM: string;

package/es/components/table-filter/src/types/enums.js

@@ -44,7 +44,8 @@ const WidgetOptionEnums = {
   ALL: "DATETIME_WHOLE",
   SELECT_TIME: "DATETIME_SELECT",
   PAST_TIME: "DATETIME_PAST",
-  FUTURE_TIME: "DATETIME_FUTURE"
+  FUTURE_TIME: "DATETIME_FUTURE",
+  CUSTOM_TIME: "DATETIME_CUSTOM"
 };
 const WidgetValEnums = {
   CUSTOM: "CUSTOM",

package/es/components/table-filter/src/types/index.d.ts

@@ -93,6 +93,7 @@ export type ISearchConfigType = {
     isAccurateSearch?: boolean;
     accurateSearchKey?: string;
     dynamicBaseList?: any[];
+    customDate?: string;
 };
 export type ITreeDataType = {
     name: string;
@@ -148,6 +149,7 @@ export type IApiServerType = {
     componentProps?: any;
     extendKey?: string;
     extendType?: string;
+    dateShortcuts?: any[];
 };
 export type dynamicOptionInfoType = {
     filterKeys: string[];
@@ -212,6 +214,7 @@ export type IfilterConditionsType = {
     value: string;
     isAccurateSearch?: boolean;
     accurateSearchKey?: string;
+    customDate?: string;
 };
 export type ISearchParamsType = {
     field_key: string;
@@ -220,6 +223,7 @@ export type ISearchParamsType = {
     unit: 'custom' | null;
     widgetType?: string;
     dynamicBaseList?: any[];
+    dateShortcuts?: any[];
     isAccurateSearch?: boolean;
     accurateSearchKey?: string;
 };
@@ -243,3 +247,11 @@ export type IExtendConfigurationType = {
     _filterApiConfig: any;
     _selectCriticalNum?: number;
 };
+export type ICustomDateType = {
+    name: string;
+    label: string;
+    unit: string;
+    value: string;
+    parseValue: any[];
+    timestamp: number[];
+};

package/es/env.d.ts

@@ -1,25 +1,25 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TYPE: string;
-  // 更多环境变量...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
-
-declare module '*.vue' {
-// @ts-ignore
-  import type { App, defineComponent } from 'vue';
-  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
-  // // const component: DefineComponent<{}, {}, any>
-  const component: ReturnType<typeof defineComponent> & {
-    install(app: App): void;
-  };
-  // @ts-ignore
-  export default component;
-}
-
-declare module '*.js';
-
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_APP_TYPE: string;
+  // 更多环境变量...
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
+declare module '*.vue' {
+// @ts-ignore
+  import type { App, defineComponent } from 'vue';
+  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  // // const component: DefineComponent<{}, {}, any>
+  const component: ReturnType<typeof defineComponent> & {
+    install(app: App): void;
+  };
+  // @ts-ignore
+  export default component;
+}
+
+declare module '*.js';
+

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-beta.19";
+var version = "3.3.3-beta.22";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.3.3-beta.19",
+	"version": "3.3.3-beta.22",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "07ccd77e5ef62217c6c80d4881db82f9641c9252"
+	"gitHead": "bcb99abde9f0704e4e535eee1bbc4ccce1e46953"
 }