cnhis-design-vue 3.1.7 → 3.1.8-beta.1

package/es/packages/scale-view/src/components/EvaluatePage.vue_vue_type_script_setup_true_lang.mjs

@@ -23,7 +23,6 @@ const _hoisted_10 = {
   class: "evaluate-time-range"
 };
 var script = /* @__PURE__ */ defineComponent({
-  name: "EvaluatePage",
   props: {
     formArray: { type: Array, default: () => [] },
     evaluateResultConfig: { type: Object, default: () => ({}) },
@@ -115,18 +114,18 @@ var script = /* @__PURE__ */ defineComponent({
               _hoisted_9
             ])) : createCommentVNode("v-if", true)
           ]),
-          unref(showRange) ? (openBlock(), createElementBlock("div", _hoisted_10, toDisplayString(state.timeRange), 1)) : createCommentVNode("v-if", true),
+          unref(showRange) ? (openBlock(), createElementBlock("div", _hoisted_10, toDisplayString(unref(state).timeRange), 1)) : createCommentVNode("v-if", true),
           createVNode(unref(NButton), {
             class: "evaluate-btn",
             type: "primary",
             onClick: writeGuage,
-            disabled: unref(disabledEvaluate) || state.banStart
+            disabled: unref(disabledEvaluate) || unref(state).banStart
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString(unref(getEvaluateText)) + " ", 1),
               !unref(evaluateState).isTimeOut && unref(evaluateState).countdownStr ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                 createTextVNode("\uFF08" + toDisplayString(unref(evaluateState).countdownStr) + "\uFF09", 1)
-              ], 64)) : createCommentVNode("v-if", true)
+              ], 2112)) : createCommentVNode("v-if", true)
             ]),
             _: 1
           }, 8, ["disabled"])

package/es/packages/scale-view/src/components/NoData.vue_vue_type_script_setup_true_lang.mjs

@@ -8,7 +8,6 @@ const _hoisted_1 = { class: "no-data-tip NoData-page" };
 const _hoisted_2 = ["src"];
 const _hoisted_3 = { key: 1 };
 var script = /* @__PURE__ */ defineComponent({
-  name: "NoData",
   props: {
     noDataTip: {
       type: String,

package/es/packages/scale-view/src/components/ScaleScore2.mjs

@@ -47,7 +47,7 @@ var ScaleScore = defineComponent({
         "style": {
           color: getEvaResColor.value
         }
-      }, [props.config.totalScore, createTextVNode("\u5206")])]), hasEvaluateSetting && createVNode("div", null, [createVNode("div", null, [createTextVNode("\u6D4B\u8BC4\u7ED3\u679C\uFF1A"), createVNode("span", {
+      }, [props.config.totalScore, createTextVNode("\u5206")])]), hasEvaluateSetting.value && createVNode("div", null, [createVNode("div", null, [createTextVNode("\u6D4B\u8BC4\u7ED3\u679C\uFF1A"), createVNode("span", {
         "class": "score-result",
         "style": {
           color: getEvaResColor.value

package/es/packages/scale-view/src/components/composables/choose-common.d.ts

@@ -1,5 +1,5 @@
 export default function (props: any, state: any): {
-    choiceUseKey: import("vue").ComputedRef<"value" | "key">;
+    choiceUseKey: import("vue").ComputedRef<"key" | "value">;
     choiceColor: import("vue").ComputedRef<(p: any) => string>;
     showImgWrap: import("vue").ComputedRef<(o: any) => any>;
     isRadioItem: import("vue").ComputedRef<boolean>;

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

@@ -70,7 +70,7 @@ var scriptCheckbox = defineComponent({
       let curCheckboxValue = JSON.parse(JSON.stringify(state.curCheckboxValue));
       context.emit("scaleChange", curCheckboxValue, props.item, {
         choiceObj,
-        isSetObj: isCheckboxItem
+        isSetObj: isCheckboxItem.value
       });
     };
     const handleCheckboxDef = (item, curValue, options) => {
@@ -141,7 +141,7 @@ var scriptCheckbox = defineComponent({
       let curCheckboxValue = JSON.parse(JSON.stringify(state.curCheckboxValue));
       context.emit("scaleChange", curCheckboxValue, props.item, {
         choiceObj,
-        isSetObj: isCheckboxItem
+        isSetObj: isCheckboxItem.value
       });
     };
     const renderImg = (o, i) => {
@@ -204,7 +204,7 @@ var scriptCheckbox = defineComponent({
       }, null);
     };
     const hasPreSuffix = (o) => {
-      return isCheckboxItem && showPreSuffix.value(o);
+      return isCheckboxItem.value && showPreSuffix.value(o);
     };
     let opKey = choiceUseKey.value;
     return () => {
@@ -212,7 +212,8 @@ var scriptCheckbox = defineComponent({
       return createVNode(NCheckboxGroup, {
         "value": state.curCheckboxValue,
         "onUpdate:value": [($event) => state.curCheckboxValue = $event, () => handleCheckboxOther(false)],
-        "class": ["c-choice-wrap", "choice-wrap-" + chooseStyleSetting]
+        "class": ["c-choice-wrap", "choice-wrap-" + chooseStyleSetting],
+        "disabled": props.isLock
       }, _isSlot(_slot = state.curOptions.map((o, i) => createVNode(resolveComponent("n-checkbox"), {
         "key": o.value,
         "value": o[opKey]

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

@@ -64,7 +64,7 @@ var RCollection = defineComponent({
     };
     const renderPrompt = () => {
       return createVNode("div", {
-        "class": ["prompt-message", "c-scale-collection", className]
+        "class": ["prompt-message", "c-scale-collection", className.value]
       }, [showIcon.value && createVNode(NIcon, {
         "class": "prompt-icon",
         "size": "24",

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

@@ -168,7 +168,8 @@ var scriptDatetime = defineComponent({
         "formatted-value": props.form[props.item.val_key],
         "onUpdate:formatted-value": ($event) => props.form[props.item.val_key] = $event,
         "type": dateType,
-        "clearable": true
+        "clearable": true,
+        "disabled": props.isLock
       }, null);
     };
     const renderDateRange = () => {
@@ -176,10 +177,11 @@ var scriptDatetime = defineComponent({
         "formatted-value": props.form[props.item.val_key],
         "onUpdate:formatted-value": ($event) => props.form[props.item.val_key] = $event,
         "type": useDateRangeType.value,
-        "clearable": true
+        "clearable": true,
+        "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/components/formitem/r-radio2.mjs

@@ -103,7 +103,7 @@ var scriptRadio = defineComponent({
       };
       context.emit("scaleChange", state.curvalue, props.item, {
         choiceObj,
-        isSetObj: isRadioItem
+        isSetObj: isRadioItem.value
       });
     };
     watch(() => props.item, (value) => {
@@ -122,7 +122,7 @@ var scriptRadio = defineComponent({
       console.log(state.optionsPreSuffixObj);
       context.emit("scaleChange", state.curvalue, props.item, {
         choiceObj,
-        isSetObj: isRadioItem
+        isSetObj: isRadioItem.value
       });
     };
     const inputChange = () => {
@@ -133,7 +133,7 @@ var scriptRadio = defineComponent({
       state.curvalue = "other";
       context.emit("scaleChange", "other", props.item, {
         choiceObj,
-        isSetObj: isRadioItem
+        isSetObj: isRadioItem.value
       });
     };
     const renderImg = (o, i) => {
@@ -196,7 +196,7 @@ var scriptRadio = defineComponent({
       }, null);
     };
     const hasPreSuffix = (o) => {
-      return isRadioItem && showPreSuffix.value(o);
+      return isRadioItem.value && showPreSuffix.value(o);
     };
     let opKey = choiceUseKey.value;
     return () => {
@@ -204,7 +204,8 @@ var scriptRadio = defineComponent({
       return createVNode(NRadioGroup, {
         "value": state.curvalue,
         "onUpdate:value": [($event) => state.curvalue = $event, radioChange],
-        "class": ["c-choice-wrap", "choice-wrap-" + chooseStyleSetting]
+        "class": ["c-choice-wrap", "choice-wrap-" + chooseStyleSetting],
+        "disabled": props.isLock
       }, _isSlot(_slot = state.curOptions.map((o, i) => createVNode(resolveComponent("n-radio"), {
         "key": o.value,
         "value": o[opKey]

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

@@ -92,20 +92,20 @@ var scriptSelect = defineComponent({
         res.value = value;
         matchItem = addItem(value);
         matchItem && res.list.push(matchItem);
-        context.emit("scaleChange", res, props.item);
+        context.emit("scaleChange", res, props.item, res);
         return;
       }
       res.value = value;
       if (!value.length) {
         res.list = [];
-        context.emit("scaleChange", res, props.item);
+        context.emit("scaleChange", res, props.item, res);
         return;
       }
       value.forEach((item) => {
         matchItem = addItem(item);
         matchItem && res.list.push(matchItem);
       });
-      context.emit("scaleChange", res, props.item);
+      context.emit("scaleChange", res, props.item, res);
     };
     const addItem = (item) => {
       return state.curOptions.find((v) => v.value === item);

package/es/packages/scale-view/src/components/formitem/text-over-tooltip/TextOverTooltip.vue.d.ts

@@ -176,7 +176,6 @@ declare const _default: import("vue").DefineComponent<{
         onClickoutside: import("vue").PropType<(e: MouseEvent) => void>;
         'onUpdate:show': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: boolean) => void>>;
         onUpdateShow: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: boolean) => void>>;
-        internalDeactivateImmediately: BooleanConstructor;
         internalSyncTargetWithParent: BooleanConstructor;
         internalInheritedEventHandlers: {
             type: import("vue").PropType<import("naive-ui/es/popover/src/Popover").TriggerEventHandlers[]>;
@@ -241,11 +240,10 @@ declare const _default: import("vue").DefineComponent<{
                 opacity5: string;
                 dividerColor: string;
                 borderColor: string;
-                closeIconColor: string;
-                closeIconColorHover: string;
-                closeIconColorPressed: string;
+                closeColor: string;
                 closeColorHover: string;
                 closeColorPressed: string;
+                closeColorDisabled: string;
                 clearColor: string;
                 clearColorHover: string;
                 clearColorPressed: string;
@@ -477,7 +475,6 @@ declare const _default: import("vue").DefineComponent<{
         onClickoutside: import("vue").PropType<(e: MouseEvent) => void>;
         'onUpdate:show': import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: boolean) => void>>;
         onUpdateShow: import("vue").PropType<import("naive-ui/es/_utils").MaybeArray<(value: boolean) => void>>;
-        internalDeactivateImmediately: BooleanConstructor;
         internalSyncTargetWithParent: BooleanConstructor;
         internalInheritedEventHandlers: {
             type: import("vue").PropType<import("naive-ui/es/popover/src/Popover").TriggerEventHandlers[]>;
@@ -513,7 +510,6 @@ declare const _default: import("vue").DefineComponent<{
         arrowPointToCenter: boolean;
         displayDirective: "show" | "if";
         keepAliveOnHover: boolean;
-        internalDeactivateImmediately: boolean;
         animated: boolean;
         internalTrapFocus: boolean;
         defaultShow: boolean;

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

@@ -21,7 +21,7 @@ export declare const ScaleViewComputed: (props: any, state: any, config: any) =>
     showEvaluateLabel: import("vue").ComputedRef<(item: any) => any>;
     showAnswerParse: import("vue").ComputedRef<(item: any) => any>;
     tipMsg: import("vue").ComputedRef<"保存" | "提交">;
-    propsConfig: import("vue").ComputedRef<(item: any) => any>;
+    propsConfig: import("vue").ComputedRef<(item: any, index: number) => any>;
     showEvent: (formItem: any, isSubmitCallback?: any) => any;
     formKey: (item: any) => any;
     evaluatePageProps: import("vue").ComputedRef<{

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 = {
@@ -178,28 +178,48 @@ const ScaleViewComputed = (props, state, config) => {
       getChunkUploadConfig
     };
   });
+  const selectLabelProps = computed(() => {
+    return {
+      selectedList: state.labelSelectedList,
+      getLabelList: props.getLabelList
+    };
+  });
   const comProsMap = {
     "RSelectCom": selectProps.value,
     "RCascaderCom": cascaderProps.value,
     "RUploadCom": uploadProps.value,
     "RMapCom": mapProps.value,
-    "RVodChunkUploadCom": vodChunkUploadProps.value
+    "RVodChunkUploadCom": vodChunkUploadProps.value,
+    "CSelectLabelCom": selectLabelProps.value
   };
-  const propsConfig = computed(() => (item) => {
-    let useProps = comProsMap[componentMapStr[item.type]] || {};
-    if (componentMapStr[item.type] == "RVodChunkUploadCom") {
-      console.log(useProps);
-    }
-    return {
+  const propsConfig = computed(() => (item, index) => {
+    var _a;
+    const propType = componentMapStr[item.type];
+    let useProps = comProsMap[propType] || {};
+    let propsObj = {
       form: state.form,
       item,
+      index,
       isLock: componentDisable.value,
-      locationProp: state.form[item.val_key],
-      formData: item,
-      limitNum: item.setting.limitPic,
-      defFileList: state.form[item.val_key],
       ...useProps
     };
+    if (propType === "RVodChunkUploadCom") {
+      Object.assign(propsObj, {
+        formData: item,
+        limitNum: ((_a = item.setting) == null ? void 0 : _a.limitPic) || 1,
+        defFileList: state.form[item.val_key]
+      });
+    }
+    if (propType === "RMapCom") {
+      Object.assign(propsObj, {
+        locationProp: state.form[item.val_key]
+      });
+    }
+    if (propType === "CSelectLabelCom") {
+      delete propsObj.form;
+      delete propsObj.index;
+    }
+    return propsObj;
   });
   const showEvent = (formItem, isSubmitCallback) => {
     if (formItem.hide)

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: {
@@ -67,6 +67,10 @@ declare const ScaleViewProps: {
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    getLabelList: {
+        type: FunctionConstructor;
+        default: () => Promise<never[]>;
+    };
     uploadPictureUrl: {
         type: StringConstructor;
         default: string;

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: ""
@@ -45,6 +45,10 @@ const ScaleViewProps = {
     type: Function,
     default: () => Promise.resolve([])
   },
+  getLabelList: {
+    type: Function,
+    default: () => Promise.resolve([])
+  },
   uploadPictureUrl: { type: String, default: "" },
   uploadFileUrl: { type: String, default: "" },
   ak: {

package/es/packages/scale-view/src/hooks/use-component2.mjs

@@ -10,6 +10,7 @@ import RAddress from '../components/formitem/r-address2.mjs';
 import RUpload from '../components/formitem/r-upload2.mjs';
 import RMap from '../components/formitem/r-map2.mjs';
 import RVodChunkUpload from 'cnhis-design-vue/es/packages/chunk-upload/src/vod-chunk-upload';
+import CSelectLabel from 'cnhis-design-vue/es/packages/select-label';
 
 let RInputCom = shallowRef(RInput);
 let RRadioCom = shallowRef(scriptRadio);
@@ -22,6 +23,7 @@ let RAddressCom = shallowRef(RAddress);
 let RUploadCom = shallowRef(RUpload);
 let RMapCom = shallowRef(RMap);
 let RVodChunkUploadCom = shallowRef(RVodChunkUpload);
+let CSelectLabelCom = shallowRef(CSelectLabel);
 const componentMap = {
   "TITLE": RCollectionCom,
   "LINEBAR": RCollectionCom,
@@ -36,7 +38,7 @@ const componentMap = {
   "ID_CARD": RInputCom,
   "ADDRESS": RAddressCom,
   "LOCATION": RMapCom,
-  "LABEL": RInputCom,
+  "LABEL": CSelectLabelCom,
   "UPFILE": RUploadCom,
   "UPPICTURE": RUploadCom,
   "VEDIO": RVodChunkUploadCom,
@@ -63,7 +65,7 @@ const componentMapStr = {
   "ID_CARD": "RInputCom",
   "ADDRESS": "RInputCom",
   "LOCATION": "RMapCom",
-  "LABEL": "RInputCom",
+  "LABEL": "CSelectLabelCom",
   "UPFILE": "RUploadCom",
   "UPPICTURE": "RUploadCom",
   "VEDIO": "RVodChunkUploadCom",

package/es/packages/select-label/index2.mjs

@@ -1,5 +1,5 @@
-import { KEY_COMPONENT_NAME } from 'cnhis-design-vue/es/src/global/variable';
-import { safeComponentRegister, getComponentName } from 'cnhis-design-vue/es/src/utils';
+import { COMPONENT_NAMESPACE } from 'cnhis-design-vue/es/src/global/variable';
+import { safeComponentRegister } from 'cnhis-design-vue/es/src/utils';
 import './src/SelectLabel2.mjs';
 import './src/LabelFormContent2.mjs';
 import script from './src/SelectLabel.vue_vue_type_script_setup_true_lang.mjs';
@@ -8,10 +8,10 @@ import script$1 from './src/LabelFormContent.vue_vue_type_script_setup_true_lang
 const SelectLabel = script;
 const LabelFormContent = script$1;
 SelectLabel.install = function(app) {
-  safeComponentRegister(app, SelectLabel, KEY_COMPONENT_NAME + getComponentName(SelectLabel));
+  safeComponentRegister(app, SelectLabel, COMPONENT_NAMESPACE + "SelectLabel");
 };
 LabelFormContent.install = function(app) {
-  safeComponentRegister(app, LabelFormContent, KEY_COMPONENT_NAME + getComponentName(LabelFormContent));
+  safeComponentRegister(app, LabelFormContent, COMPONENT_NAMESPACE + "LabelFormContent");
 };
 
 export { LabelFormContent as CLabelFormContent, SelectLabel as default };