@opentiny/vue-renderless 3.27.0 → 3.28.1

package/base-select/vue.js

@@ -57,6 +57,7 @@ import {
   watchPropsOption,
   onMouseenterNative,
   onMouseleaveNative,
+  onMouseenterSelf,
   onCopying,
   defaultOnQueryChange,
   queryChange,
@@ -100,10 +101,14 @@ import {
   updateSelectedData,
   hidePanel,
   computedShowTagText,
-  isTagClosable
+  isTagClosable,
+  computedCurrentSizeMap,
+  watchOptionsWhenAutoSelect
 } from "./index";
 import { debounce } from "@opentiny/utils";
 import { isNumber } from "@opentiny/utils";
+import { useUserAgent } from "@opentiny/vue-hooks";
+import { isServer } from "@opentiny/utils";
 const api = [
   "state",
   "toggleCheckAll",
@@ -148,6 +153,7 @@ const api = [
   "navigateOptions",
   "onMouseenterNative",
   "onMouseleaveNative",
+  "onMouseenterSelf",
   "onCopying",
   "handleDropdownClick",
   "handleEnterTag",
@@ -160,14 +166,25 @@ const api = [
   "computedShowTagText",
   "isTagClosable"
 ];
-const initState = ({ reactive, computed, props, api: api2, emitter, parent, constants, useBreakpoint, vm, designConfig }) => {
+const initState = ({
+  reactive,
+  computed,
+  props,
+  api: api2,
+  emitter,
+  parent,
+  constants,
+  isMobileFirstMode,
+  useBreakpoint,
+  vm,
+  designConfig
+}) => {
   const stateAdd = initStateAdd({ computed, props, api: api2, parent });
   const state = reactive(__spreadProps(__spreadValues({}, stateAdd), {
     selectEmitter: emitter(),
     datas: [],
     initDatas: [],
     query: "",
-    magicKey: 0,
     options: [],
     visible: false,
     showCopy: computed(() => api2.computedShowCopy()),
@@ -185,7 +202,7 @@ const initState = ({ reactive, computed, props, api: api2, emitter, parent, cons
     optionsAllDisabled: computed(() => api2.computedOptionsAllDisabled()),
     collapseTagSize: computed(() => api2.computedCollapseTagSize()),
     showNewOption: computed(() => api2.computedShowNewOption()),
-    selectSize: computed(() => props.size || state.formItemSize),
+    selectSize: computed(() => !isServer ? props.size || state.formItemSize : 0),
     optimizeOpts: computed(() => api2.computeOptimizeOpts()),
     optimizeStore: { valueIndex: 0, recycleScrollerHeight: computed(() => api2.recycleScrollerHeight()) },
     collapseTags: computed(() => api2.computeCollapseTags()),
@@ -202,11 +219,39 @@ const initState = ({ reactive, computed, props, api: api2, emitter, parent, cons
     selectedCopy: [],
     compareValue: null,
     selectedVal: computed(
-      () => state.device === "mb" && props.multiple && state.visible ? state.selectedCopy : state.selected
-    ),
-    displayOnlyContent: computed(
-      () => props.multiple && Array.isArray(state.selected) ? state.selected.map((item) => item.state ? item.state.currentLabel : item.currentLabel).join("; ") : ""
+      () => isMobileFirstMode && state.device === "mb" && props.multiple && state.visible ? state.selectedCopy : state.selected
     ),
+    displayOnlyContent: computed(() => {
+      var _a;
+      if (vm.$slots.reference) {
+        return "";
+      }
+      if (props.multiple) {
+        if (Array.isArray(state.selected)) {
+          if (state.isDisplayOnly && props.options && props.options.length > 0) {
+            return state.selected.map((item) => {
+              const find = props.options.find((opt) => opt[props.valueField] === item.value);
+              return find ? find[props.textField] : "";
+            }).join("; ");
+          } else {
+            return state.selected.map((item) => item.state ? item.state.currentLabel : item.currentLabel).join("; ");
+          }
+        } else {
+          return "";
+        }
+      } else {
+        if (state.selected) {
+          if (state.isDisplayOnly && props.options && props.options.length > 0) {
+            const find = props.options.find((opt) => opt[props.valueField] === state.selected.value);
+            return find ? find[props.textField] : "";
+          } else {
+            return ((_a = state.selected.state) == null ? void 0 : _a.currentLabel) || state.selected.currentLabel || state.selected.label || "";
+          }
+        } else {
+          return "";
+        }
+      }
+    }),
     breakpoint: useBreakpoint ? useBreakpoint().current : "",
     isSaaSTheme: vm.theme === "saas",
     disabledOptionHover: false,
@@ -220,11 +265,18 @@ const initState = ({ reactive, computed, props, api: api2, emitter, parent, cons
         return designConfig.state.autoHideDownIcon;
       }
       return true;
-    })()
+    })(),
+    designConfig,
+    currentSizeMap: computed(() => api2.computedCurrentSizeMap()),
+    rootAutoTipConfig: computed(() => __spreadValues({
+      content: state.displayOnlyContent,
+      always: !!state.displayOnlyContent
+    }, props.tooltipConfig))
   }));
   return state;
 };
 const initStateAdd = ({ computed, props, api: api2, parent }) => {
+  const { isIOS } = useUserAgent();
   return {
     selectedTags: [],
     tips: "",
@@ -269,16 +321,20 @@ const initStateAdd = ({ computed, props, api: api2, parent }) => {
     isDisplayOnly: computed(() => props.displayOnly || (parent.form || {}).displayOnly),
     isDisabled: computed(() => props.disabled || (parent.form || {}).disabled),
     isShowTagText: computed(() => api2.computedShowTagText()),
-    searchSingleCopy: computed(() => props.allowCopy && !props.multiple && props.filterable),
+    searchSingleCopy: computed(() => props.allowCopy && !props.multiple && (props.filterable || props.searchable)),
     childrenName: computed(() => "children"),
     tooltipContent: {},
     isHidden: false,
     optionIndexArr: [],
+    isIOS,
     showCollapseTag: false,
     exceedMaxVisibleRow: false,
     // 是否超出默认最大显示行数
-    toHideIndex: Infinity
+    toHideIndex: Infinity,
     // 第一个超出被隐藏的索引
+    willFocusRun: false,
+    // 进入focus时，延时等一下看是否触发blur,触发则不进入focus
+    willFocusTimer: 0
   };
 };
 const initApi = ({
@@ -308,12 +364,12 @@ const initApi = ({
     getChildValue: getChildValue(),
     getOption: getOption({ props, state, api: api2 }),
     getSelectedOption: getSelectedOption({ props, state }),
-    emitChange: emitChange({ emit, props, state, constants }),
-    directEmitChange: directEmitChange({ emit, props, state, constants }),
+    emitChange: emitChange({ emit, props, state, constants, isMobileFirstMode }),
+    directEmitChange: directEmitChange({ emit, props, state, constants, isMobileFirstMode }),
     toggleMenu: toggleMenu({ vm, state, props, api: api2, isMobileFirstMode }),
     showTip: showTip({ props, state, vm }),
     onOptionDestroy: onOptionDestroy(state),
-    setSoftFocus: setSoftFocus({ vm, state }),
+    setSoftFocus: setSoftFocus({ vm, state, props }),
     resetInputWidth: resetInputWidth({ vm, state }),
     resetHoverIndex: resetHoverIndex({ props, state }),
     resetDatas: resetDatas({ props, state }),
@@ -332,6 +388,7 @@ const initApi = ({
     watchPropsOption: watchPropsOption({ constants, parent, props, state }),
     onMouseenterNative: onMouseenterNative({ state }),
     onMouseleaveNative: onMouseleaveNative({ state }),
+    onMouseenterSelf: onMouseenterSelf({ state }),
     onCopying: onCopying({ state, vm }),
     watchHoverIndex: watchHoverIndex({ state }),
     computeOptimizeOpts: computeOptimizeOpts({ props, designConfig }),
@@ -339,16 +396,16 @@ const initApi = ({
     computeMultipleLimit: computeMultipleLimit({ props, state }),
     watchInputHover: watchInputHover({ vm }),
     initQuery: initQuery({ props, state, constants, vm }),
-    updateModelValue: updateModelValue({ props, emit, state }),
+    updateModelValue: updateModelValue({ props, emit, state, isMobileFirstMode }),
     computedTagsStyle: computedTagsStyle({ props, parent, state, vm }),
-    computedReadonly: computedReadonly({ props, state }),
+    computedReadonly: computedReadonly({ props, state, isMobileFirstMode }),
     computedShowClose: computedShowClose({ props, state }),
     computedCollapseTagSize: computedCollapseTagSize(state),
-    computedShowNewOption: computedShowNewOption({ props, state }),
+    computedShowNewOption: computedShowNewOption({ props, state, isMobileFirstMode }),
     computedShowCopy: computedShowCopy({ props, state }),
     computedOptionsAllDisabled: computedOptionsAllDisabled(state),
-    computedDisabledTooltipContent: computedDisabledTooltipContent(state),
-    computedSelectDisabled: computedSelectDisabled({ props, parent }),
+    computedDisabledTooltipContent: computedDisabledTooltipContent({ props, state }),
+    computedSelectDisabled: computedSelectDisabled({ state }),
     computedIsExpand: computedIsExpand({ props, state }),
     watchInitValue: watchInitValue({ props, emit }),
     watchShowClose: watchShowClose({ nextTick, state, parent }),
@@ -360,7 +417,9 @@ const initApi = ({
     computedShowTagText: computedShowTagText({ state }),
     isTagClosable: isTagClosable(),
     updateSelectedData: updateSelectedData({ state }),
-    hidePanel: hidePanel({ state })
+    hidePanel: hidePanel({ state }),
+    computedCurrentSizeMap: computedCurrentSizeMap({ state, designConfig }),
+    watchOptionsWhenAutoSelect: watchOptionsWhenAutoSelect({ state, props, nextTick, api: api2 })
   });
   addApi({ api: api2, props, state, emit, constants, parent, nextTick, dispatch, vm, isMobileFirstMode, designConfig });
 };
@@ -485,6 +544,8 @@ const initWatch = ({ watch, props, api: api2, state, nextTick }) => {
 };
 const addWatch = ({ watch, props, api: api2, state, nextTick }) => {
   watch(() => [...state.options], api2.watchOptions);
+  watch(() => state.options, api2.watchOptionsWhenAutoSelect);
+  props.options && watch(() => props.options, api2.watchOptionsWhenAutoSelect);
   watch(() => state.hoverIndex, api2.watchHoverIndex);
   props.options && watch(() => props.options, api2.watchPropsOption, { immediate: true, deep: true });
   props.optimization && watch(() => state.optimizeOpts, api2.watchOptimizeOpts, { immediate: true });
@@ -505,6 +566,7 @@ const renderless = (props, { computed, onBeforeUnmount, onMounted, reactive, wat
     emitter,
     parent,
     constants,
+    isMobileFirstMode,
     useBreakpoint,
     vm,
     designConfig

package/drawer/index.js

@@ -57,6 +57,23 @@ const handleClose = ({ emit, props, state }) => (type, force) => {
     }, 200);
   }
 };
+const keydown = ({ api, state, props }) => (event) => {
+  if (!state.visible) {
+    return;
+  }
+  if (!props.closeOnPressEscape) {
+    return;
+  }
+  if (event.key === "Escape" || event.key === "Esc") {
+    api.handleClose("esc", true);
+  }
+};
+const addKeydownEvent = ({ api }) => () => {
+  document.addEventListener("keydown", api.keydown);
+};
+const removeKeydownEvent = ({ api }) => () => {
+  document.removeEventListener("keydown", api.keydown);
+};
 const mousedown = ({ state, vm }) => (event) => {
   event.preventDefault();
   const touch = event.touches ? event.touches[0] : event;
@@ -127,17 +144,20 @@ const hideScrollbar = (lockScrollClass) => () => {
 };
 export {
   addDragEvent,
+  addKeydownEvent,
   close,
   computedHeight,
   computedWidth,
   confirm,
   handleClose,
   hideScrollbar,
+  keydown,
   mousedown,
   mousemove,
   mouseup,
   open,
   removeDragEvent,
+  removeKeydownEvent,
   showScrollbar,
   watchVisible
 };

package/drawer/vue.js

@@ -13,7 +13,10 @@ import {
   handleClose,
   computedWidth,
   computedHeight,
-  open
+  open,
+  keydown,
+  addKeydownEvent,
+  removeKeydownEvent
 } from "./index";
 const api = ["state", "close", "confirm", "handleClose", "open"];
 const renderless = (props, { reactive, watch, onMounted, onBeforeUnmount, computed }, { emit, vm, mode, constants, designConfig }) => {
@@ -36,6 +39,9 @@ const renderless = (props, { reactive, watch, onMounted, onBeforeUnmount, comput
     mousedown: mousedown({ state, vm }),
     mousemove: mousemove({ state, props, emit }),
     mouseup: mouseup({ state }),
+    keydown: keydown({ api: api2, state, props }),
+    addKeydownEvent: addKeydownEvent({ api: api2 }),
+    removeKeydownEvent: removeKeydownEvent({ api: api2 }),
     addDragEvent: addDragEvent({ api: api2, vm }),
     removeDragEvent: removeDragEvent({ api: api2, vm }),
     watchVisible: watchVisible({ state, api: api2 }),
@@ -46,12 +52,14 @@ const renderless = (props, { reactive, watch, onMounted, onBeforeUnmount, comput
   });
   onMounted(() => {
     props.dragable && api2.addDragEvent();
+    api2.addKeydownEvent();
     if (props.lockScroll && props.visible) {
       api2.showScrollbar();
     }
   });
   onBeforeUnmount(() => {
     props.dragable && api2.removeDragEvent();
+    api2.removeKeydownEvent();
     props.lockScroll && api2.hideScrollbar();
   });
   watch(() => props.visible, api2.watchVisible, { immediate: true });

package/dropdown/index.js

@@ -23,7 +23,7 @@ const show = ({ props, state, emit }) => () => {
       () => {
         state.visible = true;
       },
-      state.trigger === "click" ? 0 : props.showTimeout
+      state.trigger === "click" || state.trigger === "contextmenu" ? 0 : props.showTimeout
     );
   }
 };
@@ -43,7 +43,7 @@ const hide = ({ api, props, state, emit }) => () => {
       () => {
         state.visible = false;
       },
-      state.trigger === "click" ? 0 : props.hideTimeout
+      state.trigger === "click" || state.trigger === "contextmenu" ? 0 : props.hideTimeout
     );
   }
 };
@@ -118,7 +118,7 @@ const removeTabindex = (state) => () => {
 const initAria = ({ state, props }) => () => {
   var _a, _b, _c, _d, _e;
   (_a = state.dropdownElm) == null ? void 0 : _a.setAttribute("id", state.listId);
-  (_b = state.triggerElm) == null ? void 0 : _b.setAttribute("aria-haspopup", "list");
+  (_b = state.triggerElm) == null ? void 0 : _b.setAttribute("aria-haspopup", "menu");
   (_c = state.triggerElm) == null ? void 0 : _c.setAttribute("aria-controls", state.listId);
   if (!props.splitButton || !props.singleButton) {
     (_d = state.triggerElm) == null ? void 0 : _d.setAttribute("role", "button");
@@ -143,7 +143,12 @@ const initEvent = ({ api, props, state, vm, mode }) => () => {
   if (state.visibleIsBoolean) {
     return;
   }
-  if (state.trigger === "hover") {
+  if (state.trigger === "contextmenu") {
+    on(state.triggerElm, "contextmenu", (e) => {
+      e.preventDefault();
+      api.handleClick();
+    });
+  } else if (state.trigger === "hover") {
     on(state.triggerElm, "mouseenter", api.show);
     on(state.triggerElm, "mouseleave", api.hide);
     on(state.dropdownElm, "mouseenter", api.show);
@@ -212,6 +217,7 @@ const beforeDistory = ({ vm, api, state }) => () => {
     off(state.triggerElm, "mouseenter", api.show);
     off(state.triggerElm, "mouseleave", api.hide);
     off(state.triggerElm, "click", api.handleClick);
+    off(state.triggerElm, "contextmenu", api.handleClick);
     state.triggerElm = null;
   }
   if (state.dropdownElm) {

package/file-upload/index.js

@@ -288,14 +288,27 @@ const properFileSize = ({
   Modal,
   t
 }) => (file) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   if ([void 0, null].includes(file.size))
     return true;
   let maxSize = 0;
-  state.singleMaxSize = props.edm.singleFileMaxSize || state.singleMaxSize || 200;
-  if (Array.isArray(props.fileSize) && props.fileSize[1]) {
-    maxSize = state.isEdm ? Math.min(state.singleMaxSize, Number(props.fileSize[1]) / 1024) : Math.max(Number(props.fileSize[0]) / 1024, Number(props.fileSize[1]) / 1024);
+  const edmConfigSingleFileMaxSize = ((_b = (_a = state.edmToken) == null ? void 0 : _a.config) == null ? void 0 : _b.singleFileMaxSize) || ((_d = (_c = props.edm) == null ? void 0 : _c.config) == null ? void 0 : _d.singleFileMaxSize) ? (((_f = (_e = state.edmToken) == null ? void 0 : _e.config) == null ? void 0 : _f.singleFileMaxSize) || ((_h = (_g = props.edm) == null ? void 0 : _g.config) == null ? void 0 : _h.singleFileMaxSize)) / 1024 : null;
+  if (state.isEdm) {
+    if (edmConfigSingleFileMaxSize !== null) {
+      maxSize = edmConfigSingleFileMaxSize;
+    } else if (Array.isArray(props.fileSize) && props.fileSize[1]) {
+      maxSize = Number(props.fileSize[1]) / 1024;
+    } else if (props.fileSize) {
+      maxSize = Number(props.fileSize) / 1024;
+    } else {
+      maxSize = state.singleMaxSize / 1024;
+    }
   } else {
-    maxSize = state.isEdm ? Math.min(state.singleMaxSize) : Number(props.fileSize) / 1024;
+    if (Array.isArray(props.fileSize) && props.fileSize[1]) {
+      maxSize = Math.max(Number(props.fileSize[0]) / 1024, Number(props.fileSize[1]) / 1024);
+    } else {
+      maxSize = Number(props.fileSize) / 1024;
+    }
   }
   if (state.isEdm || Array.isArray(props.fileSize) && props.fileSize[1]) {
     if (!isNaN(Number(maxSize)) && file.size > maxSize * 1024 * 1024) {
@@ -2137,7 +2150,7 @@ const getTipMessage = ({ t, api, constants }) => ({ accept, fileSize, limit }) =
     });
   }
   if (fileSize && acceptTip.length !== 0) {
-    acceptTip += `${t(constants.COMMA)} `;
+    acceptTip += `${t(constants.COMMA)}`;
   }
   let fileSizeTip = "";
   let kibibyte = 1024;

package/form-item/index.js

@@ -15,7 +15,10 @@ const watchError = (state) => (value) => {
 const watchValidateStatus = (state) => (value) => {
   state.validateState = value;
 };
-const computedGetValidateType = ({ props, state }) => () => props.validateType || (state.formInstance ? state.formInstance.validateType : "");
+const computedGetValidateType = ({ props, state }) => () => {
+  var _a;
+  return props.validateType || (state.formInstance ? (_a = state.formInstance) == null ? void 0 : _a.validateType : "");
+};
 const computedValidateIcon = ({ props, state }) => () => {
   var _a, _b, _c, _d;
   return (_d = (_c = props.validateIcon) != null ? _c : (_b = (_a = state == null ? void 0 : state.formInstance) == null ? void 0 : _a.state) == null ? void 0 : _b.validateIcon) != null ? _d : null;
@@ -38,23 +41,25 @@ const computedIsErrorBlock = ({ props, state }) => () => {
   return (_c = (_b = (_a = state == null ? void 0 : state.formInstance) == null ? void 0 : _a.state) == null ? void 0 : _b.isErrorBlock) != null ? _c : false;
 };
 const computedLabelStyle = ({ props, state }) => () => {
+  var _a, _b;
   const result = { width: "" };
-  if (state.form.labelPosition === POSITION.Top) {
+  if (((_a = state.form) == null ? void 0 : _a.labelPosition) === POSITION.Top) {
     return result;
   }
-  const labelWidth = props.labelWidth || state.form.state.labelWidth;
+  const labelWidth = props.labelWidth || ((_b = state.form) == null ? void 0 : _b.state.labelWidth);
   if (labelWidth) {
     result.width = labelWidth;
   }
   return result;
 };
 const computedValueStyle = ({ props, state }) => () => {
+  var _a, _b;
   const result = { width: "" };
-  if (state.form.labelPosition === POSITION.Top) {
+  if (((_a = state.form) == null ? void 0 : _a.labelPosition) === POSITION.Top) {
     result.width = "100%";
     return result;
   }
-  const labelWidth = props.labelWidth || state.form.state.labelWidth;
+  const labelWidth = props.labelWidth || ((_b = state.form) == null ? void 0 : _b.state.labelWidth);
   if (labelWidth) {
     if (labelWidth === "auto") {
       result.width = labelWidth;
@@ -65,20 +70,21 @@ const computedValueStyle = ({ props, state }) => () => {
   return result;
 };
 const computedContentStyle = ({ props, state }) => () => {
+  var _a, _b, _c, _d, _e, _f, _g, _h;
   const result = {};
   const label = props.label;
-  if (state.form.labelPosition === POSITION.Top || state.form.inline) {
+  if (((_a = state.form) == null ? void 0 : _a.labelPosition) === POSITION.Top || ((_b = state.form) == null ? void 0 : _b.inline)) {
     return result;
   }
   if (!label && !props.labelWidth && state.isNested) {
     return result;
   }
-  const labelWidth = props.labelWidth || state.form.state.labelWidth;
+  const labelWidth = props.labelWidth || ((_d = (_c = state.form) == null ? void 0 : _c.state) == null ? void 0 : _d.labelWidth);
   if (labelWidth === "auto") {
     if (props.labelWidth === "auto") {
       result.marginLeft = state.computedLabelWidth;
-    } else if (state.form.state.labelWidth === "auto") {
-      result.marginLeft = state.formInstance.state.autoLabelWidth;
+    } else if (((_f = (_e = state.form) == null ? void 0 : _e.state) == null ? void 0 : _f.labelWidth) === "auto") {
+      result.marginLeft = (_h = (_g = state.formInstance) == null ? void 0 : _g.state) == null ? void 0 : _h.autoLabelWidth;
     }
   } else {
     result.marginLeft = labelWidth;
@@ -143,7 +149,8 @@ const getPropByPath = (obj, path, strict) => {
   };
 };
 const computedFieldValue = ({ props, state }) => () => {
-  const model = state.form.model;
+  var _a;
+  const model = (_a = state.form) == null ? void 0 : _a.model;
   if (!model || !props.prop) {
     return;
   }
@@ -214,12 +221,13 @@ const clearValidate = (state) => () => {
   state.validateDisabled = false;
 };
 const resetField = ({ api, nextTick, props, state }) => () => {
+  var _a;
   if (state.getValidateType === "tip") {
     state.canShowTip = false;
   }
   state.validateState = "";
   state.validateMessage = "";
-  let model = state.form.model || {};
+  let model = ((_a = state.form) == null ? void 0 : _a.model) || {};
   let value = state.fieldValue;
   let path = props.prop || "";
   if (path && path.includes(":")) {
@@ -239,7 +247,8 @@ const resetField = ({ api, nextTick, props, state }) => () => {
   api.broadcast("timeSelect", "fieldReset", state.initialValue);
 };
 const getRules = ({ props, state }) => () => {
-  let formRules = state.form.rules || {};
+  var _a;
+  let formRules = ((_a = state.form) == null ? void 0 : _a.rules) || {};
   const selfRules = props.rules;
   const requiredRule = props.required !== void 0 ? { required: Boolean(props.required) } : [];
   const prop = getPropByPath(formRules, props.prop || "");
@@ -325,6 +334,7 @@ const wrapValidate = ({
   }
 };
 const handleMouseenter = ({ state }) => (e) => {
+  var _a, _b;
   if (!state.isDisplayOnly || !state.typeName || !state.form)
     return;
   const dom = e.target;
@@ -340,22 +350,24 @@ const handleMouseenter = ({ state }) => (e) => {
     overHeight = true;
   }
   if (res.o || overHeight) {
-    state.form.showTooltip(dom, state.displayedValue);
+    (_b = (_a = state.form).showTooltip) == null ? void 0 : _b.call(_a, dom, state.displayedValue);
   }
 };
 const handleLabelMouseenter = ({ props, state, slots }) => (e) => {
-  if (!state.form.overflowTitle || !state.form || slots.label)
+  var _a, _b, _c;
+  if (!((_a = state.form) == null ? void 0 : _a.overflowTitle) || !state.form || slots.label)
     return;
   const label = e.target;
   if (label && label.scrollWidth > label.offsetWidth) {
-    state.form.showTooltip(label, props.label + state.form.labelSuffix);
+    (_c = (_b = state.form).showTooltip) == null ? void 0 : _c.call(_b, label, props.label + state.form.labelSuffix);
   }
 };
 const handleMouseleave = (state) => () => {
   state.form && state.form.hideTooltip();
 };
 const getDisplayedValue = ({ state }) => (param) => {
-  if (!state.formInstance.displayOnly)
+  var _a;
+  if (!((_a = state.formInstance) == null ? void 0 : _a.displayOnly))
     return;
   state.typeName = param.type;
   state.isBasicComp = true;

package/form-item/vue.js

@@ -84,22 +84,58 @@ const initState = ({
     form: computed(() => api2.computedForm()),
     fieldValue: computed(() => api2.computedFieldValue()),
     isRequired: computed(() => api2.computedIsRequired()),
-    formInline: computed(() => state.formInstance.inline),
-    formSize: computed(() => state.formInstance.size),
+    formInline: computed(() => {
+      var _a;
+      return (_a = state.formInstance) == null ? void 0 : _a.inline;
+    }),
+    formSize: computed(() => {
+      var _a;
+      return (_a = state.formInstance) == null ? void 0 : _a.size;
+    }),
     formItemSize: computed(() => props.size || state.formSize),
-    isDisplayOnly: computed(() => state.formInstance.displayOnly),
-    labelPosition: computed(() => state.formInstance.labelPosition),
-    hideRequiredAsterisk: computed(() => state.formInstance.state.hideRequiredAsterisk),
-    labelSuffix: computed(() => state.formInstance.labelSuffix),
-    labelWidth: computed(() => state.formInstance.labelWidth),
-    showMessage: computed(() => state.formInstance.showMessage),
+    isDisplayOnly: computed(() => {
+      var _a, _b;
+      return (_b = (_a = state.formInstance) == null ? void 0 : _a.displayOnly) != null ? _b : false;
+    }),
+    labelPosition: computed(() => {
+      var _a, _b;
+      return (_b = (_a = state.formInstance) == null ? void 0 : _a.labelPosition) != null ? _b : "right";
+    }),
+    hideRequiredAsterisk: computed(() => {
+      var _a, _b, _c;
+      return (_c = (_b = (_a = state.formInstance) == null ? void 0 : _a.state) == null ? void 0 : _b.hideRequiredAsterisk) != null ? _c : false;
+    }),
+    labelSuffix: computed(() => {
+      var _a, _b;
+      return (_b = (_a = state.formInstance) == null ? void 0 : _a.labelSuffix) != null ? _b : "";
+    }),
+    labelWidth: computed(() => {
+      var _a, _b;
+      return (_b = (_a = state.formInstance) == null ? void 0 : _a.labelWidth) != null ? _b : "";
+    }),
+    showMessage: computed(() => {
+      var _a, _b;
+      return (_b = (_a = state.formInstance) == null ? void 0 : _a.showMessage) != null ? _b : true;
+    }),
     sizeClass: computed(() => state.formItemSize),
     getValidateType: computed(() => api2.computedGetValidateType()),
     validateIcon: computed(() => api2.computedValidateIcon()),
     isErrorInline: computed(() => api2.computedIsErrorInline()),
     isErrorBlock: computed(() => api2.computedIsErrorBlock()),
-    disabled: computed(() => state.formInstance.disabled || props.disabled),
-    tooltipType: computed(() => state.formInstance.state.tooltipType),
+    /**
+     * TODO: There is a potential issue here. Need to confirm whether to keep this logic.
+     * There does not have disabled prop in form-item, but disabled is used here, I think it is a mistake.
+     * If not, need to add disabled prop in form-item component.
+     */
+    // @ts-expect-error Need to confirm whether to keep this logic
+    disabled: computed(() => {
+      var _a;
+      return ((_a = state.formInstance) == null ? void 0 : _a.disabled) || props.disabled;
+    }),
+    tooltipType: computed(() => {
+      var _a, _b;
+      return (_b = (_a = state.formInstance) == null ? void 0 : _a.state.tooltipType) != null ? _b : "normal";
+    }),
     // 标记表单项下是否有多个子节点
     isMultiple: false
   });
@@ -145,7 +181,10 @@ const initApi = ({ api: api2, state, dispatch, broadcast, props, constants, vm,
 const initWatch = ({ watch, api: api2, props, state }) => {
   watch(() => props.error, api2.watchError, { immediate: true });
   watch(() => props.validateStatus, api2.watchValidateStatus);
-  watch(() => state.formInstance.displayOnly, api2.clearDisplayedValue);
+  watch(() => {
+    var _a;
+    return (_a = state.formInstance) == null ? void 0 : _a.displayOnly;
+  }, api2.clearDisplayedValue);
 };
 const renderless = (props, { computed, inject, onMounted, onUnmounted, provide, reactive, watch }, { vm, constants, t, nextTick, broadcast, dispatch, mode, slots }) => {
   const api2 = {};

package/grid/static/array/eachTree.js

@@ -9,6 +9,7 @@ const eachTreeItem = ({ parent, obj, iterate, context, path, node, parseChildren
     if (item && parseChildren) {
       paths.push(parseChildren);
       eachTreeItem({
+        parent: item,
         item,
         obj: item[parseChildren],
         context,

package/grid/utils/common.js

@@ -11,7 +11,7 @@ const getRowid = ($table, row) => {
   const rowId = get(row, getRowkey($table));
   return rowId ? encodeURIComponent(rowId) : "";
 };
-const getColumnList = (columns, options = {}, level = 0) => {
+const getColumnList = ($table, columns, options = {}, level = 0) => {
   const result = [];
   columns.forEach((column, index) => {
     var _a;
@@ -25,8 +25,15 @@ const getColumnList = (columns, options = {}, level = 0) => {
     if (level === 0 && !options.isGroup && hasChildren) {
       options.isGroup = true;
     }
-    options.columnCaches.push({ colid: column.id, column, index });
-    result.push.apply(result, hasChildren ? getColumnList(column.children, options, level + 1) : [column]);
+    const isLeaf = !hasChildren;
+    options.columnCaches.push({
+      colid: column.id,
+      column,
+      index,
+      isLeaf,
+      columnIndex: isLeaf ? $table.markColumnIndex++ : null
+    });
+    result.push.apply(result, hasChildren ? getColumnList($table, column.children, options, level + 1) : [column]);
   });
   return result;
 };