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

package/es/packages/chunk-upload/src/chunk-upload-new.vue.d.ts

@@ -133,7 +133,7 @@ declare const _default: import("vue").DefineComponent<{
     handleCheckExt: (map: any, file: any) => boolean;
     checkMaxLength: () => boolean;
     computeMD5: (file: any) => void;
-    onFileAdded: (file: any) => Promise<void>;
+    onFileAdded: (file: any) => void;
     verifyUpload: (fileName: any, fileHash: any, file: any) => Promise<unknown>;
     computeMD5Success: (md5: any, file: any) => Promise<void>;
     onFileProgress: () => void;
@@ -1726,7 +1726,9 @@ declare const _default: import("vue").DefineComponent<{
             railHeight: string;
             iconSizeCircle: string;
             iconSizeLine: string;
-            iconColor: string;
+            iconColor: string; /**
+             * 删除
+             */
             iconColorInfo: string;
             iconColorSuccess: string;
             iconColorWarning: string;
@@ -1734,10 +1736,10 @@ declare const _default: import("vue").DefineComponent<{
             textColorCircle: string;
             textColorLineInner: string;
             textColorLineOuter: string;
-            fillColor: string;
             /**
-             * 格式化进度跳
+             * 上传错误
              */
+            fillColor: string;
             fillColorInfo: string;
             fillColorSuccess: string;
             fillColorWarning: string;
@@ -1756,7 +1758,9 @@ declare const _default: import("vue").DefineComponent<{
             '--n-font-weight-circle': string;
             '--n-icon-color': string;
             '--n-icon-size-circle': string;
-            '--n-icon-size-line': string;
+            '--n-icon-size-line': string; /**
+             * 组件销毁后
+             */
             '--n-line-bg-processing': string;
             '--n-rail-color': string;
             '--n-rail-height': string;

package/es/packages/chunk-upload/src/chunk-upload-new.vue_vue_type_script_setup_true_lang.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, onMounted, nextTick, onUnmounted, resolveComponent, openBlock, createElementBlock, createCommentVNode, createVNode, unref, withCtx, createElementVNode, Fragment, renderList, normalizeClass, toDisplayString, withDirectives, vShow, createTextVNode } from 'vue';
+import { defineComponent, ref, reactive, onMounted, nextTick, onUnmounted, resolveComponent, openBlock, createElementBlock, createCommentVNode, createVNode, unref, withCtx, createElementVNode, Fragment, renderList, withDirectives, normalizeClass, toDisplayString, vShow, createTextVNode } from 'vue';
 import SparkMD5 from 'spark-md5';
 import axios from 'axios';
 import { useMessage, NIcon, NProgress, NButton } from 'naive-ui';
@@ -138,7 +138,7 @@ var script = /* @__PURE__ */ defineComponent({
         fileReader.readAsArrayBuffer(blobSlice.call(file.file, start, end));
       }
     };
-    const onFileAdded = async (file) => {
+    const onFileAdded = (file) => {
       let sizeFlag = checkSize(file);
       if (handleCheckExt(props.propsCategoryMap, file) || checkMaxLength() || sizeFlag) {
         file.ignored = true;
@@ -204,7 +204,7 @@ var script = /* @__PURE__ */ defineComponent({
             statusSet(file, "complete");
             if (uploaderDom) {
               let resData = (data2 == null ? void 0 : data2.data) || {};
-              let fileList = uploaderDom.fileList;
+              let fileList = uploaderDom.value.fileList;
               fileList.forEach((v) => {
                 if (v.uniqueIdentifier == file.uniqueIdentifier) {
                   v.crm_chkuns_complete_status = "complete";
@@ -259,7 +259,11 @@ var script = /* @__PURE__ */ defineComponent({
       return ["complete", "failed"].includes(getUploadShowStatus(file, "status"));
     };
     const handleRemove = (file) => {
-      file.cancel();
+      if (file.cancel) {
+        file.cancel();
+      } else if (file.remove) {
+        file.remove();
+      }
       let id = file.id;
       state.configList = state.configList.filter((c) => c.id !== id);
     };
@@ -381,7 +385,7 @@ var script = /* @__PURE__ */ defineComponent({
                       return openBlock(), createElementBlock("li", {
                         key: file.id
                       }, [
-                        createVNode(_component_uploader_file, {
+                        withDirectives(createVNode(_component_uploader_file, {
                           class: normalizeClass("file_" + file.id),
                           ref_for: true,
                           ref: "files",
@@ -424,7 +428,9 @@ var script = /* @__PURE__ */ defineComponent({
                             ], 2)
                           ]),
                           _: 2
-                        }, 1032, ["class", "file"])
+                        }, 1032, ["class", "file"]), [
+                          [vShow, !file.ignored]
+                        ])
                       ]);
                     }), 128))
                   ])

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

@@ -61,8 +61,8 @@ const VodComputed = (props, state, config) => {
     return max_size2 || "";
   });
   const maxlength = computed(() => {
-    var _a, _b;
-    return +(((_b = (_a = props == null ? void 0 : props.formData) == null ? void 0 : _a.validate) == null ? void 0 : _b.max_length) || 0);
+    var _a, _b, _c, _d;
+    return +(((_b = (_a = props == null ? void 0 : props.formData) == null ? void 0 : _a.validate) == null ? void 0 : _b.max_length) || ((_d = (_c = props == null ? void 0 : props.formData) == null ? void 0 : _c.setting) == null ? void 0 : _d.limitPic) || 0);
   });
   return {
     isShowBtn,

package/es/packages/chunk-upload/style/index.css

@@ -257,10 +257,10 @@
 }
 .c-uploader-preview-wrap .uploader-preview-delete {
   position: absolute;
-  top: -16px;
-  right: -7px;
-  width: 16px;
-  height: 16px;
+  top: 3px;
+  right: 3px;
+  width: 20px;
+  height: 20px;
   z-index: 10;
 }
 .c-uploader-preview-wrap .uploader-preview-delete .pre-delete {

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

@@ -63,16 +63,31 @@ const script = defineComponent({
           }
         });
       }
-      const data = await asyncQueue.addAsync({
+      let data = await asyncQueue.addAsync({
         ...config,
         key: title.value,
         params
       });
+      if (!Array.isArray(data)) {
+        data = [];
+      }
+      if (!data.length && isObject(option)) {
+        option.isLeaf = true;
+        let currentOption = option;
+        const result2 = [option];
+        while (currentOption.parent) {
+          result2.unshift(currentOption.parent);
+          currentOption = currentOption.parent;
+        }
+        updateValue(null, null, result2);
+        return;
+      }
       const result = data.reduce((res, d) => {
         res.push({
           [config.nameKey]: d[config.nameKey],
           [config.valueKey]: d[config.valueKey],
           depth: parentDepth + 1,
+          parent: option,
           isLeaf: parentDepth + 2 >= props.deep
         });
         return res;
@@ -111,13 +126,20 @@ const script = defineComponent({
       const payload = Array.isArray(options) ? options.map((option) => ({
         ...option,
         label: option[labelKey.value],
-        children: void 0
+        children: void 0,
+        parent: void 0
       })) : options;
       emit("update:value", payload);
     }
+    const show = ref(false);
+    function updateShow(v) {
+      show.value = !!v;
+      v && fetchData();
+    }
     return () => {
       return createVNode(NCascader, {
         "value": _value.value,
+        "show": !!show.value,
         "onUpdate:value": updateValue,
         "remote": true,
         "labelField": labelKey.value,
@@ -125,7 +147,7 @@ const script = defineComponent({
         "options": renderOptions.value,
         "checkStrategy": "child",
         "onLoad": fetchData,
-        "onUpdate:show": (show) => show && fetchData()
+        "onUpdate:show": updateShow
       }, slots);
     };
   }

package/es/packages/index.css

@@ -1395,10 +1395,10 @@ body > .vxe-table--tooltip-wrapper {
 }
 .c-uploader-preview-wrap .uploader-preview-delete {
   position: absolute;
-  top: -16px;
-  right: -7px;
-  width: 16px;
-  height: 16px;
+  top: 3px;
+  right: 3px;
+  width: 20px;
+  height: 20px;
   z-index: 10;
 }
 .c-uploader-preview-wrap .uploader-preview-delete .pre-delete {
@@ -1672,6 +1672,9 @@ body > .vxe-table--tooltip-wrapper {
   text-align: center;
   margin-top: 24px;
 }
+.c-scale .linebar-div .n-divider {
+  margin-top: 4px;
+}
 .c-scale .my-prompt {
   padding: 10px;
   box-shadow: 0 5px 13px rgba(0, 0, 0, 0.14);

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

@@ -301,7 +301,9 @@ var script = /* @__PURE__ */ defineComponent({
       return { ...state };
     };
     expose({
-      getScaleData
+      getScaleData,
+      onSubmit,
+      cancel
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {

package/es/packages/scale-view/src/components/formitem/r-collection.d.ts

@@ -11,7 +11,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     form: {
         type: ObjectConstructor;
         default: () => {};

package/es/packages/scale-view/src/components/formitem/r-collection.js

@@ -59,7 +59,11 @@ var RCollection = defineComponent({
       }, [describe])]);
     };
     const renderLinebar = () => {
-      return createVNode(resolveComponent("n-divider"), null, null);
+      if (!props.item.title)
+        return null;
+      return createVNode("div", {
+        "class": "linebar-div"
+      }, [createVNode("span", null, [props.item.title]), createVNode(resolveComponent("n-divider"), null, null)]);
     };
     const renderPrompt = () => {
       return createVNode("div", {

package/es/packages/scale-view/src/hooks/use-component.d.ts

@@ -13,7 +13,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};
@@ -44,7 +44,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};
@@ -10190,7 +10190,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};
@@ -10221,7 +10221,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};
@@ -10252,7 +10252,7 @@ export declare const componentMap: {
             type: BooleanConstructor;
             default: boolean;
         };
-    }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, () => JSX.Element | null, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, never[], never, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         form: {
             type: ObjectConstructor;
             default: () => {};

package/es/packages/scale-view/style/index.css

@@ -169,6 +169,9 @@
   text-align: center;
   margin-top: 24px;
 }
+.c-scale .linebar-div .n-divider {
+  margin-top: 4px;
+}
 .c-scale .my-prompt {
   padding: 10px;
   box-shadow: 0 5px 13px rgba(0, 0, 0, 0.14);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.11-beta.5",
+  "version": "3.1.11-beta.6",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",