cnhis-design-vue 3.1.21-beta.1 → 3.1.21-beta.10

package/es/components/big-table/src/hooks/useFormat2.js

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import 'moment';
 
-const useFormat = (state) => {
+const useFormat = (state, attr) => {
   const formatData = (data = {
     tableList: [],
     fieldList: [],
@@ -482,10 +482,19 @@ const useFormat = (state) => {
       "border-color": v.color
     };
   };
+  function getAttr(field) {
+    if (attr[field])
+      return attr[field];
+    const newField = field.replace(/-(\w)/g, ($0, $1) => {
+      return $1.toUpperCase();
+    });
+    return attr[newField] || {};
+  }
   return {
     formatData,
     htmlToText,
-    getBtnStyle
+    getBtnStyle,
+    getAttr
   };
 };
 

package/es/components/fabric-chart/src/components/PopupMenu.js

@@ -1,4 +1,4 @@
-import { defineComponent, ref, createVNode, Teleport, withDirectives, vShow } from 'vue';
+import { defineComponent, ref, watch, createVNode, Teleport, withDirectives, vShow } from 'vue';
 import { NSpace, NInputNumber } from 'naive-ui';
 import useStyle from './useStyle2.js';
 import { onClickOutside } from '@vueuse/core';
@@ -31,9 +31,11 @@ var PopupMenu = defineComponent({
     slots,
     emit
   }) {
+    let setNoShow = false;
     const popupRef = ref(null);
     onClickOutside(popupRef, (event) => {
-      emit("update:show", false);
+      !setNoShow && emit("update:show", false);
+      setNoShow = false;
     });
     const {
       left
@@ -81,6 +83,11 @@ var PopupMenu = defineComponent({
         });
       }
     }
+    watch(() => props.show, (value) => {
+      if (value) {
+        setNoShow = true;
+      }
+    });
     return () => {
       return createVNode(Teleport, {
         "to": ".c-fabric-chart"

package/es/components/fabric-chart/src/hooks/useCenter2.js

@@ -64,7 +64,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     left.yScaleValue.forEach((scaleValue) => {
       drawPositionLine(scaleValue);
       scaleValue.dataList.forEach((item, dataIndex) => {
-        drawPolyLine(item, dataIndex, scaleValue);
+        if (scaleValue.type !== "temperature" || item.enable) {
+          drawPolyLine(item, dataIndex, scaleValue);
+        }
       });
     });
     drawShaDow();
@@ -228,13 +230,6 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     });
   }
   function drawPolyLine(item, dataIndex, scaleValue) {
-    const {
-      pointAttr = {},
-      lineAttr = {},
-      type: pointType = "circle",
-      upArrowShow = false,
-      limitValueShow = false
-    } = item;
     const {
       type,
       noRiseStyle = {},
@@ -242,13 +237,22 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       reduceStyle = {},
       pacemaker = {},
       upArrowStyle = {},
-      limitValueStyle = {}
+      limitValueStyle = {},
+      dataList = []
     } = scaleValue;
     const pointList = [];
     const lineList = [];
     const otherList = [];
     item.list.forEach((v, index) => {
-      var _a, _b;
+      var _a;
+      const _item = type !== "temperature" ? item : dataList.find((_v) => _v.key === v.key);
+      const {
+        pointAttr = {},
+        lineAttr = {},
+        type: pointType = "circle",
+        upArrowShow = false,
+        limitValueShow = false
+      } = _item;
       const points = getPointer(v, scaleValue);
       const nextV = item.list[index + 1];
       const nextPoint = getPointer(nextV, scaleValue);
@@ -330,9 +334,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         line = drawLine([...points, ...nextPoint], {
           ...lineAttr
         });
-      } else if (points && !nextPoint && !v.breakpoint && type === "temperature" && dataIndex < scaleValue.dataList.length - 1 && index === item.list.length - 1) {
-        const nextV2 = (_b = scaleValue.dataList[dataIndex + 1].list) == null ? void 0 : _b[0];
-        const nextLinePoint = getPointer(nextV2, scaleValue);
+      } else if (points && !nextPoint && !v.breakpoint) {
+        const nextLinePoint = getPointer(nextV, scaleValue);
         line = nextLinePoint ? drawLine([...points, ...nextLinePoint], {
           ...lineAttr
         }) : null;
@@ -373,12 +376,6 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       } else {
         if (points) {
           pointAttrNew.leftLine = null;
-          if (type == "temperature" && index === 0) {
-            const objLine = [...prevLines].find((v2) => v2.dataIndex === dataIndex - 1);
-            if (objLine) {
-              pointAttrNew.leftLine = objLine.line;
-            }
-          }
           point = drawPoint(currentPointType, {
             left: points[0],
             top: points[1],
@@ -526,7 +523,8 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       emits("add", {
         data: {
           time: getXValue(item.pointer.x),
-          value: getYValue(item.origin.type, item.pointer.y)
+          value: getYValue(item.origin.type, item.pointer.y),
+          ...item.origin.type !== "temperature" ? {} : { key: item.origin.key }
         },
         ...item.origin
       });
@@ -536,6 +534,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         value: target.origin.data.value
       };
       data[`${item.type}`] = item.value;
+      if (target.origin.type === "temperature") {
+        data["key"] = target.origin.key;
+      }
       emits("change", {
         ...target.origin,
         data

package/es/components/fabric-chart/src/hooks/useLeft2.js

@@ -212,7 +212,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
       });
       const icon = drawPoint(item.type, {
         left: leftX,
-        top: topY - (text.height || 30) / 2,
+        top: topY - (text.height || 30) / 2 - 1,
         ...item.pointAttr,
         originY: "center",
         originX: "right",
@@ -224,7 +224,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
           key: item.key
         },
         originLeft: leftX,
-        originTop: topY - (text.height || 30) / 2,
+        originTop: topY - (text.height || 30) / 2 - 1,
         ...propItems.event
       });
       topY -= text.height || 30;
@@ -251,7 +251,8 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, getXValue, g
             emits("add", {
               data: {
                 time: getXValue(point.left),
-                value: getYValue(point.origin.type, point.top)
+                value: getYValue(point.origin.type, point.top),
+                ...point.origin.type !== "temperature" ? {} : { key: point.origin.key }
               },
               ...point.origin
             });

package/es/components/form-config/index.d.ts

@@ -927,6 +927,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
             option?: {
                 text: string;
                 value: any;
+                keyword?: string | undefined;
                 children?: any[] | undefined;
             }[] | undefined;
             multi_select?: import("..").FormCommonState | undefined;

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -929,6 +929,7 @@ declare const _default: import("vue").DefineComponent<{
             option?: {
                 text: string;
                 value: any;
+                keyword?: string | undefined;
                 children?: any[] | undefined;
             }[] | undefined;
             multi_select?: import("../..").FormCommonState | undefined;

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -56,6 +56,7 @@ declare const _default: import("vue").DefineComponent<{}, {
         option?: {
             text: string;
             value: any;
+            keyword?: string | undefined;
             children?: any[] | undefined;
         }[] | undefined;
         multi_select?: import("../../../../../es/components/form-render").FormCommonState | undefined;

package/es/components/form-render/index2.js

@@ -3,12 +3,9 @@ import { safeComponentRegister } from '../../shared/utils/index2.js';
 import script from './src/FormRender.js';
 import '@vueuse/core';
 import 'lodash-es';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
-import 'date-fns';
-export * from '@formily/core';
+import './src/utils/index.js';
 import '@formily/vue';
+import 'vue';
 import '../../shared/utils/tapable/SyncHook.js';
 import '../../shared/utils/tapable/SyncBailHook.js';
 import '../../shared/utils/tapable/SyncWaterfallHook.js';
@@ -19,6 +16,8 @@ import '../../shared/utils/tapable/AsyncSeriesHook.js';
 import '../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
+export * from '@formily/core';
+import '@vue/shared';
 import './src/components/renderer/input.js';
 import './src/components/renderer/select.js';
 import './src/components/renderer/formItem.js';

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

@@ -6,8 +6,8 @@ import { cloneDeep, isArray } from 'lodash-es';
 import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from './constants/index2.js';
 import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle2.js';
+import { useNuiThemeOverrides } from './hooks/useNuiThemeOverrides2.js';
 import { arrayed } from './utils/index.js';
-import { useNuiThemeOverrides } from '../../form-table/src/hooks/useNuiThemeOverrides2.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor2.js';
 import '../index2.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor2.js';
@@ -65,7 +65,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const formModel = createForm({
       initialValues: props.initialData,
       effects() {
-        onFieldValueChange("*", async (field) => {
+        onFieldValueChange("*", (field) => {
           const fieldKey = field.props.name.toString();
           businessCollector.trigger(fieldKey);
           formItemDepsCollector.trigger(fieldKey);
@@ -74,7 +74,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
             fieldKey,
             fieldName: field.title,
             value: field.value,
-            context: await changeContextCollector.getContext(fieldKey)
+            context: changeContextCollector.getContext(fieldKey, field.value)
           });
         });
       }

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

@@ -5,10 +5,7 @@ import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue } from '../../constants/index2.js';
 import '@vueuse/core';
 import '../../../index2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'date-fns';
-import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField2.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
@@ -20,6 +17,7 @@ import '../../../../../shared/utils/tapable/AsyncSeriesHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesBailHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesLoopHook.js';
 import '../../../../../shared/utils/tapable/AsyncSeriesWaterfallHook.js';
+import '@vue/shared';
 import { connect, mapProps } from '@formily/vue';
 import './input.js';
 import './select.js';
@@ -40,6 +38,7 @@ import './complex.js';
 import './simpleComponent.js';
 import './search.js';
 import { NCascader } from 'naive-ui';
+import { assignUpdateValue, assignValueBindKey, traverseDependKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormCascader",

package/es/components/form-render/src/components/renderer/checkbox.js

@@ -1,11 +1,8 @@
 import { defineComponent, createVNode } from 'vue';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'date-fns';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormCheckbox",

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

@@ -4,12 +4,10 @@ import '../../../index2.js';
 import { useField, RecursionField, connect } from '@formily/vue';
 import { NButton, NIcon } from 'naive-ui';
 import { InjectionBusinessCollector } from '../../constants/index2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'date-fns';
-import { createObjSchema } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { AddCircleOutline, RemoveCircle } from '@vicons/ionicons5';
 import { useFieldListAdaptor } from '../../hooks/useFieldListAdaptor2.js';
+import { createObjSchema } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormCombination",

package/es/components/form-render/src/components/renderer/complex.js

@@ -1,9 +1,6 @@
 import { defineComponent, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'date-fns';
+import '../../utils/index.js';
 import { assignUpdateValue } from '../../utils/schema2.js';
 
 const script = defineComponent({

package/es/components/form-render/src/components/renderer/date.js

@@ -5,9 +5,7 @@ import { isObject } from '@vueuse/core';
 import { format } from 'date-fns';
 import { NDatePicker } from 'naive-ui';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
+import '../../utils/index.js';
 import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
@@ -46,6 +44,10 @@ const script = defineComponent({
     function isTimeDisabled(time) {
       const checkDate = new Date(time);
       const currentDate = new Date();
+      const checkDateDuplicate = new Date(checkDate);
+      checkDateDuplicate.setHours(0);
+      checkDateDuplicate.setMinutes(0);
+      checkDateDuplicate.setSeconds(0);
       return {
         isHourDisabled,
         isMinuteDisabled
@@ -59,10 +61,17 @@ const script = defineComponent({
       function currentMinute() {
         return currentDate.getMinutes();
       }
+      function isOverDate() {
+        return checkDateDuplicate > currentDate;
+      }
       function isHourDisabled(hour) {
+        if (isOverDate())
+          return false;
         return minCurrentDate() && hour < currentHour() || maxCurrentDate() && hour > currentHour();
       }
       function isMinuteDisabled(minute) {
+        if (isOverDate())
+          return false;
         if (checkHour() === currentHour()) {
           return minCurrentDate() && minute < currentMinute() || maxCurrentDate() && minute > currentMinute();
         }

package/es/components/form-render/src/components/renderer/formItem.js

@@ -4,10 +4,7 @@ import { useField, connect, mapProps } from '@formily/vue';
 import { NFormItem } from 'naive-ui';
 import Annotation from '../../../../annotation-edit/index2.js';
 import { InjectionAnnotation, InjectionFormUUID } from '../../constants/index2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'date-fns';
+import '../../utils/index.js';
 import { dotEscape } from '../../utils/schema2.js';
 
 const script = defineComponent({

package/es/components/form-render/src/components/renderer/radio.js

@@ -2,9 +2,7 @@ import { defineComponent, computed, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
 import { isNumber } from 'lodash-es';
 import { NRadioGroup, NSpace, NRadio } from 'naive-ui';
-import '@formily/path';
-import '@vue/shared';
-import 'date-fns';
+import '../../utils/index.js';
 import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({

package/es/components/form-render/src/components/renderer/search.js

@@ -1,10 +1,10 @@
-import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
-import { cloneDeep, isEqual, isString } from 'lodash-es';
+import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
+import { useDebounceFn } from '@vueuse/core';
+import { isString, cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue, InjectionChangeContextCollector } from '../../constants/index2.js';
-import '@vueuse/core';
 import '../../../index2.js';
-import { formRenderLog } from '../../utils/index.js';
+import { formRenderLog, optionMatcher } from '../../utils/index.js';
 import { useFormRequest } from '../../hooks/useFormRequest2.js';
 import { useFormField } from '../../hooks/useFormField2.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
@@ -91,7 +91,7 @@ const script = defineComponent({
     const {
       getSearchRequestInfo
     } = useFormRequest();
-    async function fetchData(content) {
+    const fetchData = useDebounceFn(async function(content) {
       lastSearch.value = content || "";
       if (remoteOptions.value)
         return;
@@ -115,23 +115,17 @@ const script = defineComponent({
           key: key2
         };
       }
-    }
+    }, 300);
     const parsedOptions = computed(() => {
-      return remoteOptions.value ? filterOption(remoteOptions.value, lastSearch.value) : [];
-      function filterOption(options, searchContent) {
-        return options.filter((option) => {
-          return !searchContent || String(option[labelKey.value]).includes(searchContent);
-        });
-      }
+      return remoteOptions.value ? optionMatcher(remoteOptions.value, lastSearch.value, labelKey.value) : [];
     });
     const changeContextCollector = inject(InjectionChangeContextCollector);
-    changeContextCollector.setContext(fieldKey.value, async () => {
-      await nextTick();
+    changeContextCollector.setContext(fieldKey.value, (v) => {
       return {
-        currentOption: cloneDeep(getCurrentOption())
+        currentOption: cloneDeep(getCurrentOption(v))
       };
-      function getCurrentOption() {
-        return parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value);
+      function getCurrentOption(v2) {
+        return parsedOptions.value.find((option) => option[valueKey.value] === v2);
       }
     });
     watch(() => props.wordbook, (wordbook, oldWordbook) => {

package/es/components/form-render/src/components/renderer/select.js

@@ -1,11 +1,11 @@
-import { defineComponent, computed, ref, inject, nextTick, watch, createVNode } from 'vue';
+import { defineComponent, computed, ref, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { cloneDeep, isEqual, isString } from 'lodash-es';
+import { useDebounceFn } from '@vueuse/core';
+import { isString, cloneDeep, isEqual } from 'lodash-es';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
 import { InjectAsyncQueue, InjectionChangeContextCollector, InjectionFormItemDepsCollector } from '../../constants/index2.js';
-import '@vueuse/core';
 import '../../../index2.js';
-import { formRenderLog } from '../../utils/index.js';
+import { formRenderLog, optionMatcher } from '../../utils/index.js';
 import { useFormField } from '../../hooks/useFormField2.js';
 import '../../../../../shared/utils/tapable/SyncHook.js';
 import '../../../../../shared/utils/tapable/SyncBailHook.js';
@@ -38,7 +38,7 @@ import './complex.js';
 import './simpleComponent.js';
 import './search.js';
 import { NSelect } from 'naive-ui';
-import { focusDecorator, assignUpdateValue, traverseDependKey } from '../../utils/schema2.js';
+import { traverseDependKey, focusDecorator, assignUpdateValue } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormSelect",
@@ -86,7 +86,7 @@ const script = defineComponent({
       fieldKey
     } = useFormField();
     const asyncQueue = inject(InjectAsyncQueue);
-    async function fetchData(content) {
+    const fetchData = useDebounceFn(async function(content) {
       lastSearch.value = content || "";
       if (!configFor(props)) {
         return remoteOptions.value = null;
@@ -122,27 +122,21 @@ const script = defineComponent({
       function configFor(target) {
         return target.urlConfig;
       }
-    }
+    }, 300);
     const parsedOptions = computed(() => {
       if (remoteOptions.value)
-        return filterOption(remoteOptions.value, lastSearch.value);
+        return optionMatcher(remoteOptions.value, lastSearch.value, labelKey.value);
       if (!Array.isArray(props.options))
         return [];
-      return filterOption(props.options, lastSearch.value);
-      function filterOption(options, searchContent) {
-        return options.filter((option) => {
-          return !searchContent || String(option[labelKey.value]).includes(searchContent);
-        });
-      }
+      return optionMatcher(props.options, lastSearch.value, labelKey.value);
     });
     const changeContextCollector = inject(InjectionChangeContextCollector);
-    changeContextCollector.setContext(fieldKey.value, async () => {
-      await nextTick();
+    changeContextCollector.setContext(fieldKey.value, (v) => {
       return {
-        currentOption: cloneDeep(getCurrentOption())
+        currentOption: cloneDeep(getCurrentOption(v))
       };
-      function getCurrentOption() {
-        return parsedOptions.value.find((option) => option[valueKey.value] === valueRef.value);
+      function getCurrentOption(v2) {
+        return parsedOptions.value.find((option) => option[valueKey.value] === v2);
       }
     });
     const formItemDepsCollector = inject(InjectionFormItemDepsCollector);

package/es/components/form-render/src/components/renderer/switch.js

@@ -1,11 +1,8 @@
 import { defineComponent, computed, createVNode, createTextVNode } from 'vue';
 import { NSwitch } from 'naive-ui';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'date-fns';
-import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
+import { assignUpdateValue, assignValueBindKey } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormSwitch",

package/es/components/form-render/src/components/renderer/textarea.js

@@ -1,12 +1,9 @@
 import { defineComponent, computed, createVNode } from 'vue';
 import { useCommonInjection } from '../../hooks/useCommonInjection2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'lodash-es';
-import 'date-fns';
-import { assignUpdateValue } from '../../utils/schema2.js';
+import '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NInput } from 'naive-ui';
+import { assignUpdateValue } from '../../utils/schema2.js';
 
 const script = defineComponent({
   name: "FormTextarea",

package/es/components/form-render/src/hooks/useAnchor2.js

@@ -3,9 +3,7 @@ import { useDebounceFn } from '@vueuse/core';
 import { isNumber } from 'lodash-es';
 import { ref, computed, watch, nextTick } from 'vue';
 import { FormItemLineBarDepKeyPrepend } from '../constants/index2.js';
-import '@formily/path';
-import '@vue/shared';
-import 'date-fns';
+import '../utils/index.js';
 import { createLinebarId, traverseSchema } from '../utils/schema2.js';
 
 function useAnchor(props, scrollbarRef, collector) {

package/es/components/form-render/src/hooks/useBusinessBinding2.js

@@ -2,9 +2,7 @@ import { isField } from '@formily/core';
 import { isString } from '@vueuse/core';
 import { isFunction, isNumber } from 'lodash-es';
 import { FIELD_BUSINESS_TYPE } from '../constants/index2.js';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
+import '../utils/index.js';
 import { isIdCard, parseIdCard, parseAge2FromContext, parseBirthday, parseAge2Birthday } from '../utils/business2.js';
 
 class BusinessCollector {

package/es/components/form-render/src/hooks/useChangeContext.d.ts

@@ -1,12 +1,10 @@
 import { FormChangeContext } from '../types';
 export declare class ContextCollector {
     private readonly contextMap;
-    setContext(key: string, value: () => Promise<FormChangeContext> | FormChangeContext): void;
-    getContext(key: string): Partial<{
+    setContext(key: string, value: (value: unknown) => FormChangeContext): void;
+    getContext(key: string, value: unknown): Partial<{
         currentOption: import("../../../../shared/types").AnyObject;
-    }> | Promise<Partial<{
-        currentOption: import("../../../../shared/types").AnyObject;
-    }>> | undefined;
+    }> | undefined;
 }
 export declare function useChangeContext(): {
     create: () => ContextCollector;

package/es/components/form-render/src/hooks/useChangeContext2.js

@@ -5,9 +5,9 @@ class ContextCollector {
   setContext(key, value) {
     this.contextMap.set(key, value);
   }
-  getContext(key) {
+  getContext(key, value) {
     var _a;
-    return (_a = this.contextMap.get(key)) == null ? void 0 : _a();
+    return (_a = this.contextMap.get(key)) == null ? void 0 : _a(value);
   }
 }
 function useChangeContext() {

package/es/components/form-render/src/hooks/useFormItemDeps2.js

@@ -1,8 +1,5 @@
 import { isFunction } from 'lodash-es';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
-import 'date-fns';
+import '../utils/index.js';
 import { traverseDependKey } from '../utils/schema2.js';
 
 class FormItemDepsCollector {

package/es/components/form-render/src/hooks/usePresetScope2.js

@@ -1,9 +1,6 @@
 import { isString } from 'lodash-es';
-import 'vue';
-import '@formily/path';
-import '@vue/shared';
+import '../utils/index.js';
 import { isIdCard, isMobile } from '../utils/business2.js';
-import '@formily/core';
 
 function usePresetScope() {
   return {

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

@@ -25,6 +25,7 @@ export declare type ValidateItem = Partial<{
 interface OptionItem {
     text: string;
     value: any;
+    keyword?: string;
     children?: OptionItem[];
 }
 interface FormRendererPayload {