cnhis-design-vue 3.1.8-beta.9 → 3.1.9-beta.10

package/es/packages/scale-view/src/components/formitem/{r-checkbox.mjs → r-checkbox.js}

@@ -2,8 +2,8 @@ import { defineComponent, reactive, watch, createVNode, resolveComponent, isVNod
 import { NCheckboxGroup, NCheckbox, NInput, NIcon } from 'naive-ui';
 import { api } from 'v-viewer';
 import { SearchOutline } from '@vicons/ionicons5';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
-import chooseCommon from '../composables/choose-common.mjs';
+import vexutils from '../../../../../src/utils/vexutils';
+import chooseCommon from '../composables/choose-common.js';
 
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
@@ -51,12 +51,18 @@ var scriptCheckbox = defineComponent({
       handleOptions
     } = chooseCommon(props, state);
     const chooseStyleSetting = ((_b = (_a = props.item) == null ? void 0 : _a.setting) == null ? void 0 : _b.chooseStyleSetting) || 1;
-    const handlePreview = (url, i) => {
+    const handlePreview = (e, url, i) => {
+      e.preventDefault();
+      e.stopPropagation();
       let imgs = state.curOptions.map((v) => v.imageUrl);
       if (!imgs.length)
         return;
       api({
-        images: imgs
+        images: imgs,
+        options: {
+          toolbar: true,
+          initialViewIndex: i
+        }
       });
     };
     const handleCheckboxOther = (isOtherInput) => {
@@ -156,7 +162,7 @@ var scriptCheckbox = defineComponent({
         "size": "24",
         "color": "#fff",
         "component": SearchOutline,
-        "on-click": () => handlePreview(o.imageUrl)
+        "onClick": (e) => handlePreview(e, o.imageUrl, i)
       }, null)])]);
     };
     const renderPresuffix = (o, i) => {
@@ -218,7 +224,7 @@ var scriptCheckbox = defineComponent({
         "key": o.value,
         "value": o[opKey]
       }, {
-        default: () => [showImgWrap.value(o) && renderImg(o), hasPreSuffix(o) && renderPresuffix(o), !hasPreSuffix(o) && renderDefault(o), o.importability && renderOther(o)]
+        default: () => [showImgWrap.value(o) && renderImg(o, i), 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.mjs → r-collection.js}

@@ -33,7 +33,6 @@ var RCollection = defineComponent({
       describe
     } = props.item || {};
     const options = ((_b = props.item) == null ? void 0 : _b.setting) || {};
-    console.log(props.item);
     const className = computed(() => {
       const type2 = options.promptType;
       return type2 ? `is-${type2}` : "";
@@ -67,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.mjs → r-datetime.js}

@@ -1,6 +1,6 @@
 import { defineComponent, reactive, computed, createVNode, resolveComponent, createTextVNode } from 'vue';
 import { NTimePicker, NDatePicker } from 'naive-ui';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
+import vexutils from '../../../../../src/utils/vexutils';
 import moment from 'moment';
 
 var scriptDatetime = defineComponent({
@@ -31,7 +31,8 @@ var scriptDatetime = defineComponent({
     const dateType = type === "DATE" ? "date" : (_e = (_d = props.item) == null ? void 0 : _d.setting) == null ? void 0 : _e.dateType;
     const timeFormat = "HH:mm:ss";
     const state = reactive({
-      rangeValue: [null, null]
+      rangeValue: [null, null],
+      dateValue: null
     });
     const useDateRangeType = computed(() => {
       if (dateType == "datetime")
@@ -54,6 +55,8 @@ var scriptDatetime = defineComponent({
         let eV = val1 ? vexutils.isValidDate(new Date(val1)) ? val1 : null : null;
         state.rangeValue = [sV, eV];
         return;
+      } else {
+        state.dateValue = val;
       }
     };
     const disStartHours = (hour) => {
@@ -134,12 +137,16 @@ var scriptDatetime = defineComponent({
       }
       context.emit("scaleChange", [otherVal || "", formattedValue], props.item);
     };
+    const changeDate = (val, formattedValue) => {
+      context.emit("scaleChange", formattedValue, props.item);
+    };
     const renderTime = () => {
       return createVNode(resolveComponent("n-time-picker"), {
-        "formatted-value": props.form[props.item.val_key],
-        "onUpdate:formatted-value": ($event) => props.form[props.item.val_key] = $event,
+        "formatted-value": state.dateValue,
+        "onUpdate:formatted-value": ($event) => state.dateValue = $event,
         "clearable": true,
-        "disabled": props.isLock
+        "disabled": props.isLock,
+        "onUpdate:value": changeDate
       }, null);
     };
     const renderTimeRange = () => {
@@ -165,20 +172,22 @@ var scriptDatetime = defineComponent({
     };
     const renderDate = () => {
       return createVNode(resolveComponent("n-date-picker"), {
-        "formatted-value": props.form[props.item.val_key],
-        "onUpdate:formatted-value": ($event) => props.form[props.item.val_key] = $event,
+        "formatted-value": state.dateValue,
+        "onUpdate:formatted-value": ($event) => state.dateValue = $event,
         "type": dateType,
         "clearable": true,
-        "disabled": props.isLock
+        "disabled": props.isLock,
+        "onUpdate:value": changeDate
       }, null);
     };
     const renderDateRange = () => {
       return createVNode(resolveComponent("n-date-picker"), {
-        "formatted-value": props.form[props.item.val_key],
-        "onUpdate:formatted-value": ($event) => props.form[props.item.val_key] = $event,
+        "formatted-value": state.dateValue,
+        "onUpdate:formatted-value": ($event) => state.dateValue = $event,
         "type": useDateRangeType.value,
         "clearable": true,
-        "disabled": props.isLock
+        "disabled": props.isLock,
+        "onUpdate:value": changeDate
       }, null);
     };
     defaultValue(props.form[props.item.val_key]);

package/es/packages/scale-view/src/components/formitem/{r-input.mjs → r-input.js}

@@ -29,7 +29,7 @@ var RInput = defineComponent({
     let eleType = ((_b = props.item) == null ? void 0 : _b.type) || "INPUT";
     let isTextarea = eleType == "INPUT" || eleType == "EVALUATE_INPUT";
     let row = ((_d = (_c = props.item) == null ? void 0 : _c.setting) == null ? void 0 : _d.inputRow) || 1;
-    let defaultPlaceHolder = ((_f = (_e = props.item) == null ? void 0 : _e.setting) == null ? void 0 : _f.defaultPlaceHolder) || "\u8BF7\u8F93\u5165";
+    let defaultPlaceHolder = (_f = (_e = props.item) == null ? void 0 : _e.setting) == null ? void 0 : _f.defaultPlaceHolder;
     const setTextareaRow = computed(() => {
       if (!row || row == "auto") {
         return {

package/es/packages/scale-view/src/components/formitem/{r-map.mjs → r-map.js}

@@ -1,8 +1,8 @@
 import { defineComponent, reactive, createVNode, resolveComponent } from 'vue';
 import { NModal, NInput, NIcon } from 'naive-ui';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
+import vexutils from '../../../../../src/utils/vexutils';
 import { AlertCircleOutline } from '@vicons/ionicons5';
-import CMap from 'cnhis-design-vue/es/packages/map';
+import CMap from '../../../../../packages/map';
 
 var RMap = defineComponent({
   name: "RMap",
@@ -72,7 +72,8 @@ var RMap = defineComponent({
         "value": state.mapLocation,
         "disabled": true,
         "class": "map-input",
-        "on-click": clickMap
+        "on-click": clickMap,
+        "placeholder": "\u8BF7\u9009\u62E9"
       }, {
         prefix: () => createVNode(resolveComponent("n-icon"), {
           "size": "18",

package/es/packages/scale-view/src/components/formitem/{r-radio.mjs → r-radio.js}

@@ -2,7 +2,7 @@ import { defineComponent, reactive, watch, createVNode, resolveComponent, isVNod
 import { NRadioGroup, NRadio, NInput, NIcon } from 'naive-ui';
 import { api } from 'v-viewer';
 import { SearchOutline } from '@vicons/ionicons5';
-import chooseCommon from '../composables/choose-common.mjs';
+import chooseCommon from '../composables/choose-common.js';
 
 function _isSlot(s) {
   return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
@@ -50,12 +50,18 @@ var scriptRadio = defineComponent({
       handleOptions
     } = chooseCommon(props, state);
     const chooseStyleSetting = ((_b = (_a = props.item) == null ? void 0 : _a.setting) == null ? void 0 : _b.chooseStyleSetting) || 1;
-    const handlePreview = (url, i) => {
+    const handlePreview = (e, url, i) => {
+      e.preventDefault();
+      e.stopPropagation();
       let imgs = state.curOptions.map((v) => v.imageUrl);
       if (!imgs.length)
         return;
       api({
-        images: imgs
+        images: imgs,
+        options: {
+          toolbar: true,
+          initialViewIndex: i
+        }
       });
     };
     const handleRadioDef = (item, curValue, options) => {
@@ -148,7 +154,7 @@ var scriptRadio = defineComponent({
         "size": "24",
         "color": "#fff",
         "component": SearchOutline,
-        "on-click": () => handlePreview(o.imageUrl)
+        "onClick": (e) => handlePreview(e, o.imageUrl, i)
       }, null)])]);
     };
     const renderPresuffix = (o, i) => {
@@ -210,7 +216,7 @@ var scriptRadio = defineComponent({
         "key": o.value,
         "value": o[opKey]
       }, {
-        default: () => [showImgWrap.value(o) && renderImg(o), hasPreSuffix(o) && renderPresuffix(o), !hasPreSuffix(o) && renderDefault(o), o.importability && renderOther(o)]
+        default: () => [showImgWrap.value(o) && renderImg(o, i), 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.mjs → r-select.js}

@@ -1,10 +1,13 @@
-import { defineComponent, reactive, watch, createVNode, resolveComponent } from 'vue';
-import { NSelect } from 'naive-ui';
+import { defineComponent, reactive, computed, watch, createVNode, resolveComponent } from 'vue';
+import { NSelect, NEmpty } from 'naive-ui';
+import script from '../LoadingCom.js';
 
 var scriptSelect = defineComponent({
   name: "RSelect",
   components: {
-    NSelect
+    NSelect,
+    NEmpty,
+    LoadingCom: script
   },
   props: {
     form: {
@@ -52,6 +55,10 @@ var scriptSelect = defineComponent({
       fetching: false
     });
     props.openType == "formIframe";
+    const isMultiple = computed(() => {
+      var _a, _b;
+      return !!((_b = (_a = props.item) == null ? void 0 : _a.setting) == null ? void 0 : _b.isMultiple);
+    });
     const initSelectOptions = async () => {
       const {
         targetSource,
@@ -66,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;
@@ -123,10 +134,13 @@ var scriptSelect = defineComponent({
         "onUpdate:value": [($event) => props.form[props.item.val_key] = $event, handleSelectChange],
         "filterable": true,
         "placeholder": "\u8BF7\u9009\u62E9",
+        "multiple": isMultiple.value,
         "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.mjs → r-upload.js}

@@ -1,7 +1,7 @@
 import { defineComponent, reactive, createVNode, resolveComponent, createTextVNode } from 'vue';
 import { NUpload, NUploadDragger, NModal, NIcon, useMessage } from 'naive-ui';
 import { Add, CameraOutline } from '@vicons/ionicons5';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
+import vexutils from '../../../../../src/utils/vexutils';
 
 var RUpload = defineComponent({
   name: "RUpload",
@@ -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/components/formitem/text-over-tooltip/{TextOverTooltip.mjs → TextOverTooltip.js}

@@ -1,4 +1,4 @@
-import script from './TextOverTooltip.vue_vue_type_script_setup_true_lang.mjs';
-export { default } from './TextOverTooltip.vue_vue_type_script_setup_true_lang.mjs';
+import script from './TextOverTooltip.vue_vue_type_script_setup_true_lang.js';
+export { default } from './TextOverTooltip.vue_vue_type_script_setup_true_lang.js';
 
 script.__file = "packages/scale-view/src/components/formitem/text-over-tooltip/TextOverTooltip.vue";

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

@@ -173,6 +173,7 @@ declare const _default: import("vue").DefineComponent<{
         scrollable: BooleanConstructor;
         contentStyle: import("vue").PropType<string | import("vue").CSSProperties>;
         headerStyle: import("vue").PropType<string | import("vue").CSSProperties>;
+        footerStyle: import("vue").PropType<string | import("vue").CSSProperties>;
         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>>;
@@ -474,6 +475,7 @@ declare const _default: import("vue").DefineComponent<{
         scrollable: BooleanConstructor;
         contentStyle: import("vue").PropType<string | import("vue").CSSProperties>;
         headerStyle: import("vue").PropType<string | import("vue").CSSProperties>;
+        footerStyle: import("vue").PropType<string | import("vue").CSSProperties>;
         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>>;

package/es/packages/scale-view/src/components/formitem/text-over-tooltip/{TextOverTooltip.vue_vue_type_script_setup_true_lang.mjs → TextOverTooltip.vue_vue_type_script_setup_true_lang.js}

@@ -1,6 +1,6 @@
 import { defineComponent, ref, computed, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, normalizeClass, renderSlot, toDisplayString, createTextVNode } from 'vue';
 import { NTooltip } from 'naive-ui';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
+import vexutils from '../../../../../../src/utils/vexutils';
 
 const _hoisted_1 = { class: "text-over-tooltip-components" };
 const __default__ = {

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

@@ -1,8 +1,8 @@
 import { computed } from 'vue';
-import { isEvaluation } from '../utils/judge-types.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-component.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,9 +98,9 @@ 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) {

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

@@ -1,10 +1,10 @@
-import { handleQueryParams, getQueryVariable } from '../utils/judge-types.mjs';
-import useNoData from './use-noData.mjs';
-import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
-import { componentMap } from './use-component.mjs';
-import { useEvent } from './use-event.mjs';
-import { ScaleViewComputed } from './scaleview-computed.mjs';
-import { ScaleViewValidate } from './scaleview-validate.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-submit.mjs → scaleview-submit.js}

@@ -1,7 +1,7 @@
-import { getQueryVariable, isOnlyOptions } from '../utils/judge-types.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-computed.mjs';
+import { ScaleViewComputed } from './scaleview-computed.js';
 
 const ScaleViewSubmit = (props, state, emit, config) => {
   const {

package/es/packages/scale-view/src/hooks/{scaleview-validate.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-computed.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
   };