cnhis-design-vue 3.4.0-beta.22 → 3.4.0-beta.26

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

@@ -28,7 +28,7 @@ function useOther(canvas, propItems, emits, computedX, computedY, fixedNoRisePoi
   function handleCrossDayLayout(currentTime, lastLeft, eventList) {
     const newLeft = lastLeft + xCellWidth;
     const nextTime = getXValue(newLeft);
-    if (isCrossDay(currentTime, nextTime)) {
+    if (!(other == null ? void 0 : other.allowCrossDay) && isCrossDay(currentTime, nextTime)) {
       adjustEventsForCrossDay(eventList);
       return lastLeft;
     } else {

package/es/components/fabric-chart/src/interface.d.ts

@@ -95,6 +95,7 @@ interface IOther {
     highlightColor?: string;
     eventHighlight?: boolean;
     splitLineNumber?: number;
+    allowCrossDay?: boolean;
     list: Array<IPoint>;
 }
 export interface IDate {

package/es/components/field-set/src/FieldColor.vue2.js

@@ -179,7 +179,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => data.value = $event),
         animation: "150",
         "item-key": "id",
-        draggable: ".item"
+        draggable: ".item",
+        handle: ".drag-icon"
       }, {
         item: withCtx(({
           element,

package/es/components/field-set/src/FieldFilter.vue2.js

@@ -243,7 +243,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => data.value = $event),
         animation: "150",
         "item-key": "id",
-        draggable: ".item"
+        draggable: ".item",
+        handle: ".drag-icon"
       }, {
         item: withCtx(({
           element,

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -294,7 +294,7 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     getShowColumn: (column: AnyObject) => boolean;
     initFields: () => (AnyObject | AnyObject[])[];
     handleGroup: (fields: AnyObject[]) => (AnyObject | AnyObject[])[];
-    getTableFields: () => import("lodash").Omit<never, "uuid">[];
+    getTableFields: () => import("lodash").Omit<AnyObject, "uuid">[];
     handleSearch: () => void;
     isHighlight: (element: FieldSetItem) => boolean | undefined;
     handleAllCheck: (checked: boolean, field: string) => void;

package/es/components/field-set/src/FieldSet.vue2.js

@@ -538,6 +538,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "item-key": "id",
         filter: ".disabled",
         draggable: ".item",
+        handle: ".drag-icon",
         move: onMove,
         disabled: !__props.rowDraggable,
         key: resetKey.value

package/es/components/field-set/src/components/table-row.vue2.js

@@ -354,6 +354,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           trigger: "hover"
         }, {
           trigger: withCtx(() => [createVNode(unref(NIcon), {
+            class: "drag-icon",
             style: {
               "margin-right": "5px",
               "top": "2px"

package/es/components/form-render/src/components/renderer/textarea.d.ts

@@ -4,7 +4,7 @@ export declare const TEXTAREA: import("vue").DefineComponent<import("vue").Extra
         type: StringConstructor;
     };
     rows: {
-        type: NumberConstructor;
+        type: (NumberConstructor | StringConstructor)[];
     };
     onChange: {};
     updateKey: {};
@@ -17,7 +17,7 @@ export declare const TEXTAREA: import("vue").DefineComponent<import("vue").Extra
         type: StringConstructor;
     };
     rows: {
-        type: NumberConstructor;
+        type: (NumberConstructor | StringConstructor)[];
     };
     onChange: {};
     updateKey: {};

package/es/components/form-render/src/components/renderer/textarea.js

@@ -22,7 +22,7 @@ const script = /* @__PURE__ */ defineComponent({
       type: String
     },
     rows: {
-      type: Number
+      type: [Number, String]
     },
     onChange: {},
     updateKey: {},

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/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.22";
+var version = "3.4.0-beta.26";
 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.22",
+	"version": "3.4.0-beta.26",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "10bb1fa64ad98cbec8b8fdfbdbca6b4ed52dd771"
+	"gitHead": "684368874b6abd15ad635b0eeb8188ad82e230a8"
 }