cnhis-design-vue 3.1.9-beta.9 → 3.1.11-beta.0

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

@@ -1,10 +1,13 @@
 import { defineComponent, reactive, createVNode, resolveComponent } from 'vue';
-import { NCascader } from 'naive-ui';
+import { NCascader, NEmpty } from 'naive-ui';
+import script from '../LoadingCom.js';
 
 var RCascader = defineComponent({
   name: "RCascader",
   components: {
-    NCascader
+    NCascader,
+    NEmpty,
+    LoadingCom: script
   },
   props: {
     form: {
@@ -30,7 +33,8 @@ var RCascader = defineComponent({
   setup(props, context) {
     let state = reactive({
       cascaderValue: void 0,
-      curOptions: []
+      curOptions: [],
+      fetching: false
     });
     const backshowValue = (list, val) => {
       if (!list.length || !val || !val.length)
@@ -89,9 +93,15 @@ var RCascader = defineComponent({
         backshowValue(options, defVal);
         return;
       }
-      options = await props.getCascadeOptions(val);
-      state.curOptions = options;
-      backshowValue(options, defVal);
+      try {
+        state.fetching = true;
+        options = await props.getCascadeOptions(val);
+        state.curOptions = options;
+        backshowValue(options, defVal);
+        state.fetching = false;
+      } catch (err) {
+        state.fetching = false;
+      }
     };
     handleDef(props.item);
     const cascaderChange = (value, options, pathValues) => {
@@ -113,7 +123,9 @@ var RCascader = defineComponent({
         "show-path": true,
         "cascade": false,
         "on-update:value": cascaderChange
-      }, null);
+      }, {
+        empty: () => state.fetching ? createVNode(script, null, null) : createVNode(NEmpty, null, null)
+      });
     };
   }
 });

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

@@ -11,6 +11,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    inputLock: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "scaleChange"[], "scaleChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     form: {
         type: ObjectConstructor;
@@ -24,11 +28,16 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    inputLock: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onScaleChange?: ((...args: any[]) => any) | undefined;
 }, {
     form: Record<string, any>;
     item: Record<string, any>;
     isLock: boolean;
+    inputLock: boolean;
 }>;
 export default _default;

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

@@ -30,6 +30,10 @@ var scriptCheckbox = defineComponent({
     isLock: {
       type: Boolean,
       default: false
+    },
+    inputLock: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["scaleChange"],
@@ -48,15 +52,18 @@ var scriptCheckbox = defineComponent({
       choiceUseKey,
       isCheckboxItem,
       showPreSuffix,
-      handleOptions
+      handleOptions,
+      stopClick
     } = chooseCommon(props, state);
     const chooseStyleSetting = ((_b = (_a = props.item) == null ? void 0 : _a.setting) == null ? void 0 : _b.chooseStyleSetting) || 1;
-    const handlePreview = (e, url, i) => {
+    const handlePreview = (e, url) => {
       e.preventDefault();
       e.stopPropagation();
-      let imgs = state.curOptions.map((v) => v.imageUrl);
+      let imgs = state.curOptions.map((v) => v.imageUrl).filter(Boolean);
       if (!imgs.length)
         return;
+      let index = imgs.findIndex((v) => v === url);
+      let i = index < 0 ? 0 : index;
       api({
         images: imgs,
         options: {
@@ -79,6 +86,35 @@ var scriptCheckbox = defineComponent({
         isSetObj: isCheckboxItem.value
       });
     };
+    const handleCheckboxDefModal = (item, curValue, options) => {
+      var _a2;
+      state.curOptions = handleOptions(options);
+      if (!options.length || !curValue || !curValue.length)
+        return;
+      let resArr = [];
+      let i = 0, x, len = curValue.length;
+      for (; i < len; i++) {
+        x = curValue[i];
+        if (x === "\u5176\u4ED6") {
+          state.othersText = x;
+          state.curCheckboxValue = ["other"];
+          !resArr.includes("other") && resArr.push("other");
+          continue;
+        }
+        let matchIndex = options.findIndex((v) => v.value === x);
+        if (matchIndex < 0) {
+          state.othersText = x;
+          !resArr.includes("other") && resArr.push("other");
+          continue;
+        }
+        let res = (_a2 = options[matchIndex]) == null ? void 0 : _a2.key;
+        if (resArr.indexOf(res) < 0) {
+          resArr.push(res);
+        }
+      }
+      state.curCheckboxValue = resArr;
+      handleCheckboxOther();
+    };
     const handleCheckboxDef = (item, curValue, options) => {
       var _a2;
       state.curOptions = handleOptions(options);
@@ -127,7 +163,11 @@ var scriptCheckbox = defineComponent({
       } else {
         defVal = valueDef;
       }
-      handleCheckboxDef(value, value.dbValue || defVal, options);
+      if (props.inputLock) {
+        handleCheckboxDefModal(value, value.dbValue || defVal, options);
+      } else {
+        handleCheckboxDef(value, value.dbValue || defVal, options);
+      }
     };
     watch(() => props.item, (value) => {
       if (!value || !Object.keys(value).length)
@@ -162,12 +202,13 @@ var scriptCheckbox = defineComponent({
         "size": "24",
         "color": "#fff",
         "component": SearchOutline,
-        "onClick": (e) => handlePreview(e, o.imageUrl, i)
+        "onClick": (e) => handlePreview(e, o.imageUrl)
       }, null)])]);
     };
     const renderPresuffix = (o, i) => {
       return createVNode("div", {
-        "class": "presuffix-wrap"
+        "class": "presuffix-wrap",
+        "onClick": stopClick
       }, [o.prefix && createVNode("span", {
         "class": "prefix-span",
         "style": {
@@ -176,7 +217,7 @@ var scriptCheckbox = defineComponent({
       }, [o.prefix]), createVNode(resolveComponent("n-input"), {
         "value": state.optionsPreSuffixObj[o.key],
         "onUpdate:value": ($event) => state.optionsPreSuffixObj[o.key] = $event,
-        "disabled": props.isLock,
+        "disabled": props.isLock || props.inputLock,
         "style": {
           color: choiceColor.value(o)
         },
@@ -194,20 +235,24 @@ var scriptCheckbox = defineComponent({
       return createVNode("span", {
         "style": {
           color: choiceColor.value(o)
-        }
+        },
+        "class": "other-span"
       }, [o.label]);
     };
     const renderOther = (o) => {
-      return createVNode(resolveComponent("n-input"), {
+      return createVNode("div", {
+        "class": "choose-other",
+        "onClick": stopClick
+      }, [createVNode(resolveComponent("n-input"), {
         "value": state.othersText,
         "onUpdate:value": [($event) => state.othersText = $event, () => handleCheckboxOther(true)],
-        "disabled": props.isLock,
+        "disabled": props.isLock || props.inputLock,
         "style": {
           color: choiceColor.value(o)
         },
         "placeholder": "\u8BF7\u8F93\u5165",
         "bordered": false
-      }, null);
+      }, null)]);
     };
     const hasPreSuffix = (o) => {
       return isCheckboxItem.value && showPreSuffix.value(o);
@@ -224,7 +269,7 @@ var scriptCheckbox = defineComponent({
         "key": o.value,
         "value": o[opKey]
       }, {
-        default: () => [showImgWrap.value(o) && renderImg(o, i), hasPreSuffix(o) && renderPresuffix(o), !hasPreSuffix(o) && renderDefault(o), o.importability && renderOther(o)]
+        default: () => [showImgWrap.value(o) && renderImg(o), hasPreSuffix(o) && renderPresuffix(o), !hasPreSuffix(o) && renderDefault(o), o.importability && renderOther(o)]
       }))) ? _slot : {
         default: () => [_slot]
       });

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

@@ -66,8 +66,7 @@ var RCollection = defineComponent({
         "class": ["prompt-message", "c-scale-collection", className.value]
       }, [showIcon.value && createVNode(NIcon, {
         "class": "prompt-icon",
-        "size": "24",
-        "color": "#fff",
+        "size": "20",
         "component": AlertCircleOutline
       }, null), createVNode("div", {
         "class": "prompt-message-content "

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

@@ -40,13 +40,16 @@ var scriptDatetime = defineComponent({
       return "daterange";
     });
     const defaultValue = (val) => {
+      console.log(val, "time---val---");
       vexutils.isJSON(val) && (val = JSON.parse(val));
-      if (vexutils.isEmpty(val))
+      if (!val || vexutils.isEmpty(val))
         return;
       let value = JSON.parse(JSON.stringify(val));
       if (type === "TIME" || dateType == "time") {
-        if (startToStop != 1)
+        if (startToStop != 1) {
+          state.dateValue = val;
           return;
+        }
         if (!Array.isArray(value) || !value.length)
           return;
         let val0 = value[0] ? moment(value[0], timeFormat).valueOf() : "";

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

@@ -11,6 +11,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    inputLock: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "scaleChange"[], "scaleChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     form: {
         type: ObjectConstructor;
@@ -24,11 +28,16 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    inputLock: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onScaleChange?: ((...args: any[]) => any) | undefined;
 }, {
     form: Record<string, any>;
     item: Record<string, any>;
     isLock: boolean;
+    inputLock: boolean;
 }>;
 export default _default;

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

@@ -29,6 +29,10 @@ var scriptRadio = defineComponent({
     isLock: {
       type: Boolean,
       default: false
+    },
+    inputLock: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ["scaleChange"],
@@ -47,15 +51,18 @@ var scriptRadio = defineComponent({
       choiceUseKey,
       isRadioItem,
       showPreSuffix,
-      handleOptions
+      handleOptions,
+      stopClick
     } = chooseCommon(props, state);
     const chooseStyleSetting = ((_b = (_a = props.item) == null ? void 0 : _a.setting) == null ? void 0 : _b.chooseStyleSetting) || 1;
-    const handlePreview = (e, url, i) => {
+    const handlePreview = (e, url) => {
       e.preventDefault();
       e.stopPropagation();
-      let imgs = state.curOptions.map((v) => v.imageUrl);
+      let imgs = state.curOptions.map((v) => v.imageUrl).filter(Boolean);
       if (!imgs.length)
         return;
+      let index = imgs.findIndex((v) => v === url);
+      let i = index < 0 ? 0 : index;
       api({
         images: imgs,
         options: {
@@ -119,7 +126,8 @@ var scriptRadio = defineComponent({
     }, {
       immediate: true
     });
-    const inputPreSuffixChange = (o, i) => {
+    const inputPreSuffixChange = (val, o, i) => {
+      state.optionsPreSuffixObj[o.key] = val;
       state.curvalue = o.key;
       let choiceObj = {
         othersText: state.othersText,
@@ -154,12 +162,13 @@ var scriptRadio = defineComponent({
         "size": "24",
         "color": "#fff",
         "component": SearchOutline,
-        "onClick": (e) => handlePreview(e, o.imageUrl, i)
+        "onClick": (e) => handlePreview(e, o.imageUrl)
       }, null)])]);
     };
     const renderPresuffix = (o, i) => {
       return createVNode("div", {
-        "class": "presuffix-wrap"
+        "class": "presuffix-wrap",
+        "onClick": stopClick
       }, [o.prefix && createVNode("span", {
         "class": "prefix-span",
         "style": {
@@ -168,13 +177,13 @@ var scriptRadio = defineComponent({
       }, [o.prefix]), createVNode(resolveComponent("n-input"), {
         "value": state.optionsPreSuffixObj[o.key],
         "onUpdate:value": ($event) => state.optionsPreSuffixObj[o.key] = $event,
-        "disabled": props.isLock,
+        "disabled": props.isLock || props.inputLock,
         "style": {
           color: choiceColor.value(o)
         },
         "placeholder": "\u8BF7\u8F93\u5165",
         "bordered": false,
-        "onInput": () => inputPreSuffixChange(o)
+        "on-update:value": (val) => inputPreSuffixChange(val, o)
       }, null), o.suffix && createVNode("span", {
         "class": "suffix-span",
         "style": {
@@ -186,20 +195,24 @@ var scriptRadio = defineComponent({
       return createVNode("span", {
         "style": {
           color: choiceColor.value(o)
-        }
+        },
+        "class": "other-span"
       }, [o.label]);
     };
     const renderOther = (o) => {
-      return createVNode(resolveComponent("n-input"), {
+      return createVNode("div", {
+        "class": "choose-other",
+        "onClick": stopClick
+      }, [createVNode(resolveComponent("n-input"), {
         "value": state.othersText,
         "onUpdate:value": [($event) => state.othersText = $event, inputChange],
-        "disabled": props.isLock,
+        "disabled": props.isLock || props.inputLock,
         "style": {
           color: choiceColor.value(o)
         },
         "placeholder": "\u8BF7\u8F93\u5165",
         "bordered": false
-      }, null);
+      }, null)]);
     };
     const hasPreSuffix = (o) => {
       return isRadioItem.value && showPreSuffix.value(o);
@@ -216,7 +229,7 @@ var scriptRadio = defineComponent({
         "key": o.value,
         "value": o[opKey]
       }, {
-        default: () => [showImgWrap.value(o) && renderImg(o, i), hasPreSuffix(o) && renderPresuffix(o), !hasPreSuffix(o) && renderDefault(o), o.importability && renderOther(o)]
+        default: () => [showImgWrap.value(o) && renderImg(o), hasPreSuffix(o) && renderPresuffix(o), !hasPreSuffix(o) && renderDefault(o), o.importability && renderOther(o)]
       }))) ? _slot : {
         default: () => [_slot]
       });

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

@@ -1,10 +1,13 @@
 import { defineComponent, reactive, computed, watch, createVNode, resolveComponent } from 'vue';
-import { NSelect } from 'naive-ui';
+import { NSelect, NEmpty } from 'naive-ui';
+import script from '../LoadingCom.js';
 
 var scriptSelect = defineComponent({
   name: "RSelect",
   components: {
-    NSelect
+    NSelect,
+    NEmpty,
+    LoadingCom: script
   },
   props: {
     form: {
@@ -70,11 +73,15 @@ var scriptSelect = defineComponent({
         state.curOptions = options;
         return;
       }
-      state.fetching = true;
-      state.curOptions = await props.getSelectOptions(state.cloneItem);
-      state.fetching = false;
-      state.columnName = targetSource == null ? void 0 : targetSource.values;
-      state.showField = (targetSource == null ? void 0 : targetSource.showField) || (targetSource == null ? void 0 : targetSource.values);
+      try {
+        state.fetching = true;
+        state.curOptions = await props.getSelectOptions(state.cloneItem);
+        state.fetching = false;
+        state.columnName = targetSource == null ? void 0 : targetSource.values;
+        state.showField = (targetSource == null ? void 0 : targetSource.showField) || (targetSource == null ? void 0 : targetSource.values);
+      } catch (err) {
+        state.fetching = false;
+      }
     };
     const handleDef = (value) => {
       var _a;
@@ -131,7 +138,9 @@ var scriptSelect = defineComponent({
         "disabled": props.isLock,
         "loading": state.fetching,
         "options": state.curOptions
-      }, null);
+      }, {
+        empty: () => state.fetching ? createVNode(script, null, null) : createVNode(NEmpty, null, null)
+      });
     };
   }
 });

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

@@ -73,7 +73,7 @@ var RUpload = defineComponent({
       }
       if (!fileList.length) {
         state.fileList = [];
-        context.emit("scaleChange", state.fileList);
+        context.emit("scaleChange", state.fileList, props.item);
         return;
       }
       let matchItem;
@@ -109,7 +109,7 @@ var RUpload = defineComponent({
           matchItem.url = (_a2 = response.map) == null ? void 0 : _a2.url;
         }
         let useFileList = state.fileList.filter((v) => v.url);
-        context.emit("scaleChange", useFileList);
+        context.emit("scaleChange", useFileList, props.item);
       }
     };
     const beforeUpload = (info) => {

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

@@ -161,27 +161,19 @@ const ScaleViewComputed = (props, state, config) => {
       ak: props.ak
     };
   });
-  const getChunkUploadConfig = () => {
-    return Promise.resolve({
-      checkFileMd5Exist: "http://192.168.1.223:12060/storage/checkFileMd5Exist",
-      fileChannel: "null",
-      md5: "9ed34823e7ef4754819704135b29c9ab",
-      objectName: "0/0/20220602",
-      partFileMerge: "http://192.168.1.223:12060/storage/partFileMerge",
-      partFileUpload: "http://192.168.1.223:12060/storage/partFileUpload",
-      token: "73a9671c6eaa415db33d00a3651c3660"
-    });
-  };
   const vodChunkUploadProps = computed(() => {
     return {
       source: "guage",
-      getChunkUploadConfig
+      getChunkUploadConfig: props.getChunkUploadConfig
     };
   });
   const selectLabelProps = computed(() => {
     return {
       selectedList: state.labelSelectedList,
-      getLabelList: props.getLabelList
+      getLabelList: props.getLabelList,
+      deleteLabel: props.deleteLabel,
+      saveLabelItem: props.saveLabelItem,
+      sourceType: props.sourceType
     };
   });
   const comProsMap = {

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

@@ -71,6 +71,18 @@ declare const ScaleViewProps: {
         type: FunctionConstructor;
         default: () => Promise<never[]>;
     };
+    deleteLabel: {
+        type: FunctionConstructor;
+        default: () => Promise<{
+            status: boolean;
+        }>;
+    };
+    saveLabelItem: {
+        type: FunctionConstructor;
+        default: () => Promise<{
+            status: boolean;
+        }>;
+    };
     uploadPictureUrl: {
         type: StringConstructor;
         default: string;
@@ -83,5 +95,21 @@ declare const ScaleViewProps: {
         type: StringConstructor;
         default: string;
     };
+    sourceType: {
+        type: StringConstructor;
+        default: string;
+    };
+    getChunkUploadConfig: {
+        type: FunctionConstructor;
+        default: () => Promise<{
+            checkFileMd5Exist: string;
+            fileChannel: string;
+            md5: string;
+            objectName: string;
+            partFileMerge: string;
+            partFileUpload: string;
+            token: string;
+        }>;
+    };
 };
 export default ScaleViewProps;

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

@@ -49,11 +49,32 @@ const ScaleViewProps = {
     type: Function,
     default: () => Promise.resolve([])
   },
+  deleteLabel: {
+    type: Function,
+    default: () => Promise.resolve({ status: true })
+  },
+  saveLabelItem: {
+    type: Function,
+    default: () => Promise.resolve({ status: true })
+  },
   uploadPictureUrl: { type: String, default: "" },
   uploadFileUrl: { type: String, default: "" },
   ak: {
     type: String,
     default: "KP3BZ-OAC3W-PY6RY-OJ6DV-JYKN3-H6F72"
+  },
+  sourceType: { type: String, default: "" },
+  getChunkUploadConfig: {
+    type: Function,
+    default: () => Promise.resolve({
+      checkFileMd5Exist: "http://192.168.1.223:12060/storage/checkFileMd5Exist",
+      fileChannel: "null",
+      md5: "9ed34823e7ef4754819704135b29c9ab",
+      objectName: "0/0/20220602",
+      partFileMerge: "http://192.168.1.223:12060/storage/partFileMerge",
+      partFileUpload: "http://192.168.1.223:12060/storage/partFileUpload",
+      token: "4d0eb8f174994d33adb71766d1ef8ce4"
+    })
   }
 };
 

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

@@ -1,33 +1,34 @@
 import moment from 'moment';
-declare const ScaleViewState: {
-    other: string;
-    form: {};
-    submitForm: {};
-    rules: {};
-    config: {};
-    formArray: never[];
-    mapVisible: boolean;
-    mapLocation: string;
-    labelSelectedList: never[];
-    defaultFormArray: never[];
-    fontSize: string;
-    filterArr: string[];
-    spinning: boolean;
-    indicator: string;
-    totalScore: undefined;
-    shareId: string;
-    currentTime: moment.Moment;
-    showEvaluatePage: boolean;
-    showEvaluateSettingWrap: boolean;
-    showEvaluateCountdownWrap: boolean;
-    showEvaluateCountdown: boolean;
-    banSubmit: boolean;
-    isFinished: boolean;
-    maxScore: number;
-    originConfig: {};
-    paramsEvaluate: null;
-    hasFrontAddress: boolean;
-    choiceComObj: {};
-    evatipMap: {};
+export declare const getScaleViewState: () => {
+    ScaleViewState: {
+        other: string;
+        form: {};
+        submitForm: {};
+        rules: {};
+        config: {};
+        formArray: never[];
+        mapVisible: boolean;
+        mapLocation: string;
+        labelSelectedList: never[];
+        defaultFormArray: never[];
+        fontSize: string;
+        filterArr: string[];
+        spinning: boolean;
+        indicator: string;
+        totalScore: undefined;
+        shareId: string;
+        currentTime: moment.Moment;
+        showEvaluatePage: boolean;
+        showEvaluateSettingWrap: boolean;
+        showEvaluateCountdownWrap: boolean;
+        showEvaluateCountdown: boolean;
+        banSubmit: boolean;
+        isFinished: boolean;
+        maxScore: number;
+        originConfig: {};
+        paramsEvaluate: null;
+        hasFrontAddress: boolean;
+        choiceComObj: {};
+        evatipMap: {};
+    };
 };
-export default ScaleViewState;