cnhis-design-vue 3.1.11-beta.3 → 3.1.11-beta.4

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/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/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';
@@ -132,6 +133,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/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.3",
+  "version": "3.1.11-beta.4",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",