cnhis-design-vue 3.1.11-beta.2 → 3.1.11-beta.5

package/es/packages/chunk-upload/src/hooks/upload-computed.js

@@ -12,7 +12,7 @@ const UploadComputed = (props, state, config) => {
   };
   const handleProcessParams = (params, file) => {
     let res = {
-      channel,
+      channel: channel.value,
       md5: file.uniqueIdentifier,
       name: params.filename,
       chunk: params.chunkNumber - 1,
@@ -43,10 +43,12 @@ const UploadComputed = (props, state, config) => {
     };
   });
   const channel = computed(() => {
-    if (Object.keys(state.uploadConfig || {}).length === 0) {
+    let obj = state.uploadConfig;
+    if (Object.keys(obj || {}).length === 0) {
       return void 0;
     }
-    return props.uploaderType === "file" ? state.uploadConfig.fileChannel : state.uploadConfig.channel;
+    let res = props.uploaderType === "file" ? obj.fileChannel : obj.channel;
+    return res || obj.fileChannel;
   });
   const uploadArguments = computed(() => {
     return {

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -101,9 +101,14 @@ var script = /* @__PURE__ */ defineComponent({
       },
       resetFields(path = "*") {
         formModel.setFieldState(path, async (field) => {
+          var _a;
           if (isField(field)) {
-            field.value = field.initialValue;
-            await formModel.reset(field.path);
+            field.modified = false;
+            field.visited = false;
+            field.feedbacks = [];
+            field.selfModified = false;
+            field.caches = {};
+            field.value = (_a = field.initialValue) != null ? _a : null;
           }
         });
       }

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

@@ -1,13 +1,32 @@
+import { CSSProperties, PropType } from 'vue';
 export declare const COMPLEX: import("vue").DefineComponent<{
     span: {
         type: NumberConstructor;
         default: number;
     };
+    display: {
+        type: PropType<"flex" | "grid">;
+        default: string;
+    };
+    wrapperStyle: {
+        type: PropType<CSSProperties>;
+        default: () => {};
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     span: {
         type: NumberConstructor;
         default: number;
     };
+    display: {
+        type: PropType<"flex" | "grid">;
+        default: string;
+    };
+    wrapperStyle: {
+        type: PropType<CSSProperties>;
+        default: () => {};
+    };
 }>>, {
     span: number;
+    display: "flex" | "grid";
+    wrapperStyle: CSSProperties;
 }>;

package/es/packages/form-render/src/components/renderer/complex.js

@@ -7,11 +7,18 @@ const script = defineComponent({
     span: {
       type: Number,
       default: 6
+    },
+    display: {
+      type: String,
+      default: "grid"
+    },
+    wrapperStyle: {
+      type: Object,
+      default: () => ({})
     }
   },
   setup(props, {
-    slots,
-    attrs
+    slots
   }) {
     function onChange(e) {
       e.stopPropagation();
@@ -20,7 +27,8 @@ const script = defineComponent({
       return createVNode("section", {
         "class": "form-render__complex"
       }, [createVNode("section", {
-        "class": "form-render__complexContent",
+        "class": `form-render__complexContent--${props.display}`,
+        "style": props.wrapperStyle,
         "onChange": onChange
       }, [slots.default && slots.default()])]);
     };

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

@@ -3,6 +3,10 @@ export declare const LINEBAR: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    line: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     title: {
         type: StringConstructor;
         default: string;
@@ -16,6 +20,10 @@ export declare const LINEBAR: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    line: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     title: {
         type: StringConstructor;
         default: string;
@@ -28,4 +36,5 @@ export declare const LINEBAR: import("vue").DefineComponent<{
     disabled: boolean;
     show: boolean;
     title: string;
+    line: boolean;
 }>;

package/es/packages/form-render/src/components/renderer/linebar.js

@@ -1,6 +1,6 @@
-import { defineComponent, ref, onMounted, inject, createVNode } from 'vue';
+import { defineComponent, ref, onMounted, inject, createVNode, createTextVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
-import { NCollapseTransition } from 'naive-ui';
+import { NDivider, NCollapseTransition } from 'naive-ui';
 import { useFormField } from '../../../../../packages/form-render';
 import { InjectionFormItemDepsCollector, FormItemLineBarDepKeyPrepend } from '../../constants/index.js';
 
@@ -11,6 +11,10 @@ const script = defineComponent({
       type: Boolean,
       default: true
     },
+    line: {
+      type: Boolean,
+      default: false
+    },
     title: {
       type: String,
       default: ""
@@ -43,10 +47,18 @@ const script = defineComponent({
       return createVNode("section", {
         "class": "form-render__linebar",
         "anchor-target": true
-      }, [createVNode("header", {
+      }, [props.line ? createVNode(NDivider, {
+        "style": {
+          margin: "4px 0"
+        }
+      }, {
+        default() {
+          return [props.title];
+        }
+      }) : createVNode("header", {
         "class": "form-render__linebarHeader",
         "onClick": toggleShow
-      }, [props.title]), createVNode(NCollapseTransition, {
+      }, [createTextVNode(" "), props.title, createTextVNode(" ")]), createVNode(NCollapseTransition, {
         "class": "form-render__linebarItem",
         "show": _show.value
       }, slots)]);

package/es/packages/form-render/src/hooks/useFieldList2Schema.js

@@ -1,3 +1,4 @@
+import { pick } from 'lodash-es';
 import { arrayed, transformDateFormat } from '../utils/index.js';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
 import { isObject } from '@vueuse/core';
@@ -121,6 +122,7 @@ function useFieldList2Schema(collector) {
       title: item.alias || item.name,
       "x-component": "LINEBAR",
       "x-component-props": {
+        line: item.__line,
         disabled: item.is_not_fold === "1",
         id: item.val_key,
         show: !!item.is_show
@@ -132,6 +134,8 @@ function useFieldList2Schema(collector) {
     const properties = Array.isArray(item.properties) ? transform(item.properties) : {};
     schema.type = item.fieldType || "void";
     schema.properties = properties;
+    Object.assign(schema["x-decorator-props"], { showFeedback: false });
+    Object.assign(schema["x-component-props"], pick(item, ["wrapperStyle", "display"]));
     return schema;
   };
   const creatorMap = /* @__PURE__ */ new Map([

package/es/packages/form-render/src/hooks/useTypeNormalize.d.ts

@@ -1,4 +1,4 @@
-import { FieldItem } from "../types";
+import { FieldItem } from '../types';
 export declare function useTypeNormalize(): {
     normalize: (item: FieldItem) => void;
 };

package/es/packages/form-render/src/hooks/useTypeNormalize.js

@@ -16,13 +16,18 @@ function useTypeNormalize() {
     ["RADIO_BLOCK", "RADIO"],
     [["DATE-INPUT", "DATETIME-INPUT"], "DATE"],
     ["SWITCH_COMPONENT", "SWITCH"],
-    ["SLIDER_COMPONENT", "SLIDER"]
+    ["SLIDER_COMPONENT", "SLIDER"],
+    ["LINE_BREAKS", "LINEBAR"]
   ];
   function normalize(item) {
     const type = item.html_type;
-    if (["CHECK_BLOCK", "RADIO_BLOCK"].includes(item.html_type)) {
+    if (["CHECK_BLOCK", "RADIO_BLOCK"].includes(type)) {
       item.__vertical = true;
     }
+    if (["LINE_BREAKS"].includes(type)) {
+      item.__line = true;
+      item.is_show = "1";
+    }
     if (item.html_type === "AGE") {
       normalizeAgeField(item);
     }

package/es/packages/form-render/style/index.css

@@ -88,8 +88,12 @@
 .form-render__complex {
   width: 100%;
 }
-.form-render__complexContent {
+.form-render__complexContent--grid {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
+.form-render__complexContent--flex {
+  display: flex !important;
+  gap: 0 8px;
+}

package/es/packages/index.css

@@ -2704,8 +2704,12 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__complex {
   width: 100%;
 }
-.form-render__complexContent {
+.form-render__complexContent--grid {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
+.form-render__complexContent--flex {
+  display: flex !important;
+  gap: 0 8px;
+}

package/es/packages/scale-view/src/ScaleView.vue_vue_type_script_setup_true_lang.js

@@ -260,11 +260,14 @@ var script = /* @__PURE__ */ defineComponent({
     const confirmSubmit = (message2) => {
       dialog.warning({
         title: "\u6E29\u99A8\u63D0\u793A",
-        content: message2,
+        content: () => h("div", { style: {
+          paddingLeft: "30px"
+        } }, message2),
         positiveText: "\u786E\u5B9A",
         negativeText: "\u53D6\u6D88",
         maskClosable: false,
         closable: false,
+        positiveButtonProps: { type: "primary" },
         onPositiveClick: () => {
           onSubmitForm();
         },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.11-beta.2",
+  "version": "3.1.11-beta.5",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -26,7 +26,7 @@
   },
   "peerDependencies": {
     "naive-ui": "^2.29.0",
-    "vue": ">=3.2.0"
+    "vue": "^3.2.0"
   },
   "dependencies": {
     "@formily/core": "^2.1.9",