cnhis-design-vue 3.1.5-beta.11 → 3.1.5-beta.12

package/es/packages/scale-view/index.d.ts

@@ -16,11 +16,11 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<{
         default: () => {};
     };
     noBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     hideBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     source: {
@@ -28,7 +28,7 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<{
         default: string;
     };
     isLock: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     type: {
@@ -102,11 +102,11 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<{
             default: () => {};
         };
         noBtn: {
-            type: BooleanConstructor;
+            type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
             default: boolean;
         };
         hideBtn: {
-            type: BooleanConstructor;
+            type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
             default: boolean;
         };
         source: {
@@ -114,7 +114,7 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<{
             default: string;
         };
         isLock: {
-            type: BooleanConstructor;
+            type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
             default: boolean;
         };
         type: {
@@ -4055,11 +4055,11 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<{
         default: () => {};
     };
     noBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     hideBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     source: {
@@ -4067,7 +4067,7 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<{
         default: string;
     };
     isLock: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     type: {
@@ -4132,12 +4132,12 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<{
     type: string;
     styleSetting: Record<string, any>;
     source: string;
-    isLock: boolean;
+    isLock: string | number | boolean;
     getLabelList: Function;
     ids: Record<string, any>;
     guageData: Record<string, any>;
-    noBtn: boolean;
-    hideBtn: boolean;
+    noBtn: string | number | boolean;
+    hideBtn: string | number | boolean;
     fontSizeObj: Record<string, any>;
     openType: string;
     scaleApiConfig: Record<string, any>;

package/es/packages/scale-view/src/ScaleView.vue.d.ts

@@ -16,11 +16,11 @@ declare const _default: import("vue").DefineComponent<{
         default: () => {};
     };
     noBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     hideBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     source: {
@@ -28,7 +28,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     isLock: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     type: {
@@ -102,11 +102,11 @@ declare const _default: import("vue").DefineComponent<{
             default: () => {};
         };
         noBtn: {
-            type: BooleanConstructor;
+            type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
             default: boolean;
         };
         hideBtn: {
-            type: BooleanConstructor;
+            type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
             default: boolean;
         };
         source: {
@@ -114,7 +114,7 @@ declare const _default: import("vue").DefineComponent<{
             default: string;
         };
         isLock: {
-            type: BooleanConstructor;
+            type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
             default: boolean;
         };
         type: {
@@ -4058,11 +4058,11 @@ declare const _default: import("vue").DefineComponent<{
         default: () => {};
     };
     noBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     hideBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     source: {
@@ -4070,7 +4070,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
     isLock: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     type: {
@@ -4135,12 +4135,12 @@ declare const _default: import("vue").DefineComponent<{
     type: string;
     styleSetting: Record<string, any>;
     source: string;
-    isLock: boolean;
+    isLock: string | number | boolean;
     getLabelList: Function;
     ids: Record<string, any>;
     guageData: Record<string, any>;
-    noBtn: boolean;
-    hideBtn: boolean;
+    noBtn: string | number | boolean;
+    hideBtn: string | number | boolean;
     fontSizeObj: Record<string, any>;
     openType: string;
     scaleApiConfig: Record<string, any>;

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

@@ -349,9 +349,9 @@ var script = /* @__PURE__ */ defineComponent({
                             (openBlock(), createBlock(resolveDynamicComponent(item.renderCom), mergeProps(unref(propsConfig)(item, index), {
                               key: (item.id || item.seq) + index,
                               onScaleChange: scaleChange,
-                              onChange: ($event) => labelChange($event, item),
+                              onOnChange: ($event) => labelChange($event, item),
                               onVodFileList: vodFileList
-                            }), null, 16, ["onChange"])),
+                            }), null, 16, ["onOnChange"])),
                             unref(showAnswerParse)(item) ? (openBlock(), createBlock(script$5, {
                               key: 0,
                               item

package/es/packages/scale-view/src/components/formitem/r-datetime2.mjs

@@ -181,7 +181,7 @@ var scriptDatetime = defineComponent({
         "disabled": props.isLock
       }, null);
     };
-    defaultValue();
+    defaultValue(props.form[props.item.val_key]);
     return () => {
       if (type === "TIME" || dateType == "time") {
         if (startToStop == 1)

package/es/packages/scale-view/src/hooks/scaleview-computed2.mjs

@@ -104,9 +104,9 @@ const ScaleViewComputed = (props, state, config) => {
   });
   const componentDisable = computed(() => {
     if (!hasEvaluateResultSetting.value && !hasDefault.value) {
-      return props.hideBtn || props.isLock;
+      return !!props.hideBtn || !!props.isLock;
     }
-    return props.hideBtn || props.isLock || state.isFinished;
+    return !!props.hideBtn || !!props.isLock || state.isFinished;
   });
   const showEvaluateLabel = computed(() => (item) => {
     let obj = {
@@ -196,7 +196,6 @@ const ScaleViewComputed = (props, state, config) => {
     var _a;
     const propType = componentMapStr[item.type];
     let useProps = comProsMap[propType] || {};
-    console.log(propType, "--useProps");
     let propsObj = {
       form: state.form,
       item,

package/es/packages/scale-view/src/hooks/scaleview-props.d.ts

@@ -15,11 +15,11 @@ declare const ScaleViewProps: {
         default: () => {};
     };
     noBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     hideBtn: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     source: {
@@ -27,7 +27,7 @@ declare const ScaleViewProps: {
         default: string;
     };
     isLock: {
-        type: BooleanConstructor;
+        type: (BooleanConstructor | NumberConstructor | StringConstructor)[];
         default: boolean;
     };
     type: {

package/es/packages/scale-view/src/hooks/scaleview-props2.mjs

@@ -7,10 +7,10 @@ const ScaleViewProps = {
   },
   params: { default: () => ({}), type: Object },
   guageData: { type: Object, default: () => ({}) },
-  noBtn: { type: Boolean, default: false },
-  hideBtn: { type: Boolean, default: false },
+  noBtn: { type: [Boolean, String, Number], default: false },
+  hideBtn: { type: [Boolean, String, Number], default: false },
   source: { type: String, default: "" },
-  isLock: { type: Boolean, default: false },
+  isLock: { type: [Boolean, String, Number], default: false },
   type: {
     type: String,
     default: ""

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

@@ -581,11 +581,11 @@ export declare const componentMap: {
                 }>;
             };
         }>> & {
-            onChange?: ((...args: any[]) => any) | undefined;
+            onOnChange?: ((...args: any[]) => any) | undefined;
             onScaleChange?: ((...args: any[]) => any) | undefined;
             onVodFileList?: ((...args: any[]) => any) | undefined;
         }>>;
-        emit: (event: "change" | "scaleChange" | "vodFileList", ...args: any[]) => void;
+        emit: (event: "onChange" | "scaleChange" | "vodFileList", ...args: any[]) => void;
         labelFormContentRef: import("vue").Ref<null>;
         state: {
             labelVisible: boolean;
@@ -7940,7 +7940,7 @@ export declare const componentMap: {
             saveLabelItem: Function;
         }>;
         handleLabelColor: typeof import("../../../../src/utils/vexutils").handleLabelColor;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "scaleChange" | "vodFileList")[], "change" | "scaleChange" | "vodFileList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onChange" | "scaleChange" | "vodFileList")[], "onChange" | "scaleChange" | "vodFileList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         selectedList: {
             type: ArrayConstructor;
             required: false;
@@ -7991,7 +7991,7 @@ export declare const componentMap: {
             }>;
         };
     }>> & {
-        onChange?: ((...args: any[]) => any) | undefined;
+        onOnChange?: ((...args: any[]) => any) | undefined;
         onScaleChange?: ((...args: any[]) => any) | undefined;
         onVodFileList?: ((...args: any[]) => any) | undefined;
     }, {

package/es/packages/select-label/index.d.ts

@@ -102,11 +102,11 @@ declare const SelectLabel: SFCWithInstall<import("vue").DefineComponent<{
             }>;
         };
     }>> & {
-        onChange?: ((...args: any[]) => any) | undefined;
+        onOnChange?: ((...args: any[]) => any) | undefined;
         onScaleChange?: ((...args: any[]) => any) | undefined;
         onVodFileList?: ((...args: any[]) => any) | undefined;
     }>>;
-    emit: (event: "change" | "scaleChange" | "vodFileList", ...args: any[]) => void;
+    emit: (event: "onChange" | "scaleChange" | "vodFileList", ...args: any[]) => void;
     labelFormContentRef: import("vue").Ref<null>;
     state: {
         labelVisible: boolean;
@@ -7461,7 +7461,7 @@ declare const SelectLabel: SFCWithInstall<import("vue").DefineComponent<{
         saveLabelItem: Function;
     }>;
     handleLabelColor: typeof import("../../src/utils/vexutils").handleLabelColor;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "scaleChange" | "vodFileList")[], "change" | "scaleChange" | "vodFileList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onChange" | "scaleChange" | "vodFileList")[], "onChange" | "scaleChange" | "vodFileList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     selectedList: {
         type: ArrayConstructor;
         required: false;
@@ -7512,7 +7512,7 @@ declare const SelectLabel: SFCWithInstall<import("vue").DefineComponent<{
         }>;
     };
 }>> & {
-    onChange?: ((...args: any[]) => any) | undefined;
+    onOnChange?: ((...args: any[]) => any) | undefined;
     onScaleChange?: ((...args: any[]) => any) | undefined;
     onVodFileList?: ((...args: any[]) => any) | undefined;
 }, {

package/es/packages/select-label/src/SelectLabel.vue.d.ts

@@ -103,11 +103,11 @@ declare const _default: import("vue").DefineComponent<{
             }>;
         };
     }>> & {
-        onChange?: ((...args: any[]) => any) | undefined;
+        onOnChange?: ((...args: any[]) => any) | undefined;
         onScaleChange?: ((...args: any[]) => any) | undefined;
         onVodFileList?: ((...args: any[]) => any) | undefined;
     }>>;
-    emit: (event: "change" | "scaleChange" | "vodFileList", ...args: any[]) => void;
+    emit: (event: "onChange" | "scaleChange" | "vodFileList", ...args: any[]) => void;
     labelFormContentRef: import("vue").Ref<null>;
     state: {
         labelVisible: boolean;
@@ -4575,11 +4575,7 @@ declare const _default: import("vue").DefineComponent<{
                         color: string;
                         dividerColor: string;
                         textColor: string;
-                        boxShadow: string; /**
-                         * labelObj 展示的分类值
-                         * labelList 原始数据结构
-                         * selectList 已选的数据
-                         */
+                        boxShadow: string;
                         space: string;
                         spaceArrow: string;
                         arrowOffset: string;
@@ -6489,7 +6485,9 @@ declare const _default: import("vue").DefineComponent<{
             NInput: import("vue").DefineComponent<{
                 bordered: {
                     type: import("vue").PropType<boolean | undefined>;
-                    default: undefined;
+                    default: undefined; /**
+                     * 清空选项和常用值;
+                     */
                 };
                 type: {
                     type: import("vue").PropType<"text" | "textarea" | "password">;
@@ -7466,7 +7464,7 @@ declare const _default: import("vue").DefineComponent<{
         saveLabelItem: Function;
     }>;
     handleLabelColor: typeof handleLabelColor;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("change" | "scaleChange" | "vodFileList")[], "change" | "scaleChange" | "vodFileList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("onChange" | "scaleChange" | "vodFileList")[], "onChange" | "scaleChange" | "vodFileList", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     selectedList: {
         type: ArrayConstructor;
         required: false;
@@ -7517,7 +7515,7 @@ declare const _default: import("vue").DefineComponent<{
         }>;
     };
 }>> & {
-    onChange?: ((...args: any[]) => any) | undefined;
+    onOnChange?: ((...args: any[]) => any) | undefined;
     onScaleChange?: ((...args: any[]) => any) | undefined;
     onVodFileList?: ((...args: any[]) => any) | undefined;
 }, {

package/es/packages/select-label/src/SelectLabel.vue_vue_type_script_setup_true_lang.mjs

@@ -67,7 +67,7 @@ var script = /* @__PURE__ */ defineComponent({
       })
     }
   },
-  emits: ["change", "scaleChange", "vodFileList"],
+  emits: ["onChange", "scaleChange", "vodFileList"],
   setup(__props, {
     emit
   }) {
@@ -127,7 +127,7 @@ var script = /* @__PURE__ */ defineComponent({
       if (fdIndex != -1) {
         selectedList.splice(fdIndex, 1);
       }
-      emit("change", [...selectedList]);
+      emit("onChange", [...selectedList]);
       state.labelSelectedList = selectedList;
       hanldeSetLabelItem(d.labelId, false);
     };
@@ -148,7 +148,7 @@ var script = /* @__PURE__ */ defineComponent({
           selectedList.splice(fdIndex, 1);
         }
       }
-      emit("change", [...selectedList]);
+      emit("onChange", [...selectedList]);
       state.labelSelectedList = selectedList;
     };
     const handleEditLabel = (type) => {
@@ -183,7 +183,7 @@ var script = /* @__PURE__ */ defineComponent({
     const handleSaveLabel = () => {
       var _a;
       (_a = labelFormContentRef.value) == null ? void 0 : _a.handleLabelForm((selectList) => {
-        emit("change", [...selectList]);
+        emit("onChange", [...selectList]);
         state.labelSelectedList = selectList;
         hadleCommonlabels(state.commonLabelList, selectList);
         handleLabelCancel();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.5-beta.11",
+  "version": "3.1.5-beta.12",
   "license": "ISC",
   "module": "es/packages/index.mjs",
   "main": "es/packages/index.mjs",