cnhis-design-vue 3.3.3-release.13 → 3.3.3-release.14

package/es/components/table-filter/src/components/classify-filter/index.vue2.js

@@ -2,10 +2,10 @@ import { createElementVNode, defineComponent, useAttrs, reactive, ref, provide,
 import { useMessage, NSpin, NInput, NIcon, NButton, NSelect, NTooltip } from 'naive-ui';
 import { CloseOutline, AddOutline, AddCircleSharp } from '@vicons/ionicons5';
 import ValueCfg from './ValueCfg.vue.js';
-import { ConditionEnums, DataTypeEnums } from '../../types/enums.js';
+import { ConditionEnums, DataTypeEnums, WidgetTypeEnums } from '../../types/enums.js';
 import { useDisplayCategory } from './hooks/useDisplayCategory.js';
 import { useFilterConditions } from './hooks/useFilterConditions.js';
-import { conditionOptions } from './helpers/options.js';
+import { dateConditionOptions, baseConditionOptions } from './helpers/options.js';
 import { InjectionClassifyFilterList } from '../../constants/index.js';
 
 const _hoisted_1 = {
@@ -93,6 +93,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const menuProps = {
       class: "classify-fieldkey-popover"
     };
+    const specialDateRange = [ConditionEnums.IN_THE_PAST, ConditionEnums.IN_THE_FUTURE, ConditionEnums.IN_THE_PAST_DI, ConditionEnums.IN_THE_FUTURE_DI];
     const $attrs = useAttrs();
     const FormState = reactive({
       className: "",
@@ -126,6 +127,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       initFilterConditions,
       getRawFilterConditions
     } = useFilterConditions(toRef(FormState, "filterConditions"), props.searchFieldList, DataTypeEnums.API);
+    const dateTypeList = [WidgetTypeEnums.DATE_RANGE_INNER, WidgetTypeEnums.DATETIME_RANGE_INNER];
+    function getOptions(key) {
+      const item = getParamCfg(key);
+      return dateTypeList.includes(item.type) ? dateConditionOptions : baseConditionOptions;
+    }
     function handleEditDisplayCategory(item) {
       item.disabled = false;
       setTimeout(() => {
@@ -203,7 +209,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           presetVal,
           customDate
         }) => {
-          return !key || !condition || condition === ConditionEnums.EQUAL && !value && !presetVal && !customDate;
+          return !key || !condition || condition === ConditionEnums.EQUAL && !value && !presetVal && !customDate || specialDateRange.includes(condition) && (!value || !presetVal);
         });
         if (isEmpty) {
           $message.warning(function() {
@@ -381,7 +387,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             value: item.condition,
             to: "body",
             filterable: "",
-            options: unref(conditionOptions),
+            options: getOptions(item.key),
             "onUpdate:value": ($event) => unref(updateCondition)(index, $event)
           }, null, 8, ["value", "options", "onUpdate:value"])) : createCommentVNode("v-if", true), createCommentVNode(function() {
             var _a, _b, _c;
@@ -390,7 +396,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             } catch (e) {
               return "\u81EA\u5B9A\u4E49";
             }
-          }()), item.key && item.condition && item.condition !== unref(ConditionEnums).NULL ? (openBlock(), createBlock(ValueCfg, {
+          }()), item.key && item.condition && item.condition !== unref(ConditionEnums).NULL && item.condition !== unref(ConditionEnums).NOT_NULL ? (openBlock(), createBlock(ValueCfg, {
             key: 1,
             modelValue: item.value,
             "onUpdate:modelValue": ($event) => item.value = $event,
@@ -400,8 +406,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             "onUpdate:isAccurate": ($event) => item.isAccurateSearch = $event,
             customDate: item.customDate,
             "onUpdate:customDate": ($event) => item.customDate = $event,
+            item,
             "param-cfg": unref(getParamCfg)(item.key)
-          }, null, 8, ["modelValue", "onUpdate:modelValue", "presetVal", "onUpdate:presetVal", "isAccurate", "onUpdate:isAccurate", "customDate", "onUpdate:customDate", "param-cfg"])) : createCommentVNode("v-if", true), createVNode(unref(NTooltip), {
+          }, null, 8, ["modelValue", "onUpdate:modelValue", "presetVal", "onUpdate:presetVal", "isAccurate", "onUpdate:isAccurate", "customDate", "onUpdate:customDate", "item", "param-cfg"])) : createCommentVNode("v-if", true), createVNode(unref(NTooltip), {
             title: function() {
               var _a, _b, _c;
               try {

package/es/components/table-filter/src/components/render-widget/components/DateInner.vue.d.ts

@@ -315,7 +315,7 @@ declare const _default: import("vue").DefineComponent<{
     value: string;
     placeholder: string;
     unit: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
 }>;
 export default _default;

package/es/components/table-filter/src/components/render-widget/components/DateOut.vue.d.ts

@@ -225,7 +225,7 @@ declare const _default: import("vue").DefineComponent<{
     type: ITypeDate;
     value: string;
     placeholder: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
 }>;
 export default _default;

package/es/components/table-filter/src/components/render-widget/components/DateRangeInner.vue.d.ts

@@ -336,8 +336,8 @@ declare const _default: import("vue").DefineComponent<{
     type: ITypeDate;
     value: string;
     unit: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
     startPlaceholder: string;
     endPlaceholder: string;
 }>;

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

@@ -420,8 +420,8 @@ declare const DateInner: import("vue").DefineComponent<{
     value: string;
     placeholder: string;
     unit: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
 }>;
 declare const DateOut: import("vue").DefineComponent<{
     componentCfg: {
@@ -647,8 +647,8 @@ declare const DateOut: import("vue").DefineComponent<{
     type: "date" | "datetime";
     value: string;
     placeholder: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
 }>;
 declare const DateRangeInner: import("vue").DefineComponent<{
     componentCfg: {
@@ -985,8 +985,8 @@ declare const DateRangeInner: import("vue").DefineComponent<{
     type: "date" | "datetime";
     value: string;
     unit: string;
-    clearable: boolean;
     valueFormat: string;
+    clearable: boolean;
     startPlaceholder: string;
     endPlaceholder: string;
 }>;

package/es/components/table-filter/src/components/render-widget/helpers/presetValToTimestamp.d.ts

@@ -1,3 +1,4 @@
 export declare const presetValToTimestamp: (presetVal: string, format?: string, isOrigin?: boolean) => any;
 export declare const formatDateRangeInfo: (key: string, format?: string, optionSetting?: string, isOrigin?: boolean) => string | number | any[];
+export declare const formatSpecialDateRange: (conObj: any, format?: string) => string;
 export declare const presetValToDateRangestr: (presetVal: string, format?: string) => string | null;

package/es/components/table-filter/src/components/render-widget/helpers/presetValToTimestamp.js

@@ -1,5 +1,5 @@
 import { DateRangeOutDefEnums, DatePresetValEnums, DateRangeInnerValEnums } from '../enums.js';
-import { WidgetOptionEnums } from '../../../types/enums.js';
+import { WidgetOptionEnums, ConditionEnums } from '../../../types/enums.js';
 import { dateDisabledCollect } from './dateDisabled.js';
 import moment from 'moment';
 
@@ -142,6 +142,27 @@ const formatDateRangeInfo = (key, format = "x", optionSetting = WidgetOptionEnum
   }
   return [];
 };
+const formatSpecialDateRange = (conObj, format = "x") => {
+  if (Array.isArray(conObj.value) && conObj.con && conObj.unit) {
+    const num = Number(conObj.value);
+    const unit = conObj.unit.toLowerCase();
+    switch (conObj.con) {
+      case ConditionEnums.IN_THE_PAST: {
+        return `${moment().subtract(num, unit).startOf("day").format(format)} ~ ${moment().format(format)}`;
+      }
+      case ConditionEnums.IN_THE_FUTURE: {
+        return `${moment().format(format)} ~ ${moment().add(num, unit).endOf("day").format(format)}`;
+      }
+      case ConditionEnums.IN_THE_PAST_DI: {
+        return `${moment().subtract(num, unit).startOf("day").format(format)} ~ ${moment().subtract(num, unit).endOf("day").format(format)}`;
+      }
+      case ConditionEnums.IN_THE_FUTURE_DI: {
+        return `${moment().add(num, unit).startOf("day").format(format)} ~ ${moment().add(num, unit).endOf("day").format(format)}`;
+      }
+    }
+  }
+  return "";
+};
 const dateRangeOutMap = new Map([...dateRangeMapInner, [DateRangeOutDefEnums.PAST_WEEK, () => [moment().subtract(6, "days").startOf("day"), moment().endOf("day")]], [DateRangeOutDefEnums.PAST_MONTH, () => [moment().subtract(1, "months").startOf("day"), moment().endOf("day")]], [DateRangeOutDefEnums.PAST_HALF_YEAR, () => [moment().subtract(6, "months").startOf("day"), moment().endOf("day")]]]);
 const presetValToDateRangestr = (presetVal, format = "x") => {
   if (!dateRangeOutMap.has(presetVal))
@@ -155,4 +176,4 @@ const presetValToDateRangestr = (presetVal, format = "x") => {
   return null;
 };
 
-export { formatDateRangeInfo, presetValToDateRangestr, presetValToTimestamp };
+export { formatDateRangeInfo, formatSpecialDateRange, presetValToDateRangestr, presetValToTimestamp };

package/es/components/table-filter/src/components/render-widget/widgetCfgMaps.d.ts

@@ -735,8 +735,8 @@ export declare const WidgetCfgMaps: Map<string, {
         value: string;
         placeholder: string;
         unit: string;
-        clearable: boolean;
         valueFormat: string;
+        clearable: boolean;
     }>;
     props: {
         type: string;
@@ -976,8 +976,8 @@ export declare const WidgetCfgMaps: Map<string, {
         type: "date" | "datetime";
         value: string;
         placeholder: string;
-        clearable: boolean;
         valueFormat: string;
+        clearable: boolean;
     }>;
     props: {
         type: string;
@@ -1328,8 +1328,8 @@ export declare const WidgetCfgMaps: Map<string, {
         type: "date" | "datetime";
         value: string;
         unit: string;
-        clearable: boolean;
         valueFormat: string;
+        clearable: boolean;
         startPlaceholder: string;
         endPlaceholder: string;
     }>;

package/es/components/table-filter/src/hooks/useAdvanced.js

@@ -1,6 +1,6 @@
-import { WidgetOptionEnums, WidgetTypeEnums, selectModeEnums, WidgetValEnums } from '../types/enums.js';
+import { WidgetOptionEnums, ConditionEnums, WidgetTypeEnums, selectModeEnums, WidgetValEnums } from '../types/enums.js';
 import { isString } from 'lodash-es';
-import { formatDateRangeInfo, presetValToTimestamp } from '../components/render-widget/helpers/presetValToTimestamp.js';
+import { formatSpecialDateRange, formatDateRangeInfo, presetValToTimestamp } from '../components/render-widget/helpers/presetValToTimestamp.js';
 import { DatePresetValEnums } from '../components/render-widget/enums.js';
 import { parseDateShortcuts } from '../tool/date.js';
 import moment from 'moment';
@@ -13,6 +13,7 @@ const advanceOptionSettingMap = {
   [WidgetOptionEnums.PAST_TIME]: "2",
   [WidgetOptionEnums.FUTURE_TIME]: "3"
 };
+const specialDateRange = [ConditionEnums.IN_THE_PAST, ConditionEnums.IN_THE_FUTURE, ConditionEnums.IN_THE_PAST_DI, ConditionEnums.IN_THE_FUTURE_DI];
 const limitValue = 10;
 function useAdvanced() {
   function transformDataToFieldCfg(advancedFilterCfg) {
@@ -153,10 +154,10 @@ function useAdvanced() {
           }
           if (conObj.unit && conObj.unit !== DatePresetValEnums.CUSTOM) {
             if (curQuickSearchObj.type === WidgetTypeEnums.DATE) {
-              curValue = curQuickSearchObj.rangeFilter ? formatDateRangeInfo(conObj.unit, "YYYY-MM-DD", curQuickSearchObj.optionType) : presetValToTimestamp(conObj.unit, "YYYY-MM-DD");
+              curValue = curQuickSearchObj.rangeFilter ? specialDateRange.includes(conObj.con) ? formatSpecialDateRange(conObj, "YYYY-MM-DD") : formatDateRangeInfo(conObj.unit, "YYYY-MM-DD", curQuickSearchObj.optionType) : presetValToTimestamp(conObj.unit, "YYYY-MM-DD");
             }
             if (curQuickSearchObj.type === WidgetTypeEnums.DATE_TIME) {
-              curValue = curQuickSearchObj.rangeFilter ? formatDateRangeInfo(conObj.unit, "YYYY-MM-DD HH:mm:ss", curQuickSearchObj.optionType) : presetValToTimestamp(conObj.unit, "YYYY-MM-DD HH:mm:ss");
+              curValue = curQuickSearchObj.rangeFilter ? specialDateRange.includes(conObj.con) ? formatSpecialDateRange(conObj, "YYYY-MM-DD HH:mm:ss") : formatDateRangeInfo(conObj.unit, "YYYY-MM-DD HH:mm:ss", curQuickSearchObj.optionType) : presetValToTimestamp(conObj.unit, "YYYY-MM-DD HH:mm:ss");
             }
           }
           if (conObj.customDate && conObj.unit === DatePresetValEnums.CUSTOM) {

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

@@ -81,4 +81,8 @@ export declare const WidgetValEnums: {
 export declare const ConditionEnums: {
     NULL: string;
     EQUAL: string;
+    IN_THE_PAST: string;
+    IN_THE_FUTURE: string;
+    IN_THE_PAST_DI: string;
+    IN_THE_FUTURE_DI: string;
 };

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

@@ -80,7 +80,11 @@ const WidgetValEnums = {
 };
 const ConditionEnums = {
   NULL: "NULL",
-  EQUAL: "EQ"
+  EQUAL: "EQ",
+  IN_THE_PAST: "IN_THE_PAST",
+  IN_THE_FUTURE: "IN_THE_FUTURE",
+  IN_THE_PAST_DI: "IN_THE_PAST_DI",
+  IN_THE_FUTURE_DI: "IN_THE_FUTURE_DI"
 };
 
 export { ConditionEnums, DataTypeEnums, FieldTypeEnums, MappingMethodEnums, WidgetOptionEnums, WidgetTypeEnums, WidgetValEnums, selectModeEnums };

package/es/shared/hooks/useDateTime.js

@@ -98,7 +98,7 @@ function handleFormatInput(target, format, selection, full) {
   if (selection) {
     start = start || result.length + 1;
     end = end || result.length + 1;
-    target.setSelectionRange(start, end);
+    setTimeout(() => target.setSelectionRange(start, end));
   }
   return changed;
 }

package/es/shared/package.json.js

@@ -1,9 +1,9 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-release.13";
+var version = "3.3.3-release.14";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",
-	vue: "^3.2.0"
+	vue: "^3.5.0"
 };
 var dependencies = {
 	"@vicons/ionicons5": "^0.12.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.3.3-release.13",
+	"version": "3.3.3-release.14",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -21,7 +21,7 @@
 		"@fullcalendar/scrollgrid": "^6.1.10",
 		"@fullcalendar/vue3": "^6.1.10",
 		"naive-ui": "^2.34.0",
-		"vue": "^3.2.0",
+		"vue": "^3.5.0",
 		"vxe-table": "^4.2.5"
 	},
 	"dependencies": {
@@ -57,7 +57,7 @@
 		"spark-md5": "^3.0.2",
 		"stompjs": "^2.3.3",
 		"tiny-svg": "^2.2.4",
-		"trtc-sdk-v5": "^5.5.2",
+		"trtc-sdk-v5": "5.12.0",
 		"v-viewer": "^3.0.10",
 		"video.js": "^7.19.2",
 		"videojs-contrib-hls": "^5.15.0",
@@ -74,5 +74,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "0639b4205414ae2dffde45ff1a94c5b10e018160"
+	"gitHead": "0268120b488aca500e66c427081bb45d41d7a646"
 }