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

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/table-export-field/src/components/SaveProjectModal.vue2.js

@@ -104,7 +104,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function getParams() {
       const schemeName = formValue.projectName.trim();
-      const exportPath = formValue.exportPath.trim();
+      const exportPath = encodeURIComponent(formValue.exportPath.trim());
       const {
         fieldKeys,
         schemeId
@@ -146,7 +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) || "";
+        formValue.exportPath = decodeURIComponent((program == null ? void 0 : program.exportPath) || "");
         switch (program.schemeId) {
           case defaultKey:
             projectList.value = modeList.filter((mode) => mode.value === "addProject");

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.4.0-beta.24";
+var version = "3.4.0-beta.27";
 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.24",
+	"version": "3.4.0-beta.27",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "f487bb4dea0c9ebe6a9f0965fea2e32eae425c8d"
+	"gitHead": "14f88c4540a6317ddad15c76d23b88f07632ae24"
 }