cnhis-design-vue 3.4.0-beta.20 → 3.4.0-beta.24

package/es/components/fabric-chart/src/hooks/temperature/useOther.js

@@ -1,6 +1,6 @@
 import { fabric } from '../../../../../shared/utils/fabricjs/index.js';
 import { drawLine, defaultStyle } from '../useDraw.js';
-import { parse, isBefore, addDays, getDate } from 'date-fns';
+import { parse } from 'date-fns';
 import { last, cloneDeep } from 'lodash-es';
 import '../useEvent.js';
 import '../useShadow.js';
@@ -25,12 +25,12 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
   };
   const _yCellHeight = getYCellHeight();
   let textDiff = 0;
-  function handleCrossDayLayout(currentTime, itemLeft, lastLeft, eventList) {
-    const newLeft = itemLeft + xCellWidth;
+  function handleCrossDayLayout(currentTime, lastLeft, eventList) {
+    const newLeft = lastLeft + xCellWidth;
     const nextTime = getXValue(newLeft);
     if (isCrossDay(currentTime, nextTime)) {
       adjustEventsForCrossDay(eventList);
-      return itemLeft;
+      return lastLeft;
     } else {
       return lastLeft + xCellWidth;
     }
@@ -96,7 +96,7 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
       item.vertical.forEach((v, i) => {
         var _a2, _b2, _c, _d, _e;
         const baseTop = (v.baseTop || 0) * yCellHeight;
-        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.left) || 0;
+        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.trueLeft) || 0;
         if (i === 0 && item.left <= lastLeft) {
           leftX = lastLeft + xCellWidth;
         }
@@ -124,9 +124,9 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
         var _a2, _b2;
         const topY2 = vitalSignsOriginY.originY + (v.baseTop || 0) * yCellHeight;
         fixedTopY = fixedTop;
-        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.left) || 0;
+        const lastLeft = ((_a2 = last(list)) == null ? void 0 : _a2.trueLeft) || 0;
         if (item.left <= lastLeft + 0.1) {
-          leftX = handleCrossDayLayout(v.time, item.left, lastLeft, list);
+          leftX = handleCrossDayLayout(v.time, lastLeft, list);
         }
         if (String(v.value).length) {
           list.push(drawEventText(v, leftX, topY2));
@@ -223,10 +223,9 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
 function isCrossDay(dateStr1, dateStr2) {
   const date1 = parse(dateStr1, "yyyy-MM-dd HH:mm", new Date());
   const date2 = parse(dateStr2, "yyyy-MM-dd HH:mm", new Date());
-  const earlierDate = isBefore(date1, date2) ? date1 : date2;
-  const laterDate = isBefore(date1, date2) ? date2 : date1;
-  const earlierDatePlusOneDay = addDays(earlierDate, 1);
-  return getDate(earlierDatePlusOneDay) === getDate(laterDate);
+  const date1String = `${date1.getFullYear()}-${date1.getMonth()}-${date1.getDate()}`;
+  const date2String = `${date2.getFullYear()}-${date2.getMonth()}-${date2.getDate()}`;
+  return date1String !== date2String;
 }
 
 export { useOther };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/dateRendererPlugin/index.js

@@ -39,7 +39,7 @@ function dateRendererPlugin() {
       });
     },
     apply(hooks) {
-      useAutoFocus().bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.DATE, ".n-input__input-el", {
+      useAutoFocus(hooks).bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.DATE, ".n-input__input-el", {
         after: (fieldItem) => {
           Reflect.set(fieldItem.editRender, "autoselect", true);
           return fieldItem;

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/hooks/useAutoFocus.js

@@ -4,6 +4,31 @@ function useAutoFocus(hooks) {
     after,
     focusType = "function"
   } = {}) {
+    hooks.fieldHooks.field.tap(pluginName, (fieldItem) => {
+      var _a;
+      function createAutoFocusFn(selector2) {
+        const autofocusFn = ({ cell } = {}) => {
+          var _a2;
+          const ele = cell && cell.querySelector(selector2);
+          ele && (ele.click(), (_a2 = ele.focus) == null ? void 0 : _a2.call(ele));
+          return ele;
+        };
+        autofocusFn.toString = () => selector2;
+        return autofocusFn;
+      }
+      if (((_a = fieldItem.editRender) == null ? void 0 : _a.name) === type) {
+        fieldItem = before ? before(fieldItem) : fieldItem;
+        if (fieldItem.editRender && !Reflect.has(fieldItem.editRender, "autofocus")) {
+          Reflect.set(
+            fieldItem.editRender,
+            "autofocus",
+            focusType === "class" ? selector : focusType === "function" ? createAutoFocusFn(selector) : void 0
+          );
+        }
+        return after ? after(fieldItem) : fieldItem;
+      }
+      return fieldItem;
+    });
   }
   return { bindAutoFocusConfig };
 }

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/inputRendererPlugin.js

@@ -97,7 +97,7 @@ function inputRendererPlugin() {
       });
     },
     apply(hooks) {
-      useAutoFocus().bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.INPUT, ".n-input__input-el,.n-input__textarea-el", {
+      useAutoFocus(hooks).bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.INPUT, ".n-input__input-el,.n-input__textarea-el", {
         focusType: "class"
       });
     }

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/levelSearchCascadePlugin/index.js

@@ -81,7 +81,7 @@ function levelSearchCascadePlugin() {
       });
     },
     apply(hooks) {
-      useAutoFocus().bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.LEVEL_SEARCH_CASCADE, "input");
+      useAutoFocus(hooks).bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.LEVEL_SEARCH_CASCADE, "input");
     }
   });
 }

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/numberRendererPlugin.js

@@ -93,7 +93,7 @@ function numberRendererPlugin() {
       });
     },
     apply(hooks) {
-      useAutoFocus().bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.NUMBER, ".n-input__input-el", {
+      useAutoFocus(hooks).bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.NUMBER, ".n-input__input-el", {
         focusType: "class"
       });
     }

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/index.js

@@ -96,7 +96,7 @@ function selectRendererPlugin() {
       });
     },
     apply(hooks) {
-      useAutoFocus().bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.SELECT, ".n-base-selection-input,.n-base-selection-tags");
+      useAutoFocus(hooks).bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.SELECT, ".n-base-selection-input,.n-base-selection-tags");
       hooks.fieldHooks.fieldList.tap(pluginName, (fieldList, {
         uuid
       }) => {

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/index.js

@@ -96,7 +96,7 @@ function separateRendererPlugins() {
       });
     },
     apply(hooks) {
-      useAutoFocus().bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.SEPARATE, ".iho-table__separateText");
+      useAutoFocus(hooks).bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.SEPARATE, ".iho-table__separateText,.n-input__input-el,.n-input__textarea-el");
       hooks.eventHooks.onEditClosed.tap(pluginName, ({
         row,
         column,

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/timeRendererPlugin/index.js

@@ -36,7 +36,7 @@ function timeRendererPlugin() {
       });
     },
     apply(hooks) {
-      useAutoFocus().bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.TIME, ".n-input__input-el", {
+      useAutoFocus(hooks).bindAutoFocusConfig(pluginName, EDITABLE_WIDGET_TYPE.TIME, ".n-input__input-el", {
         after: (fieldItem) => {
           Reflect.set(fieldItem.editRender, "autoselect", true);
           return fieldItem;

package/es/components/shortcut-provider/src/hooks/useShortcuts.d.ts

@@ -10,12 +10,14 @@ export declare class ShortcutManager {
     static log(message: string, dryRun?: boolean): string;
     constructor(environmentEle?: MaybeRef<HTMLElement | undefined>, scope?: string | Symbol);
     get traverse(): Omit<ShortcutItem, "callback">[];
+    remove(key: string): void;
     private query;
     update(key: string, info: KeyboardEvent | Partial<ShortcutSignatureInfo>): Promise<void>;
     register(shortcutItem: ShortcutItem): {
         stop: () => void;
         start: () => void;
         signature: () => string;
+        remove: () => void;
     };
     start(): this;
     destroy(): void;
@@ -26,6 +28,7 @@ export declare function useShortcuts(scope?: MaybeRef<string | Symbol | undefine
         stop: () => void;
         signature: () => string;
         start: () => void;
+        remove: () => void;
     };
     traverse: () => Omit<ShortcutItem, "callback">[];
     clear: () => void;

package/es/components/shortcut-provider/src/hooks/useShortcuts.js

@@ -23,6 +23,10 @@ class ShortcutManager {
   get traverse() {
     return [...Object.values(this.shortcutCache.value)].sort((a, b) => (a.order || 0) - (b.order || 0));
   }
+  remove(key) {
+    Reflect.deleteProperty(this.shortcutCache.value, key);
+    this.shortcutCallbackMap.delete(key);
+  }
   query(key) {
     return this.shortcutCache.value[key];
   }
@@ -61,6 +65,7 @@ class ShortcutManager {
     }
     this.shortcutCache.value[shortcutItem.key] = omit(shortcutItem, ["callback"]);
     this.shortcutCallbackMap.set(shortcutItem.currentKeySignature, shortcutItem.callback);
+    const that = this;
     return createHandler(this.shortcutCache.value[shortcutItem.key]);
     function createHandler(shortcut) {
       return {
@@ -70,7 +75,8 @@ class ShortcutManager {
         start: () => {
           shortcut.status = ShortcutStatus.ACTIVE;
         },
-        signature: () => shortcut.currentKeySignature
+        signature: () => shortcut.currentKeySignature,
+        remove: () => that.remove(shortcut.key)
       };
     }
   }
@@ -171,7 +177,7 @@ function useShortcuts(scope) {
     }
   }
   function register(shortcut) {
-    const { stop, signature, start } = unref(manager).register(createShortcutItem(shortcut));
+    const { stop, signature, start, remove } = unref(manager).register(createShortcutItem(shortcut));
     if (getCurrentInstance()) {
       onBeforeUnmount(stop);
       onDeactivated(stop);
@@ -179,7 +185,7 @@ function useShortcuts(scope) {
     } else {
       onceRegisterWarn();
     }
-    return { stop, signature, start };
+    return { stop, signature, start, remove };
   }
   function traverse() {
     return unref(manager).traverse;

package/es/components/shortcut-setter/index.d.ts

@@ -30,6 +30,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<impor
             stop: () => void;
             signature: () => string;
             start: () => void;
+            remove: () => void;
         };
         traverse: () => Omit<import("..").ShortcutItem, "callback">[];
         clear: () => void;

package/es/components/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -33,6 +33,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             stop: () => void;
             signature: () => string;
             start: () => void;
+            remove: () => void;
         };
         traverse: () => Omit<import("../../../components/shortcut-provider").ShortcutItem, "callback">[];
         clear: () => void;

package/es/components/table-export-field/index.d.ts

@@ -50,22 +50,26 @@ declare const TableExportField: SFCWithInstall<import("vue").DefineComponent<imp
         schemeName: string;
         fieldKeys: string[];
         updatedTime?: string | undefined;
+        exportPath?: string | undefined;
     }, import("./src/types").IExportSchemeType | {
         schemeId: string;
         schemeName: string;
         fieldKeys: string[];
         updatedTime?: string | undefined;
+        exportPath?: string | undefined;
     }>;
     programOptions: import("vue").Ref<{
         schemeId: string;
         schemeName: string;
         fieldKeys: string[];
         updatedTime?: string | undefined;
+        exportPath?: string | undefined;
     }[], import("./src/types").IExportSchemeType[] | {
         schemeId: string;
         schemeName: string;
         fieldKeys: string[];
         updatedTime?: string | undefined;
+        exportPath?: string | undefined;
     }[]>;
     downLoadFieldList: import("vue").Ref<any[], any[]>;
     showAllFieldList: import("vue").Ref<any[], any[]>;
@@ -371,7 +375,6 @@ declare const TableExportField: SFCWithInstall<import("vue").DefineComponent<imp
         selectProject: import("vue").Ref<any, any>;
         projectList: import("vue").Ref<any[], any[]>;
         exportApiConfig: import("../../shared/types").AnyObject;
-        isHoEdge: import("vue").ComputedRef<any>;
         handleRadioChange: (value: string | number | boolean) => void;
         validateProjectName: () => boolean;
         getParams: () => {

package/es/components/table-export-field/src/components/ExportModal.vue2.js

@@ -116,6 +116,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           lastUsedSchemeName: curOption ? curOption.schemeName : "",
           schemeId: curOption ? curOption.schemeId : "",
           schemeName: curOption ? curOption.schemeName : "",
+          exportPath: (curOption == null ? void 0 : curOption.exportPath) || "",
           tableListId: props.tableListId
         };
         let res = await exportTableListScheme(params, exportApiConfig);

package/es/components/table-export-field/src/components/SaveProjectModal.vue.d.ts

@@ -69,7 +69,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     selectProject: import("vue").Ref<any, any>;
     projectList: import("vue").Ref<any[], any[]>;
     exportApiConfig: import("../../../../shared/types").AnyObject;
-    isHoEdge: import("vue").ComputedRef<any>;
     handleRadioChange: (value: string | number | boolean) => void;
     validateProjectName: () => boolean;
     getParams: () => {

package/es/components/table-export-field/src/components/SaveProjectModal.vue2.js

@@ -1,12 +1,11 @@
 import { i18n } from '../../../../_virtual/_virtual_i18n-methods.js';
-import { defineComponent, ref, reactive, inject, computed, watch, openBlock, createBlock, unref, withCtx, createVNode, createElementVNode, createTextVNode, createElementBlock, Fragment, renderList, toDisplayString, createCommentVNode } from 'vue';
+import { defineComponent, ref, reactive, inject, watch, openBlock, createBlock, unref, withCtx, createVNode, createElementVNode, createTextVNode, createElementBlock, Fragment, renderList, toDisplayString } from 'vue';
 import { useMessage, NModal, NCard, NIcon, NButton, NRadioGroup, NRadio, NForm, NFormItem, NInput } from 'naive-ui';
 import { CloseOutline } from '@vicons/ionicons5';
 import { InjectionExportApiConfig } from '../constants/index.js';
 import useAsyncData from '../hooks/useAsyncData.js';
 import { dragFieldCheckList } from '../tool.js';
 import { cloneDeep } from 'lodash-es';
-import { hoEdge } from '../../../../shared/utils/ho-edge.js';
 
 const _hoisted_1 = {
   class: "svg-wrap"
@@ -17,6 +16,13 @@ const _hoisted_2 = {
 const _hoisted_3 = {
   class: "save-project-content"
 };
+const _hoisted_4 = {
+  style: {
+    "width": "100%",
+    "display": "flex",
+    "flex-direction": "column"
+  }
+};
 const defaultKey = "default";
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "SaveProjectModal",
@@ -74,10 +80,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const selectProject = ref();
     const projectList = ref([]);
     const exportApiConfig = inject(InjectionExportApiConfig);
-    const isHoEdge = computed(() => {
-      var _a;
-      return (_a = hoEdge) == null ? void 0 : _a.webview;
-    });
     function handleRadioChange(value) {
       selectProject.value = value;
     }
@@ -128,18 +130,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         if (validateProjectName()) {
           return;
         }
-        const exportPath = formValue.exportPath.trim();
-        const {
-          schemeId
-        } = props.curProgram;
-        const hoEdgeParams = {
-          "exec": "saveconf",
-          "data": {
-            "key": selectProject.value === "updateProject" ? schemeId : `${defaultKey}_schemeId`,
-            "value": exportPath
-          }
-        };
-        await hoEdge.postMsg(hoEdgeParams);
         const params = getParams();
         let res = await saveTableListExportScheme(params, exportApiConfig);
         if (res) {
@@ -156,6 +146,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     watch(() => props.visible, async (isShow) => {
       if (isShow) {
         const program = props.curProgram;
+        formValue.exportPath = (program == null ? void 0 : program.exportPath) || "";
         switch (program.schemeId) {
           case defaultKey:
             projectList.value = modeList.filter((mode) => mode.value === "addProject");
@@ -168,16 +159,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             formValue.projectName = program.schemeName;
             break;
         }
-        const hoEdgeParams = {
-          "exec": "getconf",
-          "data": {
-            "key": selectProject.value === "updateProject" ? program.schemeId : `${defaultKey}_schemeId`
-          }
-        };
-        const getHoEdgeData = await hoEdge.postMsg(hoEdgeParams);
-        if (getHoEdgeData == null ? void 0 : getHoEdgeData.result) {
-          formValue.exportPath = (getHoEdgeData == null ? void 0 : getHoEdgeData.res) || "";
-        }
       }
     }, {
       immediate: true
@@ -253,19 +234,23 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 maxlength: "100"
               }, null, 8, ["value"])]),
               _: 1
-            }), isHoEdge.value ? (openBlock(), createBlock(unref(NFormItem), {
-              key: 0,
+            }), createVNode(unref(NFormItem), {
               label: i18n("10010.1.683", "\u5BFC\u51FA\u8DEF\u5F84"),
               path: "exportPath"
             }, {
-              default: withCtx(() => [createVNode(unref(NInput), {
+              default: withCtx(() => [createElementVNode("div", _hoisted_4, [createVNode(unref(NInput), {
                 value: formValue.exportPath,
                 "onUpdate:value": _cache[2] || (_cache[2] = ($event) => formValue.exportPath = $event),
                 placeholder: i18n("10010.1.684", "\u8BF7\u8F93\u5165\u5BFC\u51FA\u8DEF\u5F84"),
                 clearable: ""
-              }, null, 8, ["value"])]),
+              }, null, 8, ["value"]), _cache[5] || (_cache[5] = createElementVNode("span", {
+                style: {
+                  "margin-top": "3px",
+                  "color": "#d03050"
+                }
+              }, "\u5F53\u524D\u914D\u7F6E\u4EC5\u7528\u4E8E\u5C01\u88C5\u6D4F\u89C8\u5668", -1))])]),
               _: 1
-            })) : createCommentVNode("v-if", true)]),
+            })]),
             _: 1
           }, 8, ["model"])])]),
           _: 1

package/es/components/table-export-field/src/index.vue.d.ts

@@ -51,22 +51,26 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         schemeName: string;
         fieldKeys: string[];
         updatedTime?: string | undefined;
+        exportPath?: string | undefined;
     }, IExportSchemeType | {
         schemeId: string;
         schemeName: string;
         fieldKeys: string[];
         updatedTime?: string | undefined;
+        exportPath?: string | undefined;
     }>;
     programOptions: import("vue").Ref<{
         schemeId: string;
         schemeName: string;
         fieldKeys: string[];
         updatedTime?: string | undefined;
+        exportPath?: string | undefined;
     }[], IExportSchemeType[] | {
         schemeId: string;
         schemeName: string;
         fieldKeys: string[];
         updatedTime?: string | undefined;
+        exportPath?: string | undefined;
     }[]>;
     downLoadFieldList: import("vue").Ref<any[], any[]>;
     showAllFieldList: import("vue").Ref<any[], any[]>;
@@ -372,7 +376,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         selectProject: import("vue").Ref<any, any>;
         projectList: import("vue").Ref<any[], any[]>;
         exportApiConfig: import("../../../shared/types").AnyObject;
-        isHoEdge: import("vue").ComputedRef<any>;
         handleRadioChange: (value: string | number | boolean) => void;
         validateProjectName: () => boolean;
         getParams: () => {

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

@@ -3,4 +3,5 @@ export type IExportSchemeType = {
     schemeName: string;
     fieldKeys: string[];
     updatedTime?: string;
+    exportPath?: string;
 };

package/es/shared/package.json.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-beta.20",
+	"version": "3.4.0-beta.24",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "5fb113aa91c1485451ca4c4e2887694a0f4c1a50"
+	"gitHead": "f487bb4dea0c9ebe6a9f0965fea2e32eae425c8d"
 }