cnhis-design-vue 3.1.14 → 3.1.15-beta.0

package/es/packages/big-table/src/components/edit-form/edit-date.js

@@ -1,4 +1,5 @@
 import { defineComponent, createVNode, mergeProps } from 'vue';
+import { isFunction } from 'lodash-es';
 import { NDatePicker } from 'naive-ui';
 
 var EditDate = defineComponent({
@@ -94,16 +95,23 @@ var EditDate = defineComponent({
         }
       };
     };
+    function customDateDisabledDecorator(customDateDisabled) {
+      if (!isFunction(customDateDisabled))
+        return null;
+      return (ts) => {
+        return customDateDisabled(ts, props.row);
+      };
+    }
     const config = {
-      type: props.col.type || "datetime",
+      type: props.col.type || props.col.dateType || "datetime",
       clearable: props.col.clearable || true,
       disabled: props.col.disabled || false,
       valueFormat: props.col.valueFormat || "yyyy-MM-dd HH:mm:ss",
-      isDateDisabled: props.col.isDateDisabled || isDateDisabled,
+      isDateDisabled: customDateDisabledDecorator(props.col.isDateDisabled) || isDateDisabled,
       placeholder: props.col.placeholder || "\u8BF7\u9009\u62E9"
     };
     if (config.type.includes("time")) {
-      config.isTimeDisabled = props.col.isTimeDisabled || isTimeDisabled;
+      config.isTimeDisabled = customDateDisabledDecorator(props.col.isTimeDisabled) || isTimeDisabled;
     }
     return () => createVNode(NDatePicker, mergeProps(attrs, config, {
       "onUpdateFormattedValue": onConfirm

package/es/packages/big-table/src/hooks/useColumnConfigAdaptor.js

@@ -31,42 +31,52 @@ function useColumnConfigAdaptor() {
         ...["INPUT"].map((type) => [type, "input"]),
         ...["DIGITAL"].map((type) => [type, "number"])
       ]);
-      const settingMap = new Map([
-        ["multi_select_value", { property: "multiple", valueMap: multipleValueMap }],
-        [
-          "is_null",
-          (value, result, _fieldItem, _editRules) => {
-            if (value === "1")
-              return;
-            if (value === "0")
-              _editRules[_fieldItem.val_key] = [{ required: true, message: "\u5FC5\u586B" }];
+      const isNullHandler = (value, result, _fieldItem, _editRules) => {
+        if (value === "1")
+          return;
+        if (value === "0")
+          _editRules[_fieldItem.val_key] = [{ required: true, message: "\u5FC5\u586B" }];
+      };
+      const validateHandler = (value, result) => {
+        if (!isObject(value))
+          return;
+        result.componentProps = Object.assign({}, result.comonentProps, {
+          maxlength: value.max_length,
+          minlength: value.min_length,
+          max: value.max_value,
+          min: value.min_value,
+          precision: value.decimal_length
+        });
+      };
+      const dateRangeValidate = (value, result) => {
+        if (!isObject(value))
+          return;
+        result.isDateDisabled = (ts, row) => {
+          if (!isObject(row))
+            return;
+          const { startDate, endDate } = value;
+          let invalid = false;
+          if (startDate) {
+            invalid = new Date(row[startDate]).getTime() > ts;
           }
-        ],
-        [
-          "validate",
-          (value, result) => {
-            if (!isObject(value))
-              return;
-            result.componentProps = Object.assign({}, result.comonentProps, {
-              maxlength: value.max_length,
-              minlength: value.min_length,
-              max: value.max_value,
-              min: value.min_value,
-              precision: value.decimal_length
-            });
+          if (endDate) {
+            invalid = invalid || new Date(row[endDate]).getTime() < ts;
           }
-        ],
-        ...["open", "close"].map((key) => {
-          return [
-            key,
-            (value, result) => {
-              if (!isObject(value))
-                return;
-              const option = { label: value.describe, ...value };
-              result.options = isArray(result.options) ? [...result.options, option] : [option];
-            }
-          ];
-        }),
+          return invalid;
+        };
+      };
+      const switchOptionHandler = (value, result) => {
+        if (!isObject(value))
+          return;
+        const option = { label: value.describe, ...value };
+        result.options = isArray(result.options) ? [...result.options, option] : [option];
+      };
+      const settingMap = new Map([
+        ["multi_select_value", { property: "multiple", valueMap: multipleValueMap }],
+        ["is_null", isNullHandler],
+        ["validate", validateHandler],
+        ["dateValidate", dateRangeValidate],
+        ...["open", "close"].map((key) => [key, switchOptionHandler]),
         ["is_edit", { property: "isEdit", valueMap: isEditValueMap }],
         ["html_type", { property: "formType", valueMap: htmlTypeValueMap }],
         ["option", { property: "options", fieldMap: /* @__PURE__ */ new Map([["text", "label"]]) }]

package/es/packages/big-table/src/hooks/useFormat.js

@@ -133,7 +133,14 @@ const useFormat = (state) => {
                 item[key] = temp.change_text;
               } else {
                 if (temp.background != "#ffffff") {
-                  item[key] = `<span class="field-span" style="color:${temp.background}"><span class="${temp.icon}"></span>${temp.change_text || ""}</span>`;
+                  const reg = /^#?([a-fA-F0-9]{6}|[a-fA-F0-9]{3})$/;
+                  let color = temp.background;
+                  let iconHtml = `<span class="${temp.icon}"></span>`;
+                  if (reg.test(temp.icon)) {
+                    color = temp.icon;
+                    iconHtml = `<span class="icon-dot-custom" style="--table-icon-color:${temp.icon};--table-icon-shadow:${temp.icon}80"></span>`;
+                  }
+                  item[key] = `<span class="field-span" style="color:${color}">${iconHtml}${temp.change_text || ""}</span>`;
                 } else {
                   item[key] = temp.change_text;
                 }

package/es/packages/big-table/style/index.css

@@ -396,6 +396,17 @@ body > .vxe-table--tooltip-wrapper {
   height: var(--tableImageHeight);
   width: var(--tableImageWidth);
 }
+.custom-big-table .domPropsInnerHTML-span .icon-dot-custom {
+  width: 8px;
+  height: 8px;
+  -webkit-border-radius: 50%;
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+  background: var(--table-icon-color);
+  display: inline-block;
+  margin-right: 6px;
+  box-shadow: 0px 2px 4px 0px var(--table-icon-shadow);
+}
 .custom-big-table .domPropsInnerHTML-span .icon-dot-red {
   width: 8px;
   height: 8px;

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

@@ -1,10 +1,10 @@
 import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, isArray, isObject } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from '../../../packages/form-render/src/constants';
-import { queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
+import { arrayed, queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
 import { useNuiThemeOverrides } from '../../../packages/form-table/src/hooks/useNuiThemeOverrides';
 import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
 import { useFormContext } from './hooks/useFormContext.js';
@@ -95,9 +95,24 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     expose({
       validate(path = "*") {
         return formModel.validate(path).catch((err) => {
-          return Promise.reject(Array.isArray(err) ? err.map(bindInfo) : err);
+          return Promise.reject(Array.isArray(err) ? err.reduce(errInfoNormalize, []) : err);
         });
+        function errInfoNormalize(result, error) {
+          let childMessageNum = 0;
+          if (isArray(error.messages)) {
+            error.messages.forEach((message) => {
+              if (!isObject(message))
+                return;
+              result.push(...arrayed(message).map(bindInfo));
+              childMessageNum++;
+            });
+          }
+          !childMessageNum && result.push(bindInfo(error));
+          return result;
+        }
         function bindInfo(info) {
+          if (info.decoratorElement)
+            return info;
           info.title = formModel.query(info.path).get("title");
           info.decoratorElement = queryDecorator(info.path, scrollbarRef.value, formUUID);
           Object.assign(info, queryInput(info.decoratorElement));

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

@@ -1,8 +1,9 @@
-import { defineComponent, ref, computed, watch, onMounted, createVNode, createTextVNode } from 'vue';
+import { defineComponent, onMounted, ref, computed, watch, createVNode, createTextVNode } from 'vue';
 import { isField } from '@formily/core';
 import { Path } from '../../../../../node_modules/@formily/path/esm/index.js';
-import { isNumber } from 'lodash-es';
-import { assignUpdateValue, formRenderLog } from '../../utils/index.js';
+import { flatten, isNumber } from 'lodash-es';
+import { useFormField } from '../../../../../packages/form-render';
+import { arrayed, assignUpdateValue, formRenderLog } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { useDebounceFn, isObject } from '@vueuse/core';
 import { NButton } from 'naive-ui';
@@ -32,7 +33,26 @@ const script = defineComponent({
   }) {
     const emitChange = useDebounceFn(function emitChange2() {
       emit("update:value", JSON.stringify(_values.value));
+      formRenderRefs.value.splice(groupNum.value);
     }, 300);
+    const {
+      field
+    } = useFormField();
+    onMounted(() => {
+      if (!isField(field.value))
+        return;
+      const tempValidator = field.value.validator;
+      field.value.validator = [{
+        async validator() {
+          return Promise.allSettled(formRenderRefs.value.map((formRenderRef) => formRenderRef.validate())).then((resultList) => {
+            const rejected = resultList.filter((res) => res.status === "rejected");
+            if (!rejected.length)
+              return "";
+            return flatten(rejected.map((res) => res.reason));
+          });
+        }
+      }, ...tempValidator ? arrayed(tempValidator) : []];
+    });
     const formRenderRefs = ref([]);
     const groupNum = ref(1);
     const maxGroupNum = computed(() => {
@@ -56,7 +76,7 @@ const script = defineComponent({
       if (groupNum.value <= value)
         return;
       groupNum.value = value;
-      _values.value.splice(groupNum.value);
+      _values.value.splice(value);
       emitChange();
     }, {
       immediate: true

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

@@ -1,7 +1,7 @@
 import { isObject } from '@vueuse/core';
 import { pick } from 'lodash-es';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { fieldKeyEscape, arrayed, createLinebarId, transformDateFormat } from '../utils/index.js';
+import { fieldKeyEscape, arrayed, createLinebarId, elementIdEscape, transformDateFormat } from '../utils/index.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
@@ -31,7 +31,7 @@ function useFieldListAdaptor(collector, uuid) {
           showLabel: item.hide_title !== "1",
           propertyKey: item.val_key,
           annotation: item.annotation,
-          id: `${uuid}-${item.val_key}`,
+          id: elementIdEscape(`${uuid}-${item.val_key}`),
           ...item.decoratorProps || {}
         }
       });
@@ -96,7 +96,10 @@ function useFieldListAdaptor(collector, uuid) {
   };
   const createCombinationSchema = (item) => {
     const schema = createStandardSchema(item);
-    schema["x-decorator-props"].showLabel = false;
+    Object.assign(schema["x-decorator-props"], {
+      showLabel: false,
+      showFeedback: false
+    });
     Object.assign(schema["x-component-props"], {
       title: item.alias || item.name,
       maxGroupNum: item.maxGroupNum,

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

@@ -3,12 +3,12 @@ import { SchemaReaction } from '@formily/json-schema/esm/types';
 import { SchemaTypes } from '@formily/vue';
 import { CSSProperties, VNode } from 'vue';
 import { DependKeyType, FormCommonState } from '../../../../../es/packages/form-render';
-import { FIELD_BUSINESS_TYPE } from '../../../../../es/packages/form-render/src/constants';
+declare type FieldBusinessType = 'password' | 'id_card' | 'age' | 'age_unit' | 'mobile' | 'telephone' | 'email' | 'sex' | 'birthday' | 'bank_card' | 'website' | 'gestational_weeks' | 'gestational_stage' | 'customer_name';
 export declare type ValidateItem = Partial<{
     /**
      * 业务类型
      */
-    obj_type: FIELD_BUSINESS_TYPE;
+    obj_type: FieldBusinessType;
     /**
      * 校验类型
      */

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

@@ -28,6 +28,7 @@ export declare function queryInput(decoratorElement?: HTMLElement | null): {
     widgetElementList: HTMLInputElement[];
 };
 export declare function getParentLinebar(key: string, fieldList: FieldItem[]): string | null;
+export declare function elementIdEscape(id: string): string;
 export declare function createLinebarId(id: string): string;
 export declare function fieldKeyEscape(fieldList: FieldItem[]): string;
 export declare function createInputSlot(props: AnyObject): import("vue").ComputedRef<Record<string, FunctionalComponent<{}, {}>>>;

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

@@ -124,7 +124,7 @@ function createSlot(renderer, props) {
   };
 }
 function queryDecorator(key, wrapperElement, formUUID) {
-  return wrapperElement.querySelector(`#${formUUID}-${key}`);
+  return wrapperElement.querySelector(elementIdEscape(`#${formUUID}-${key}`));
 }
 function queryInput(decoratorElement) {
   var _a;
@@ -150,8 +150,11 @@ function getParentLinebar(key, fieldList) {
     return field.html_type === "LINEBAR";
   }
 }
+function elementIdEscape(id) {
+  return id.replace(".", "-");
+}
 function createLinebarId(id) {
-  return `id-${id}`;
+  return elementIdEscape(`id-${id}`);
 }
 function fieldKeyEscape(fieldList) {
   return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
@@ -169,4 +172,4 @@ function createInputSlot(props) {
   });
 }
 
-export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, elementIdEscape, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };

package/es/packages/index.css

@@ -396,6 +396,17 @@ body > .vxe-table--tooltip-wrapper {
   height: var(--tableImageHeight);
   width: var(--tableImageWidth);
 }
+.custom-big-table .domPropsInnerHTML-span .icon-dot-custom {
+  width: 8px;
+  height: 8px;
+  -webkit-border-radius: 50%;
+  -moz-border-radius: 50%;
+  border-radius: 50%;
+  background: var(--table-icon-color);
+  display: inline-block;
+  margin-right: 6px;
+  box-shadow: 0px 2px 4px 0px var(--table-icon-shadow);
+}
 .custom-big-table .domPropsInnerHTML-span .icon-dot-red {
   width: 8px;
   height: 8px;

package/package.json

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