cnhis-design-vue 3.1.8 → 3.1.9-beta.11

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 → scaleview-computed.js}

@@ -1,8 +1,8 @@
 import { computed } from 'vue';
-import { isEvaluation } from '../utils/judge-types2.mjs';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
+import { isEvaluation } from '../utils/judge-types.js';
+import vexutils from '../../../../src/utils/vexutils';
 import moment from 'moment';
-import { componentMapStr } from './use-component2.mjs';
+import { componentMapStr } from './use-component.js';
 
 const ScaleViewComputed = (props, state, config) => {
   let { query } = config;
@@ -42,9 +42,9 @@ const ScaleViewComputed = (props, state, config) => {
     };
   });
   const handlePageClass = computed(() => {
-    if (props.type == "customList" && !state.noBtn)
+    if (props.type == "customList" && !props.noBtn)
       return false;
-    if (!state.noBtn && !props.hideBtn)
+    if (!props.noBtn && !props.hideBtn)
       return false;
     return true;
   });
@@ -71,13 +71,13 @@ const ScaleViewComputed = (props, state, config) => {
   const isPreviewScale = computed(() => {
     var _a;
     let guage_id = (_a = state.ids) == null ? void 0 : _a.guage_id;
-    return guage_id && state.noBtn;
+    return guage_id && props.noBtn;
   });
   const showEvaluateEntry = computed(() => {
-    return !isPreviewScale.value && state.showEvaluatePage && state.showEvaluateSettingWrap && !state.isFinished && !state.noBtn && !props.hideBtn;
+    return !isPreviewScale.value && state.showEvaluatePage && state.showEvaluateSettingWrap && !state.isFinished && !props.noBtn && !props.hideBtn;
   });
   const showEvaluateCoundownPage = computed(() => {
-    return !isPreviewScale.value && !showEvaluateEntry.value && state.showEvaluateCountdownWrap && !state.isFinished && !state.noBtn && !props.hideBtn;
+    return !isPreviewScale.value && !showEvaluateEntry.value && state.showEvaluateCountdownWrap && !state.isFinished && !props.noBtn && !props.hideBtn;
   });
   const hasEvaluateResultSetting = computed(() => {
     let { evaluateResultSetting = {} } = state.config;
@@ -98,15 +98,15 @@ const ScaleViewComputed = (props, state, config) => {
   });
   const showSaveBtn = computed(() => {
     if (!hasEvaluateResultSetting.value && !hasDefault.value) {
-      return !state.noBtn && !props.hideBtn;
+      return !props.noBtn && !props.hideBtn;
     }
-    return !state.noBtn && !props.hideBtn && !state.isFinished;
+    return !props.noBtn && !props.hideBtn && !state.isFinished;
   });
   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-init2.mjs → scaleview-init.js}

@@ -1,10 +1,10 @@
-import { handleQueryParams, getQueryVariable } from '../utils/judge-types2.mjs';
-import useNoData from './use-noData2.mjs';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
-import { componentMap } from './use-component2.mjs';
-import { useEvent } from './use-event2.mjs';
-import { ScaleViewComputed } from './scaleview-computed2.mjs';
-import { ScaleViewValidate } from './scaleview-validate2.mjs';
+import { handleQueryParams, getQueryVariable } from '../utils/judge-types.js';
+import useNoData from './use-noData.js';
+import vexutils from '../../../../src/utils/vexutils';
+import { componentMap } from './use-component.js';
+import { useEvent } from './use-event.js';
+import { ScaleViewComputed } from './scaleview-computed.js';
+import { ScaleViewValidate } from './scaleview-validate.js';
 import { useDialog } from 'naive-ui';
 
 const ScaleViewInit = (props, state, emit, config) => {
@@ -170,7 +170,8 @@ const ScaleViewInit = (props, state, emit, config) => {
       }
     });
   };
-  const handleRelationLogic = (list, relationLogicObj) => {
+  const handleRelationLogic = (list, item) => {
+    let relationLogicObj = vexutils.isString(item.relationLogic) ? JSON.parse(item.relationLogic) : item.relationLogic;
     let { condition } = relationLogicObj || {};
     if (!condition || !condition.length)
       return;
@@ -190,6 +191,7 @@ const ScaleViewInit = (props, state, emit, config) => {
         c.value = replaceConditionItem(matchItem.options, value);
       }
     });
+    item.relationLogic = relationLogicObj;
   };
   const handleFrontAddress = (list) => {
     if (!list || !list.length)
@@ -338,8 +340,7 @@ const ScaleViewInit = (props, state, emit, config) => {
       return item;
     });
     return results.map((item) => {
-      let relationLogicObj = vexutils.isString(item.relationLogic) ? JSON.parse(item.relationLogic) : item.relationLogic;
-      handleRelationLogic(list, relationLogicObj);
+      handleRelationLogic(list, item);
       handLenextLogic(item);
       if (item.type === "CHECKBOX_BLOCK" && item.dbValue && !Array.isArray(item.dbValue) && props.type === "customList") {
         item.dbValue = item.dbValue.split(",").filter((ii) => !!ii);

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 → scaleview-props.js}

@@ -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/{scaleview-submit2.mjs → scaleview-submit.js}

@@ -1,7 +1,7 @@
-import { getQueryVariable, isOnlyOptions } from '../utils/judge-types2.mjs';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
+import { getQueryVariable, isOnlyOptions } from '../utils/judge-types.js';
+import vexutils from '../../../../src/utils/vexutils';
 import moment from 'moment';
-import { ScaleViewComputed } from './scaleview-computed2.mjs';
+import { ScaleViewComputed } from './scaleview-computed.js';
 
 const ScaleViewSubmit = (props, state, emit, config) => {
   const {

package/es/packages/scale-view/src/hooks/{scaleview-validate2.mjs → scaleview-validate.js}

@@ -1,73 +1,9 @@
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
+import vexutils from '../../../../src/utils/vexutils';
 import 'moment';
-import { ScaleViewComputed } from './scaleview-computed2.mjs';
+import { ScaleViewComputed } from './scaleview-computed.js';
 
 const ScaleViewValidate = (props, state, config) => {
   const { formKey } = ScaleViewComputed(props, state, config);
-  const formatRules = (formArray) => {
-    const rules = {};
-    formArray.forEach((item) => {
-      let newTitle = formKey(item);
-      if (newTitle.includes(".")) {
-        newTitle = newTitle.replace(/\./g, "~-~");
-      }
-      rules[newTitle] = [];
-      if (item.required) {
-        rules[newTitle].push({ required: item.required, message: "\u5FC5\u586B", trigger: "change" });
-      }
-      if (item.type == "MOBILE" && item.validation) {
-        rules[newTitle].push({
-          pattern: /^1[3456789]\d{9}$/,
-          message: "\u683C\u5F0F\u9519\u8BEF",
-          trigger: "blur"
-        });
-      } else if (item.type == "ID_CARD" && item.validation) {
-        rules[newTitle].push({
-          pattern: /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}))$/,
-          message: "\u683C\u5F0F\u9519\u8BEF",
-          trigger: "blur"
-        });
-      } else if (item.type == "ADDRESS" && item.required) {
-        if (handleAddressType(item)) {
-          rules[newTitle].push({
-            validator: checkAdress,
-            trigger: "change"
-          });
-        }
-      } else if (item.type == "LABEL" && item.required) {
-        rules[newTitle].push({
-          validator: checkLabel,
-          trigger: "change"
-        });
-      } else if (item.type == "DATETIME" && props.type == "customList") {
-        let dateMaxType = handleDateMaxType(item);
-        if (!dateMaxType)
-          return;
-        let obj = {
-          1: "checkDateMaxCur",
-          2: "checkDateMaxSet",
-          3: "checkDateMaxOther"
-        };
-        rules[newTitle].push({
-          validator: (rule, value) => obj[dateMaxType](rule, value, item),
-          trigger: "change"
-        });
-      } else if (item.type === "RADIO_BLOCK") {
-        state.choiceComObj[formKey(item)] = {};
-        rules[newTitle].push({
-          validator: (rule, value) => checkRadio(rule, value, item),
-          trigger: "change"
-        });
-      } else if (item.type === "CHECKBOX_BLOCK") {
-        state.choiceComObj[formKey(item)] = {};
-        rules[newTitle].push({
-          validator: (rule, value) => checkCheckbox(rule, value, item),
-          trigger: "change"
-        });
-      }
-    });
-    return rules;
-  };
   const handleAddressType = (item) => {
     let setObj = { addressType: "province-city-district-address" };
     if (vexutils.isJSON(item.setting)) {
@@ -156,6 +92,91 @@ const ScaleViewValidate = (props, state, config) => {
     }
     return true;
   };
+  const checkType = (val) => {
+    return Object.prototype.toString.call(val);
+  };
+  const validateRequired = (rule, value) => {
+    let type = checkType(value);
+    if (type == "[object Object]") {
+      if (value && Object.keys(value).length)
+        return true;
+    } else if (type == "[object Array]") {
+      if (value && value.length)
+        return true;
+    } else if (type == "[object Number]") {
+      if (value || value === 0)
+        return true;
+    } else {
+      if (value)
+        return true;
+    }
+    return new Error("\u5FC5\u586B");
+  };
+  const filterArr = ["LABEL", "ADDRESS"];
+  const formatRules = (formArray) => {
+    const rules = {};
+    formArray.forEach((item) => {
+      let newTitle = item.val_key;
+      if (newTitle.includes(".")) {
+        newTitle = newTitle.replace(/\./g, "~-~");
+      }
+      rules[newTitle] = [];
+      if (item.required && !filterArr.includes(item.type)) {
+        rules[newTitle].push({ required: item.required, message: "\u5FC5\u586B", trigger: "change", validator: validateRequired });
+      }
+      if (item.type == "MOBILE" && item.validation) {
+        rules[newTitle].push({
+          pattern: /^1[3456789]\d{9}$/,
+          message: "\u683C\u5F0F\u9519\u8BEF",
+          trigger: "blur"
+        });
+      } else if (item.type == "ID_CARD" && item.validation) {
+        rules[newTitle].push({
+          pattern: /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}))$/,
+          message: "\u683C\u5F0F\u9519\u8BEF",
+          trigger: "blur"
+        });
+      } else if (item.type == "ADDRESS" && item.required) {
+        if (handleAddressType(item)) {
+          rules[newTitle].push({
+            validator: checkAdress,
+            trigger: "change"
+          });
+        }
+      } else if (item.type == "LABEL" && item.required) {
+        rules[newTitle].push({
+          validator: checkLabel,
+          trigger: "change"
+        });
+      } else if (item.type == "DATETIME" && props.type == "customList") {
+        let dateMaxType = handleDateMaxType(item);
+        if (!dateMaxType)
+          return;
+        let obj = {
+          1: "checkDateMaxCur",
+          2: "checkDateMaxSet",
+          3: "checkDateMaxOther"
+        };
+        rules[newTitle].push({
+          validator: (rule, value) => obj[dateMaxType](rule, value, item),
+          trigger: "change"
+        });
+      } else if (item.type === "RADIO_BLOCK") {
+        state.choiceComObj[formKey(item)] = {};
+        rules[newTitle].push({
+          validator: (rule, value) => checkRadio(rule, value, item),
+          trigger: "change"
+        });
+      } else if (item.type === "CHECKBOX_BLOCK") {
+        state.choiceComObj[formKey(item)] = {};
+        rules[newTitle].push({
+          validator: (rule, value) => checkCheckbox(rule, value, item),
+          trigger: "change"
+        });
+      }
+    });
+    return rules;
+  };
   return {
     formatRules
   };