cnhis-design-vue 3.1.12-beta.2 → 3.1.12-beta.3

package/es/node_modules/date-fns/esm/differenceInCalendarYears/index.js

@@ -0,0 +1,33 @@
+import toDate from '../toDate/index.js';
+import requiredArgs from '../_lib/requiredArgs/index.js';
+
+/**
+ * @name differenceInCalendarYears
+ * @category Year Helpers
+ * @summary Get the number of calendar years between the given dates.
+ *
+ * @description
+ * Get the number of calendar years between the given dates.
+ *
+ * @param {Date|Number} dateLeft - the later date
+ * @param {Date|Number} dateRight - the earlier date
+ * @returns {Number} the number of calendar years
+ * @throws {TypeError} 2 arguments required
+ *
+ * @example
+ * // How many calendar years are between 31 December 2013 and 11 February 2015?
+ * const result = differenceInCalendarYears(
+ *   new Date(2015, 1, 11),
+ *   new Date(2013, 11, 31)
+ * )
+ * //=> 2
+ */
+
+function differenceInCalendarYears(dirtyDateLeft, dirtyDateRight) {
+  requiredArgs(2, arguments);
+  var dateLeft = toDate(dirtyDateLeft);
+  var dateRight = toDate(dirtyDateRight);
+  return dateLeft.getFullYear() - dateRight.getFullYear();
+}
+
+export { differenceInCalendarYears as default };

package/es/node_modules/date-fns/esm/differenceInYears/index.js

@@ -0,0 +1,43 @@
+import toDate from '../toDate/index.js';
+import differenceInCalendarYears from '../differenceInCalendarYears/index.js';
+import compareAsc from '../compareAsc/index.js';
+import requiredArgs from '../_lib/requiredArgs/index.js';
+
+/**
+ * @name differenceInYears
+ * @category Year Helpers
+ * @summary Get the number of full years between the given dates.
+ *
+ * @description
+ * Get the number of full years between the given dates.
+ *
+ * @param {Date|Number} dateLeft - the later date
+ * @param {Date|Number} dateRight - the earlier date
+ * @returns {Number} the number of full years
+ * @throws {TypeError} 2 arguments required
+ *
+ * @example
+ * // How many full years are between 31 December 2013 and 11 February 2015?
+ * const result = differenceInYears(new Date(2015, 1, 11), new Date(2013, 11, 31))
+ * //=> 1
+ */
+
+function differenceInYears(dirtyDateLeft, dirtyDateRight) {
+  requiredArgs(2, arguments);
+  var dateLeft = toDate(dirtyDateLeft);
+  var dateRight = toDate(dirtyDateRight);
+  var sign = compareAsc(dateLeft, dateRight);
+  var difference = Math.abs(differenceInCalendarYears(dateLeft, dateRight)); // Set both dates to a valid leap year for accurate comparison when dealing
+  // with leap days
+
+  dateLeft.setFullYear(1584);
+  dateRight.setFullYear(1584); // Math.abs(diff in full years - diff in calendar years) === 1 if last calendar year is not full
+  // If so, result must be decreased by 1 in absolute value
+
+  var isLastYearNotFull = compareAsc(dateLeft, dateRight) === -sign;
+  var result = sign * (difference - Number(isLastYearNotFull)); // Prevent negative zero
+
+  return result === 0 ? 0 : result;
+}
+
+export { differenceInYears as default };

package/es/packages/form-render/index.d.ts

@@ -92,6 +92,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
+    businessFilter: {
+        type: import("vue").PropType<import("./src/types").FormBusinessFilter>;
+    };
     scope: {
         type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};
@@ -194,6 +197,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>>;
             default: () => {};
         };
+        businessFilter: {
+            type: import("vue").PropType<import("./src/types").FormBusinessFilter>;
+        };
         scope: {
             type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
             default: () => {};
@@ -1383,6 +1389,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
+    businessFilter: {
+        type: import("vue").PropType<import("./src/types").FormBusinessFilter>;
+    };
     scope: {
         type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="lodash" />
 import { AnyObject } from '../../../../es/src/types';
 import { Component, FunctionalComponent, PropType } from 'vue';
-import { FieldItem, FieldVisitor } from './types';
+import { FieldItem, FieldVisitor, FormBusinessFilter } from './types';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -92,6 +92,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
+    businessFilter: {
+        type: PropType<FormBusinessFilter>;
+    };
     scope: {
         type: PropType<AnyObject>;
         default: () => {};
@@ -194,6 +197,9 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | FunctionalComponent<{}, {}>>>;
             default: () => {};
         };
+        businessFilter: {
+            type: PropType<FormBusinessFilter>;
+        };
         scope: {
             type: PropType<AnyObject>;
             default: () => {};
@@ -1383,6 +1389,9 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<Record<string, Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | FunctionalComponent<{}, {}>>>;
         default: () => {};
     };
+    businessFilter: {
+        type: PropType<FormBusinessFilter>;
+    };
     scope: {
         type: PropType<AnyObject>;
         default: () => {};

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -29,6 +29,7 @@ var script = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => ({})
     },
+    businessFilter: { type: Function },
     scope: { type: Object, default: () => ({}) },
     consumer: { type: Boolean, default: false },
     uuid: { type: String }

package/es/packages/form-render/src/components/renderer/cascader.js

@@ -57,7 +57,7 @@ const script = defineComponent({
         }
         arrayed(config.dependKey).forEach((key) => {
           if (isString(key)) {
-            params[key] = option[config.valueKey];
+            params[key] = option[valueKey.value];
           } else if (isObject(key)) {
             params[key.paramName] = option[key.paramValue];
           }
@@ -80,12 +80,13 @@ const script = defineComponent({
           currentOption = currentOption.parent;
         }
         updateValue(null, null, result2);
+        show.value = false;
         return;
       }
       const result = data.reduce((res, d) => {
         res.push({
-          [config.nameKey]: d[config.nameKey],
-          [config.valueKey]: d[config.valueKey],
+          [labelKey.value]: d[labelKey.value],
+          [valueKey.value]: d[valueKey.value],
           depth: parentDepth + 1,
           parent: option,
           isLeaf: parentDepth + 2 >= props.deep

package/es/packages/form-render/src/hooks/useAnchor.js

@@ -57,9 +57,9 @@ function useAnchor(props, collector) {
     }) || anchorIdList.value[anchorIdList.value.length - 1];
     __currentAnchor.value = (_a = result == null ? void 0 : result.name) != null ? _a : "";
   }, 300);
-  watch(anchorIdList, (anchorIdList2) => {
+  watch(anchorIdList, (_anchorIdList) => {
     var _a, _b;
-    __currentAnchor.value = (_b = (_a = anchorIdList2[0]) == null ? void 0 : _a.name) != null ? _b : "";
+    __currentAnchor.value = (_b = (_a = _anchorIdList[0]) == null ? void 0 : _a.name) != null ? _b : "";
   }, { deep: true, immediate: true });
   const currentAnchor = computed({
     get() {

package/es/packages/form-render/src/hooks/useBusinessBinding.d.ts

@@ -1,15 +1,19 @@
 import { Form } from '@formily/core';
+import { FormBusinessFilter } from '../../../../../es/packages/form-render';
 import { FIELD_BUSINESS_TYPE } from '../constants';
 export declare class BusinessCollector {
     private readonly typeCollector;
     private readonly fieldNameCollector;
+    private readonly valueFilter;
+    constructor(valueFilter?: FormBusinessFilter);
     collect(type: FIELD_BUSINESS_TYPE, fieldName: string): void;
     getField(type: FIELD_BUSINESS_TYPE): string[];
     getType(fieldName: string): FIELD_BUSINESS_TYPE | undefined;
-    handlerIdCardType(formModel: Form, value: unknown): void;
+    private handlerIdCardType;
+    private handlerBirthdayType;
     handlerMap: Map<FIELD_BUSINESS_TYPE, (formModel: Form, value: unknown) => void>;
     trigger(formModel: Form, fieldName: string, value: unknown): void;
 }
 export declare function useBusinessBinding(): {
-    create: () => BusinessCollector;
+    create: (valueFilter?: FormBusinessFilter) => BusinessCollector;
 };

package/es/packages/form-render/src/hooks/useBusinessBinding.js

@@ -1,14 +1,16 @@
 import { isString } from '@vueuse/core';
 import { FIELD_BUSINESS_TYPE } from '../constants/index.js';
-import { isIdCard, parseIdCard } from '../utils/index.js';
+import { isIdCard, parseIdCard, parseBirthday } from '../utils/index.js';
 
 class BusinessCollector {
-  constructor() {
+  constructor(valueFilter = ({ value }) => value) {
     this.typeCollector = /* @__PURE__ */ new Map();
     this.fieldNameCollector = /* @__PURE__ */ new Map();
     this.handlerMap = /* @__PURE__ */ new Map([
-      [FIELD_BUSINESS_TYPE.ID_CARD, this.handlerIdCardType.bind(this)]
+      [FIELD_BUSINESS_TYPE.ID_CARD, this.handlerIdCardType.bind(this)],
+      [FIELD_BUSINESS_TYPE.BIRTHDAY, this.handlerBirthdayType.bind(this)]
     ]);
+    this.valueFilter = valueFilter;
   }
   collect(type, fieldName) {
     const set = this.typeCollector.get(type) || /* @__PURE__ */ new Set();
@@ -29,19 +31,40 @@ class BusinessCollector {
     const ageFields = this.getField(FIELD_BUSINESS_TYPE.AGE);
     ageFields.forEach((field) => {
       formModel.setFieldState(field, (state) => {
-        state.value = info.age;
+        state.value = this.valueFilter({
+          fieldKey: field,
+          value: info.age,
+          context: info,
+          type: FIELD_BUSINESS_TYPE.AGE
+        });
       });
     });
     const sexFields = this.getField(FIELD_BUSINESS_TYPE.SEX);
     sexFields.forEach((field) => {
       formModel.setFieldState(field, (state) => {
-        state.value = info.sex;
+        state.value = this.valueFilter({ fieldKey: field, value: info.sex, type: FIELD_BUSINESS_TYPE.SEX });
       });
     });
     const birthdayFields = this.getField(FIELD_BUSINESS_TYPE.BIRTHDAY);
     birthdayFields.forEach((field) => {
       formModel.setFieldState(field, (state) => {
-        state.value = info.birthday;
+        state.value = this.valueFilter({ fieldKey: field, value: info.birthday, type: FIELD_BUSINESS_TYPE.BIRTHDAY });
+      });
+    });
+  }
+  handlerBirthdayType(formModel, value) {
+    if (!isString(value))
+      return;
+    const ageFields = this.getField(FIELD_BUSINESS_TYPE.AGE);
+    ageFields.forEach((field) => {
+      const context = parseBirthday(value);
+      formModel.setFieldState(field, (state) => {
+        state.value = this.valueFilter({
+          fieldKey: field,
+          value: context.year,
+          context,
+          type: FIELD_BUSINESS_TYPE.AGE
+        });
       });
     });
   }
@@ -53,8 +76,8 @@ class BusinessCollector {
   }
 }
 function useBusinessBinding() {
-  function create() {
-    return new BusinessCollector();
+  function create(valueFilter) {
+    return new BusinessCollector(valueFilter);
   }
   return { create };
 }

package/es/packages/form-render/src/hooks/useFieldListAdaptor.js

@@ -1,4 +1,4 @@
-import { pick } from 'lodash-es';
+import { isArray, pick } from 'lodash-es';
 import { arrayed, transformDateFormat } from '../utils/index.js';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
 import { isObject } from '@vueuse/core';
@@ -17,7 +17,11 @@ function useFieldListAdaptor(collector, uuid) {
         id: `${uuid}-${item.val_key}`
       },
       "x-component": item.html_type,
-      "x-component-props": { placeholder: item.placeholder, clearable: item.is_empty === "1" },
+      "x-component-props": {
+        placeholder: item.placeholder,
+        clearable: item.is_empty === "1",
+        ...item.componentProps || {}
+      },
       "x-display": item.is_show === "0" ? "hidden" : "visible",
       "x-pattern": item.is_edit === "0" ? "disabled" : "editable"
     };
@@ -169,6 +173,7 @@ function useFieldListAdaptor(collector, uuid) {
     }));
     return {
       type: "void",
+      name: fieldList.map((f) => f.val_key).join("-"),
       title: item.alias || item.name,
       "x-component": "INPUT_GROUP",
       "x-component-props": { span: item.elem_width },
@@ -184,16 +189,22 @@ function useFieldListAdaptor(collector, uuid) {
       const obj_type = (_a = cur.validate) == null ? void 0 : _a.obj_type;
       obj_type && collector.collect(obj_type, cur.val_key);
       if (cur.html_type === "LINEBAR") {
-        fin[cur.val_key] = createLinebarSchema(cur);
-        prevLinebar = fin[cur.val_key].properties = {};
+        fin[createFieldName(cur)] = createLinebarSchema(cur);
+        prevLinebar = fin[createFieldName(cur)].properties = {};
       } else if (prevLinebar) {
-        prevLinebar[cur.val_key] = createWidgetSchema(cur);
+        prevLinebar[createFieldName(cur)] = createWidgetSchema(cur);
       } else {
         prevLinebar = null;
-        fin[cur.val_key] = createWidgetSchema(cur);
+        fin[createFieldName(cur)] = createWidgetSchema(cur);
       }
       return fin;
     }, {});
+    function createFieldName(fieldItem) {
+      if (isArray(fieldItem.suffixConfig)) {
+        return [fieldItem.val_key, fieldItem.suffixConfig.map((f) => f.val_key)].join("-");
+      }
+      return fieldItem.val_key;
+    }
   }
   return { schemaAdaptor };
 }

package/es/packages/form-render/src/hooks/useFormContext.js

@@ -2,6 +2,7 @@ import { provide } from 'vue';
 import { createSchemaField } from '@formily/vue';
 import { useAsyncQueue, useBusinessBinding, useChangeContext, useFormItemDeps } from '../../../../packages/form-render';
 import * as components from '../../../../packages/form-render/src/components/renderer';
+import { usePresetScope } from '../../../../packages/form-render/src/hooks/usePresetScope';
 import { injectOrProvide, uuidGenerator } from '../../../../packages/form-render/src/utils';
 import { InjectAsyncQueue, InjectionSchemaField, InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectionFormUUID } from '../../../../packages/form-render/src/constants';
 
@@ -12,9 +13,9 @@ function useFormContext(props) {
       ...components,
       ...props.components
     },
-    scope: props.scope
+    scope: Object.assign({}, usePresetScope(), props.scope)
   }).SchemaField);
-  const businessCollector = useBusinessBinding().create();
+  const businessCollector = useBusinessBinding().create(props.businessFilter);
   provide(InjectionBusinessCollector, businessCollector);
   const changeContextCollector = useChangeContext().create();
   provide(InjectionChangeContextCollector, changeContextCollector);

package/es/packages/form-render/src/hooks/usePresetScope.d.ts

@@ -0,0 +1,6 @@
+export declare function usePresetScope(): {
+    isIdCard(value: unknown): boolean;
+    isMobile(value: unknown): boolean;
+    isEmail(value: unknown): boolean;
+    isNumber(value: unknown): boolean;
+};

package/es/packages/form-render/src/hooks/usePresetScope.js

@@ -0,0 +1,21 @@
+import { isString } from 'lodash-es';
+import { isIdCard, isMobile } from '../../../../packages/form-render/src/utils';
+
+function usePresetScope() {
+  return {
+    isIdCard(value) {
+      return isString(value) && isIdCard(value);
+    },
+    isMobile(value) {
+      return isString(value) && isMobile(value);
+    },
+    isEmail(value) {
+      return isString(value) && /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(value);
+    },
+    isNumber(value) {
+      return isString(value) && /\d+/.test(value);
+    }
+  };
+}
+
+export { usePresetScope };

package/es/packages/form-render/src/hooks/useTypeNormalize.js

@@ -1,6 +1,6 @@
 function useTypeNormalize() {
   function normalizeAgeField(item) {
-    item.html_type = "INPUT";
+    item.html_type = "INPUT_NUMBER";
     item.suffixConfig = [
       {
         val_key: item.val_key_unit,

package/es/packages/form-render/src/types/index.d.ts

@@ -1,5 +1,6 @@
 import { AnyObject } from '../../../../../es/src/types';
 import { DataField, Field } from '@formily/core';
+import { FIELD_BUSINESS_TYPE } from '../../../../../es/packages/form-render/src/constants';
 import { FieldItem } from '../types';
 import { AsyncQueue } from '../hooks';
 export * from './fieldItem';
@@ -35,3 +36,9 @@ export declare type FormChangePayload = {
     fieldInstance: DataField;
     context: FormChangeContext;
 };
+export declare type FormBusinessFilter = (payload: {
+    fieldKey: string;
+    value: unknown;
+    type: FIELD_BUSINESS_TYPE;
+    context?: any;
+}) => unknown;

package/es/packages/form-render/src/utils/index.d.ts

@@ -10,6 +10,8 @@ export declare function assignUpdateValue(props: AnyObject, field: GeneralField)
 };
 export declare function transformDateFormat(format: string): "date" | "datetime";
 export declare function isIdCard(idCardNo: string): boolean;
+export declare function isMobile(mobile: string): boolean;
+export declare function parseBirthday(birthday: string): Record<string, any>;
 export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
 export declare function generateUrlParams(field: GeneralField, dependKeys?: string | string[]): AnyObject;

package/es/packages/form-render/src/utils/index.js

@@ -3,6 +3,7 @@ import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
 import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.js';
 import differenceInMonths from '../../../../node_modules/date-fns/esm/differenceInMonths/index.js';
+import differenceInYears from '../../../../node_modules/date-fns/esm/differenceInYears/index.js';
 import '../../../../node_modules/date-fns/esm/parse/_lib/parsers/index.js';
 import { inject, provide } from 'vue';
 
@@ -31,6 +32,18 @@ function transformDateFormat(format) {
 function isIdCard(idCardNo) {
   return /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}(\d|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}))$/.test(idCardNo);
 }
+function isMobile(mobile) {
+  return /^1(3\d|4[5-9]|5[0-35-9]|6[2567]|7[0-8]|8\d|9[0-35-9])\d{8}$/.test(mobile);
+}
+function parseBirthday(birthday) {
+  const result = {};
+  const d = new Date();
+  const birthDate = new Date(birthday);
+  result.day = differenceInDays(d, birthDate);
+  result.month = differenceInMonths(d, birthDate);
+  result.year = differenceInYears(d, birthDate);
+  return result;
+}
 function parseIdCard(idCardNo) {
   const parseInner = (certificateNo, idxSexStart, birthYearSpan) => {
     const res = {};
@@ -42,9 +55,8 @@ function parseIdCard(idCardNo) {
     res.birthday = year + "-" + month + "-" + day;
     const d = new Date();
     const monthFloor = d.getMonth() + 1 < parseInt(month, 10) || d.getMonth() + 1 == parseInt(month, 10) && d.getDate() < parseInt(day, 10) ? 1 : 0;
+    Object.assign(res, parseBirthday(res.birthday));
     res.age = res.year = d.getFullYear() - parseInt(year, 10) - monthFloor;
-    res.day = differenceInDays(d, new Date(res.birthday));
-    res.month = differenceInMonths(d, new Date(res.birthday));
     return res;
   };
   return parseInner(idCardNo, idCardNo.length == 15 ? 14 : 16, idCardNo.length == 15 ? 2 : 4);
@@ -84,4 +96,4 @@ function uuidGenerator() {
   });
 }
 
-export { arrayed, assignUpdateValue, formRenderLog, generateUrlParams, injectOrProvide, isIdCard, parseIdCard, transformDateFormat, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, formRenderLog, generateUrlParams, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, transformDateFormat, traverseSchema, uuidGenerator };

package/es/packages/index.css

@@ -1669,6 +1669,7 @@ body > .vxe-table--tooltip-wrapper {
   cursor: pointer;
 }
 .c-scale .linebar-div {
+  width: 100%;
   text-align: center;
   margin-top: 24px;
 }
@@ -1687,6 +1688,12 @@ body > .vxe-table--tooltip-wrapper {
 .main {
   box-sizing: border-box;
 }
+.main .n-form-item.n-form-item--top-labelled .n-form-item-label {
+  display: block;
+}
+.main .n-form-item .n-form-item-blank {
+  display: block;
+}
 .main .scale-label-required {
   font-weight: 700;
 }
@@ -1694,6 +1701,9 @@ body > .vxe-table--tooltip-wrapper {
   color: #e02828;
   font-weight: 700;
 }
+.main .score-i {
+  word-break: keep-all;
+}
 .main .evalute-label {
   display: inline-block;
   height: 20px;
@@ -2113,6 +2123,7 @@ body > .vxe-table--tooltip-wrapper {
 .c-scale-collection.prompt-message .prompt-message-content {
   line-height: 16px;
   font-size: 14px;
+  word-break: break-all;
 }
 .c-time-range {
   display: flex;

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

@@ -503,6 +503,10 @@ declare const CScaleView: SFCWithInstall<import("vue").DefineComponent<{
         init: () => void;
         checkType: (val: any) => string;
         diffAnswered: (form: any) => void;
+        getCountdownObj: () => {
+            setAnswered: number;
+            totalLen: number;
+        };
         SvgIcon: import("vue").DefineComponent<{
             iconClass: {
                 type: StringConstructor;

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

@@ -503,6 +503,10 @@ declare const _default: import("vue").DefineComponent<{
         init: () => void;
         checkType: (val: any) => string;
         diffAnswered: (form: any) => void;
+        getCountdownObj: () => {
+            setAnswered: number;
+            totalLen: number;
+        };
         SvgIcon: import("vue").DefineComponent<{
             iconClass: {
                 type: StringConstructor;

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

@@ -140,7 +140,7 @@ var script = /* @__PURE__ */ defineComponent({
         return;
       }
       let key = "getSubjectAnswer";
-      const fn = ((_a = state.scaleApiConfig) == null ? void 0 : _a[key]) || null;
+      const fn = ((_a = props.scaleApiConfig) == null ? void 0 : _a[key]) || null;
       if (!fn || typeof fn !== "function") {
         message.error(`${key} Is not a function`);
         return;
@@ -228,6 +228,7 @@ var script = /* @__PURE__ */ defineComponent({
       };
     };
     const onSubmit = () => {
+      var _a;
       let hasEvaluate = state.formArray.find((item) => isEvaluation(item.type));
       if (!hasEvaluate) {
         confirmSubmit("\u786E\u8BA4\u8981\u63D0\u4EA4\u5417\uFF1F");
@@ -242,15 +243,15 @@ var script = /* @__PURE__ */ defineComponent({
         emit("submitNoRequest");
         return;
       }
-      if (!(state == null ? void 0 : state.showEvaluateCountdown)) {
-        confirmSubmit("\u786E\u8BA4\u8981\u7ED3\u675F\u6D4B\u8BC4\u5417\uFF1F");
-        return;
-      }
-      let message2 = "\u786E\u8BA4\u8981\u63D0\u524D\u7ED3\u675F\u6D4B\u8BC4\u5417\uFF1F";
-      let setAnswered = countdownDom == null ? void 0 : countdownDom.setAnswered;
-      let totalLen = countdownDom == null ? void 0 : countdownDom.totalLen;
-      if (setAnswered < totalLen) {
-        message2 = "\u5B58\u5728\u672A\u89E3\u7B54\u7684\u9898\u76EE\uFF0C\u786E\u5B9A\u8981\u63D0\u524D\u7ED3\u675F\u5417\uFF1F";
+      let message2 = "\u786E\u5B9A\u8981\u63D0\u524D\u7ED3\u675F\u6D4B\u8BC4\u5417\uFF1F";
+      if (showEvaluateCoundownPage.value && ((_a = countdownDom.value) == null ? void 0 : _a.getCountdownObj)) {
+        const evaCountdownObj = countdownDom.value.getCountdownObj();
+        const { setAnswered, totalLen } = evaCountdownObj;
+        if (setAnswered < totalLen) {
+          message2 = "\u5B58\u5728\u672A\u4F5C\u7B54\u7684\u9898\u76EE\uFF0C\u786E\u5B9A\u8981\u63D0\u524D\u7ED3\u675F\u6D4B\u8BC4\u5417\uFF1F";
+        } else {
+          !(state == null ? void 0 : state.showEvaluateCountdown) && (message2 = "\u786E\u8BA4\u8981\u7ED3\u675F\u6D4B\u8BC4\u5417\uFF1F");
+        }
       }
       confirmSubmit(message2);
     };

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

@@ -71,6 +71,10 @@ declare const _default: import("vue").DefineComponent<{
     init: () => void;
     checkType: (val: any) => string;
     diffAnswered: (form: any) => void;
+    getCountdownObj: () => {
+        setAnswered: number;
+        totalLen: number;
+    };
     SvgIcon: import("vue").DefineComponent<{
         iconClass: {
             type: StringConstructor;

package/es/packages/scale-view/src/components/EvaluateCountdown.vue_vue_type_script_setup_true_lang.js

@@ -75,9 +75,14 @@ var script = /* @__PURE__ */ defineComponent({
       console.log(val, "\u89E6\u53D1\u4FEE\u6539\u5566\u5566\u5566");
       diffAnswered(val);
     }, { immediate: true, deep: true });
+    const getCountdownObj = () => {
+      return {
+        setAnswered: state.setAnswered,
+        totalLen: evaluateState.totalLen
+      };
+    };
     expose({
-      setAnswered: state.setAnswered,
-      totalLen: evaluateState.totalLen
+      getCountdownObj
     });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {

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

@@ -53,8 +53,6 @@ var RInput = defineComponent({
     };
     const inputValue = ref(props.form[props.item.val_key]);
     watch(() => props.form[props.item.val_key], (val) => {
-      if (!val)
-        return;
       inputValue.value = val;
     }, {
       immediate: true

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

@@ -59,6 +59,58 @@ var scriptSelect = defineComponent({
       var _a, _b;
       return !!((_b = (_a = props.item) == null ? void 0 : _a.setting) == null ? void 0 : _b.isMultiple);
     });
+    const isDynamic2Static = computed(() => {
+      let {
+        targetSource = {},
+        options = [],
+        optionType
+      } = props.item || {};
+      if (targetSource.target_id && (options.length || optionType == 3))
+        return true;
+      return false;
+    });
+    const columnKey = computed(() => {
+      var _a;
+      let {
+        target_id,
+        values
+      } = ((_a = props.item) == null ? void 0 : _a.targetSource) || {};
+      if (!target_id || !values)
+        return "value";
+      if (isDynamic2Static.value)
+        return values || "value";
+      return values;
+    });
+    const labelKey = computed(() => {
+      var _a;
+      let {
+        target_id,
+        showField
+      } = ((_a = props.item) == null ? void 0 : _a.targetSource) || {};
+      if (!target_id || !showField)
+        return "label";
+      if (isDynamic2Static.value)
+        return showField || "label";
+      return showField;
+    });
+    const handleDynamic2StaticOptions = (options) => {
+      if (!options || !options.length)
+        return [];
+      return options.map((item) => {
+        if ("cascadeData" in item) {
+          Object.assign(item, {
+            ...item.cascadeData
+          });
+        }
+        if (!(columnKey.value in item)) {
+          item[columnKey.value] = item.value || item.label;
+        }
+        if (!(labelKey.value in item)) {
+          item[labelKey.value] = item.label;
+        }
+        return item;
+      });
+    };
     const initSelectOptions = async () => {
       const {
         targetSource,
@@ -69,8 +121,8 @@ var scriptSelect = defineComponent({
       state.showField = "label";
       if (!(targetSource == null ? void 0 : targetSource.target_id))
         return;
-      if (options.length || optionType == 3) {
-        state.curOptions = options;
+      if (isDynamic2Static.value) {
+        state.curOptions = handleDynamic2StaticOptions(options);
         return;
       }
       try {
@@ -134,6 +186,8 @@ var scriptSelect = defineComponent({
         "onUpdate:value": [($event) => props.form[props.item.val_key] = $event, handleSelectChange],
         "filterable": true,
         "placeholder": "\u8BF7\u9009\u62E9",
+        "value-field": columnKey.value,
+        "label-field": labelKey.value,
         "multiple": isMultiple.value,
         "disabled": props.isLock,
         "loading": state.fetching,

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

@@ -58,7 +58,7 @@ const ScaleViewComputed = (props, state, config) => {
     if (!isEvaluation(type))
       return tempTile;
     let score = handleEvaluationScore(item);
-    return `${tempTile}&nbsp;<span style="color:#2d7aff;">${score}</span>`;
+    return `${tempTile}&nbsp;<span style="color:#2d7aff;" class="score-i">${score}</span>`;
   });
   const hasScore = computed(() => {
     let { config: config2 } = state;
@@ -91,7 +91,9 @@ const ScaleViewComputed = (props, state, config) => {
     return state.paramsEvaluate && Object.keys(state.paramsEvaluate).length;
   });
   const hasDefault = computed(() => {
-    let hash = window.location.hash;
+    let hash = window.location.search;
+    if (!hash)
+      return;
     let defaultVariable = ["evaname", "evadesc", "evast", "evadur", "evaan"];
     let hasDefaultItem = defaultVariable.find((item) => hash.includes(item));
     return state.paramsEvaluate || hasDefaultItem;
@@ -118,7 +120,12 @@ const ScaleViewComputed = (props, state, config) => {
   const showAnswerParse = computed(() => (item) => {
     var _a;
     let { evaluateAnswer, checkAnswerMode, evaluateStartTime, evaluateTime } = ((_a = state.config) == null ? void 0 : _a.evaluateResultSetting) || {};
-    let arr = ["EVALUATE_RADIO_BLOCK", "EVALUATE_CHECKBOX_BLOCK", "EVALUATE_SELECT", "EVALUATE_INPUT"];
+    let arr = [
+      "EVALUATE_RADIO_BLOCK",
+      "EVALUATE_CHECKBOX_BLOCK",
+      "EVALUATE_SELECT",
+      "EVALUATE_INPUT"
+    ];
     let maxScore = (item == null ? void 0 : item.scoreConfigs) || 0;
     let isShow = evaluateAnswer && state.isFinished && arr.includes(item.type) && maxScore;
     if (!evaluateStartTime || !evaluateTime || checkAnswerMode && checkAnswerMode == 1) {
@@ -172,12 +179,12 @@ const ScaleViewComputed = (props, state, config) => {
     };
   });
   const comProsMap = {
-    RSelectCom: selectProps.value,
-    RCascaderCom: cascaderProps.value,
-    RUploadCom: uploadProps.value,
-    RMapCom: mapProps.value,
-    RVodChunkUploadCom: vodChunkUploadProps.value,
-    CSelectLabelCom: selectLabelProps.value
+    "RSelectCom": selectProps.value,
+    "RCascaderCom": cascaderProps.value,
+    "RUploadCom": uploadProps.value,
+    "RMapCom": mapProps.value,
+    "RVodChunkUploadCom": vodChunkUploadProps.value,
+    "CSelectLabelCom": selectLabelProps.value
   };
   const propsConfig = computed(() => (item, index) => {
     var _a;

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

@@ -10,7 +10,12 @@ import { useDialog } from 'naive-ui';
 const ScaleViewInit = (props, state, emit, config) => {
   const dialog = useDialog();
   const { setNoData } = useNoData();
-  const { hasEvaluateResultSetting, hasparamsEvaluate, hasDefault, formKey } = ScaleViewComputed(props, state, config);
+  const {
+    hasEvaluateResultSetting,
+    hasparamsEvaluate,
+    hasDefault,
+    formKey
+  } = ScaleViewComputed(props, state, config);
   const { formatRules } = ScaleViewValidate(props, state, config);
   const { nextLogicEvent } = useEvent(props, state);
   const setEvaluateStartTime = (evaluateResultSetting) => {
@@ -189,6 +194,7 @@ const ScaleViewInit = (props, state, emit, config) => {
     item.relationLogic = relationLogicObj;
   };
   const handleFrontAddress = (list) => {
+    var _a, _b;
     if (!list || !list.length)
       return;
     let matchItem = list.find((item) => item.type === "FRONT_ADDRESS");
@@ -201,7 +207,7 @@ const ScaleViewInit = (props, state, emit, config) => {
     if (!setting || !Object.keys(setting).length)
       return;
     let query = handleQueryParams();
-    if ((query == null ? void 0 : query.redirect) == 1)
+    if ((query == null ? void 0 : query.redirect) == 1 || ((_a = props.params) == null ? void 0 : _a.redirect) == 1 || query.isEdit == 3 || ((_b = props.params) == null ? void 0 : _b.isEdit) == 3)
       return;
     let { frontAddress } = setting;
     if (frontAddress) {

package/es/packages/scale-view/src/utils/judge-types.js

@@ -12,9 +12,10 @@ const isEvaluation = (e) => {
 };
 const handleQueryParams = () => {
   let params = {};
-  let hash = window.location.hash.split("?")[1];
+  let hash = window.location.search.split("?")[1];
   if (!hash)
     return {};
+  hash = hash.replace(/\+/g, "%20");
   for (let [key, value] of new URLSearchParams(hash).entries()) {
     params[key] = decodeURIComponent(value);
   }

package/es/packages/scale-view/style/index.css

@@ -166,6 +166,7 @@
   cursor: pointer;
 }
 .c-scale .linebar-div {
+  width: 100%;
   text-align: center;
   margin-top: 24px;
 }
@@ -184,6 +185,12 @@
 .main {
   box-sizing: border-box;
 }
+.main .n-form-item.n-form-item--top-labelled .n-form-item-label {
+  display: block;
+}
+.main .n-form-item .n-form-item-blank {
+  display: block;
+}
 .main .scale-label-required {
   font-weight: 700;
 }
@@ -191,6 +198,9 @@
   color: #e02828;
   font-weight: 700;
 }
+.main .score-i {
+  word-break: keep-all;
+}
 .main .evalute-label {
   display: inline-block;
   height: 20px;
@@ -610,6 +620,7 @@
 .c-scale-collection.prompt-message .prompt-message-content {
   line-height: 16px;
   font-size: 14px;
+  word-break: break-all;
 }
 .c-time-range {
   display: flex;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cnhis-design-vue",
 	"private": false,
-	"version": "3.1.12-beta.2",
+	"version": "3.1.12-beta.3",
 	"license": "ISC",
 	"module": "es/packages/index.js",
 	"main": "es/packages/index.js",