cnhis-design-vue 3.1.34-beta.9 → 3.1.35-beta.1

package/es/components/form-render/src/components/renderer/jsonCombination/hooks/useDeepValidate.js

@@ -15,14 +15,14 @@ function useDeepValidate() {
       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));
-              }
-            );
+            return Promise.allSettled(
+              formRenderRefs.value.filter((formRenderRef) => formRenderRef).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) : []

package/es/components/form-render/src/components/renderer/lineBar/FormCollapse.vue.d.ts

@@ -7,6 +7,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    remark: StringConstructor;
     disabled: {
         type: BooleanConstructor;
         default: boolean;
@@ -21,6 +22,7 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
+        remark: StringConstructor;
         disabled: {
             type: BooleanConstructor;
             default: boolean;
@@ -30,6 +32,18 @@ declare const _default: import("vue").DefineComponent<{
     toggleShow: () => void;
     fieldKey: import("vue").ComputedRef<string>;
     formItemDepsCollector: import("../../../../../../../es/components/form-render").FormItemDepsCollector;
+    TooltipMessage: import("vue").DefineComponent<{
+        message: StringConstructor;
+    }, {
+        props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+            message: StringConstructor;
+        }>> & {}>>;
+        parsedMessages: import("vue").ComputedRef<string[]>;
+        HelpCircleOutline: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+        NTooltip: any;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        message: StringConstructor;
+    }>>, {}>;
     ChevronDown: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     ChevronUp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     NCollapseTransition: any;
@@ -42,6 +56,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    remark: StringConstructor;
     disabled: {
         type: BooleanConstructor;
         default: boolean;

package/es/components/form-render/src/components/renderer/lineBar/FormCollapse.vue.js

@@ -1,5 +1,6 @@
-import { defineComponent, ref, inject, openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createBlock, unref, createVNode, withCtx, renderSlot } from 'vue';
+import { defineComponent, ref, inject, openBlock, createElementBlock, createElementVNode, createTextVNode, toDisplayString, createBlock, createCommentVNode, unref, createVNode, withCtx, renderSlot } from 'vue';
 import '../../../../index.js';
+import TooltipMessage from '../../tooltipMessage.vue.js';
 import { InjectionFormItemDepsCollector, FormItemLineBarDepKeyPrepend } from '../../../constants/index.js';
 import { ChevronDown, ChevronUp } from '@vicons/ionicons5';
 import { NCollapseTransition } from 'naive-ui';
@@ -10,11 +11,13 @@ const _hoisted_1 = {
   class: "form-render__linebar",
   "anchor-target": ""
 };
+const _hoisted_2 = { class: "form-render__linebarHeaderTitle" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FormCollapse",
   props: {
     show: { type: Boolean, default: true },
     title: { type: String, default: "" },
+    remark: String,
     disabled: { type: Boolean, default: false }
   },
   setup(__props) {
@@ -36,7 +39,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           class: "form-render__linebarHeader",
           onClick: toggleShow
         }, [
-          createTextVNode(toDisplayString(__props.title) + " ", 1),
+          createElementVNode("div", _hoisted_2, [
+            createTextVNode(toDisplayString(__props.title) + " ", 1),
+            __props.remark ? (openBlock(), createBlock(TooltipMessage, {
+              key: 0,
+              message: __props.remark
+            }, null, 8, ["message"])) : createCommentVNode("v-if", true)
+          ]),
           _show.value ? (openBlock(), createBlock(unref(ChevronDown), { key: 0 })) : (openBlock(), createBlock(unref(ChevronUp), { key: 1 }))
         ]),
         createVNode(unref(NCollapseTransition), {

package/es/components/form-render/src/components/renderer/lineBar/index.d.ts

@@ -7,6 +7,7 @@ export declare const LINEBAR: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    remark: StringConstructor;
     disabled: {
         type: BooleanConstructor;
         default: boolean;
@@ -21,6 +22,7 @@ export declare const LINEBAR: import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
+        remark: StringConstructor;
         disabled: {
             type: BooleanConstructor;
             default: boolean;
@@ -30,6 +32,18 @@ export declare const LINEBAR: import("vue").DefineComponent<{
     toggleShow: () => void;
     fieldKey: import("vue").ComputedRef<string>;
     formItemDepsCollector: import("../../../hooks").FormItemDepsCollector;
+    TooltipMessage: import("vue").DefineComponent<{
+        message: StringConstructor;
+    }, {
+        props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+            message: StringConstructor;
+        }>> & {}>>;
+        parsedMessages: import("vue").ComputedRef<string[]>;
+        HelpCircleOutline: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+        NTooltip: any;
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        message: StringConstructor;
+    }>>, {}>;
     ChevronDown: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     ChevronUp: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     NCollapseTransition: any;
@@ -42,6 +56,7 @@ export declare const LINEBAR: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    remark: StringConstructor;
     disabled: {
         type: BooleanConstructor;
         default: boolean;

package/es/components/form-render/src/components/tooltipMessage.vue.d.ts

@@ -0,0 +1,13 @@
+declare const _default: import("vue").DefineComponent<{
+    message: StringConstructor;
+}, {
+    props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
+        message: StringConstructor;
+    }>> & {}>>;
+    parsedMessages: import("vue").ComputedRef<string[]>;
+    HelpCircleOutline: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
+    NTooltip: any;
+}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    message: StringConstructor;
+}>>, {}>;
+export default _default;

package/es/components/form-render/src/components/tooltipMessage.vue.js

@@ -0,0 +1,37 @@
+import { defineComponent, computed, openBlock, createBlock, unref, withCtx, createVNode, createElementVNode, createElementBlock, Fragment, renderList, toDisplayString } from 'vue';
+import { HelpCircleOutline } from '@vicons/ionicons5';
+import { isString } from 'lodash-es';
+import { NTooltip } from 'naive-ui';
+import _export_sfc from '../../../../_virtual/plugin-vue_export-helper.js';
+
+const _hoisted_1 = { style: { "display": "inline-flex", "flex-direction": "column" } };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "tooltipMessage",
+  props: { message: String },
+  setup(__props) {
+    const props = __props;
+    const parsedMessages = computed(() => {
+      if (!isString(props.message))
+        return [];
+      return props.message.split("<br>");
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(NTooltip), { trigger: "hover" }, {
+        trigger: withCtx(() => [
+          createVNode(unref(HelpCircleOutline))
+        ]),
+        default: withCtx(() => [
+          createElementVNode("section", _hoisted_1, [
+            (openBlock(true), createElementBlock(Fragment, null, renderList(unref(parsedMessages), (m) => {
+              return openBlock(), createElementBlock("span", { key: m }, toDisplayString(m), 1);
+            }), 128))
+          ])
+        ]),
+        _: 1
+      });
+    };
+  }
+});
+var TooltipMessage = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "tooltipMessage.vue"]]);
+
+export { TooltipMessage as default };

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

@@ -50,6 +50,7 @@ function useFieldListAdaptor(collector) {
           fieldItem: deepOmit(item, ["reactions"]),
           span: item.elem_width,
           showLabel: item.hide_title !== "1",
+          remark: item.remark,
           propertyKey: item.val_key,
           annotation: item.annotation,
           ...item.decoratorProps || {}
@@ -182,10 +183,10 @@ function useFieldListAdaptor(collector) {
       title: item.alias || item.name,
       "x-component": "LINEBAR",
       "x-component-props": {
-        line: item.__line,
         disabled: item.is_not_fold === "1",
         id: createLinebarId(item.val_key),
-        show: item.is_show !== "0"
+        show: item.is_show !== "0",
+        remark: item.remark
       }
     };
   };

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

@@ -185,6 +185,14 @@ export declare type FieldItem = {
      * 是否使用json格式对该字段值进行合并
      */
     extendKey: string;
+    /**
+     * 是否允许linebar控件收起('1'表示不可收起)
+     */
+    is_not_fold: string;
+    /**
+     * linebar控件中的备注
+     */
+    remark: string;
     /**
      * 数据类型
      */

package/es/components/form-render/src/utils/dom.d.ts

@@ -1,7 +1,13 @@
-import { Nullable, UndefinedAble } from '../../../../../es/shared/types';
+import { Nullable } from '../../../../../es/shared/types';
 export declare function queryDecorator(key: string, wrapperElement: HTMLElement, formUUID: string): HTMLElement | null;
 export declare function queryInput(decoratorElement?: Nullable<HTMLElement>): {
     widgetElement: HTMLInputElement | null | undefined;
     widgetElementList: HTMLInputElement[];
 };
-export declare function findNextWidget(containers: HTMLElement[], currentContainerIndex: number, currentWidget: HTMLElement): UndefinedAble<HTMLElement>;
+export declare function findNextWidget(containers: HTMLElement[], currentContainerIndex: number, currentWidget: HTMLElement): {
+    widget: HTMLElement;
+    field: string | null;
+} | {
+    widget: null;
+    field: null;
+};

package/es/components/form-render/src/utils/dom.js

@@ -13,17 +13,24 @@ function queryInput(decoratorElement) {
 function findNextWidget(containers, currentContainerIndex, currentWidget) {
   const nextWidget = findInnerNextWidget(containers[currentContainerIndex], currentWidget);
   if (nextWidget)
-    return nextWidget;
-  let result;
+    return { widget: nextWidget, field: getFormField(containers[currentContainerIndex]) };
+  let widget = null;
+  let field = null;
   containers.slice(currentContainerIndex + 1).some((container) => {
-    return result = findInnerNextWidget(container);
+    const res = widget = findInnerNextWidget(container);
+    if (res)
+      field = getFormField(container);
+    return res;
   });
-  return result;
+  return { widget, field };
+  function getFormField(formItemElement) {
+    return formItemElement && formItemElement.getAttribute("form-field");
+  }
   function findInnerNextWidget(container, currentWidget2) {
     const widgets = Array.from(container.querySelectorAll("textarea,input,[tabindex]"));
-    const widgetIndex = currentWidget2 ? widgets.findIndex((widget) => widget === currentWidget2) : -1;
+    const widgetIndex = currentWidget2 ? widgets.findIndex((widget2) => widget2 === currentWidget2) : -1;
     return widgets.slice(widgetIndex + 1).find(
-      (widget) => !Reflect.get(widget, "disabled") && !Array.from(widget.classList).some((className) => className.endsWith("--disabled"))
+      (widget2) => !Reflect.get(widget2, "disabled") && !Array.from(widget2.classList).some((className) => className.endsWith("--disabled"))
     );
   }
 }

package/es/components/form-render/style/index.css

@@ -1 +1 @@
-.annotation-edit{align-items:center;color:#0067ee;cursor:pointer;display:inline-flex;font-size:16px;user-select:none}.annotation-edit.is-active{color:#ff9828}.annotation-edit__icon{align-items:center;display:inline-flex}.recommend-search__menu{min-height:100px}.recommend-search__menuRecommendList{display:flex;flex-wrap:wrap;gap:8px;margin-top:4px}.recommend-search__menuRecommendList .n-tag{cursor:pointer}.recommend-search__recentRecommend{margin-bottom:8px}.recommend-search__recentRecommend>header{align-items:center;color:rgba(0,0,0,.4);display:flex;justify-content:space-between}.recommend-search__recentRecommend>header .n-icon:hover{color:rgba(0,0,0,.6);cursor:pointer}.recommend-search__commonRecommend{margin-bottom:8px}.recommend-search__commonRecommend>header{align-items:center;color:rgba(0,0,0,.4);display:flex;justify-content:space-between}.recommend-search__commonRecommend>header .n-icon:hover{color:rgba(0,0,0,.6);cursor:pointer}.recommend-search__option{align-items:center;border-radius:4px;cursor:pointer;display:flex;height:32px;justify-content:space-between;padding:0 8px}.recommend-search__optionText{max-width:calc(100% - 24px);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.recommend-search__option.is-active{color:var(--n-color)!important}.recommend-search__option.is-active .n-icon{font-size:20px}.recommend-search__option:hover{background:rgba(0,0,0,.03)}.recommend-search__optionContainer{margin:-8px -10px}.recommend-search__empty{align-items:center;color:rgba(0,0,0,.3);display:flex;height:100px;justify-content:center}.search-cascader__menuWrapper{display:flex;flex-wrap:nowrap;margin:-8px -14px}.search-cascader__input input{cursor:pointer!important}.search-cascader__option{align-items:center;border-radius:4px;box-sizing:border-box;display:flex;height:32px;justify-content:space-between;padding:0 8px 0 16px;width:100%}.search-cascader__option--active{background:#f8f8f8}.search-cascader__option:hover{background:#f5f5f5;cursor:pointer}.search-cascader__optionWrapper{background:#fff;height:256px;overflow-x:auto;width:calc(var(--menu-width)*1px)}.search-cascader__optionWrapper:not(:last-of-type){border:solid #e5e5e5;border-width:0 1px 0 0}.search-cascader__optionText{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:calc(100% - 20px)}.search-cascader__option svg{color:#bfbfbf;flex-shrink:0;font-size:12px;width:20px}.search-cascader__option svg.rotate{animation:rotate 1s linear infinite}.search-cascader__emptyWrapper{align-items:center;background:#fff;box-sizing:border-box;display:flex;height:300px;justify-content:center;padding:16px;width:100%}@keyframes rotate{0%{transform:rotate(0)}to{transform:rotate(1turn)}}.form-render__wrapper{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr));max-height:var(--form-height);overflow-y:auto;position:relative}.form-render__formItem{grid-column:span min(var(--column),var(--form-item-column)) /span min(var(--column),var(--form-item-column))}.form-render__formItem .n-date-picker,.form-render__formItem .n-input-number{width:100%}.form-render__formItemLabel{align-items:center;display:inline-flex;position:relative}.form-render__formItemLabel--text.has-annotation{margin-right:15px}.form-render__formItemLabel--annotation{position:absolute;right:calc(var(--icon-right)*1px);top:50%;transform:translateY(-50%)}.form-render__formItem .n-form-item-label{display:inline-flex}.form-render__formItem .n-form-item-label [annotation-hover-show=true]{visibility:hidden}.form-render__formItem .n-form-item-label:hover [annotation-hover-show=true]{visibility:visible}.form-render__linebar{grid-column:span min(var(--column),var(--column)) /span min(var(--column),var(--column))}.form-render__linebarHeader{align-items:center;background:#f2f2f2;border-radius:4px;cursor:pointer;display:flex;font-size:14px;font-weight:500;height:32px;justify-content:space-between;margin-bottom:8px;padding:0 16px}.form-render__linebarHeader svg{color:rgba(33,33,33,.4);width:14px}.form-render__linebarItem{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr))}.form-render__linebreaks{grid-column:span min(var(--column),var(--form-item-column)) /span min(var(--column),var(--form-item-column))}.form-render__inputGroup{align-items:flex-start;display:flex;grid-column:span min(var(--column),var(--column)) /span min(var(--column),var(--column))}.form-render__inputGroup>div{flex:1}.form-render__inputGroup>div:not(:last-of-type) .n-base-selection__border,.form-render__inputGroup>div:not(:last-of-type) .n-input__border{border-bottom-right-radius:0;border-right:0;border-top-right-radius:0}.form-render__inputGroup>div:last-of-type .n-base-selection__border,.form-render__inputGroup>div:last-of-type .n-input__border{border-bottom-left-radius:0;border-top-left-radius:0}.form-render__combination{width:100%}.form-render__combinationHeader{display:flex;gap:12px}.form-render__combinationHeader>h3{font-size:16px;font-weight:700;margin:0;padding:0}.form-render__combinationHeader .n-button__icon{font-size:14px;margin:0 2px 0 0}.form-render__combinationHeaderText{font-size:16px;font-weight:500}.form-render__combinationClose{font-size:16px;height:14px;position:absolute;right:5px;top:5px;width:14px}.form-render__combinationContentJson{position:relative}.form-render__combinationContent{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr));position:relative}.form-render__complex{width:100%}.form-render__complexContent--grid{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr))}.form-render__complexContent--flex{display:flex!important;gap:0 8px}.form-render__selectMenu .n-scrollbar-rail__scrollbar{display:none!important}.form-render__selectMenu .n-virtual-list::-webkit-scrollbar,.form-render__selectMenu .n-virtual-list::-webkit-scrollbar-thumb{display:unset!important;height:6px;width:6px}.form-render__selectMenu .n-virtual-list::-webkit-scrollbar-thumb{background:#bfbfbf;border-radius:4px}.form-render__selectMenu .v-vl-items{min-width:100%;width:max-content}.form-render__selectOption .n-base-select-option__content{overflow:visible!important;text-overflow:unset!important;word-break:keep-all!important}
+.annotation-edit{align-items:center;color:#0067ee;cursor:pointer;display:inline-flex;font-size:16px;user-select:none}.annotation-edit.is-active{color:#ff9828}.annotation-edit__icon{align-items:center;display:inline-flex}.recommend-search__menu{min-height:100px}.recommend-search__menuRecommendList{display:flex;flex-wrap:wrap;gap:8px;margin-top:4px}.recommend-search__menuRecommendList .n-tag{cursor:pointer}.recommend-search__recentRecommend{margin-bottom:8px}.recommend-search__recentRecommend>header{align-items:center;color:rgba(0,0,0,.4);display:flex;justify-content:space-between}.recommend-search__recentRecommend>header .n-icon:hover{color:rgba(0,0,0,.6);cursor:pointer}.recommend-search__commonRecommend{margin-bottom:8px}.recommend-search__commonRecommend>header{align-items:center;color:rgba(0,0,0,.4);display:flex;justify-content:space-between}.recommend-search__commonRecommend>header .n-icon:hover{color:rgba(0,0,0,.6);cursor:pointer}.recommend-search__option{align-items:center;border-radius:4px;cursor:pointer;display:flex;height:32px;justify-content:space-between;padding:0 8px}.recommend-search__optionText{max-width:calc(100% - 24px);overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.recommend-search__option.is-active{color:var(--n-color)!important}.recommend-search__option.is-active .n-icon{font-size:20px}.recommend-search__option:hover{background:rgba(0,0,0,.03)}.recommend-search__optionContainer{margin:-8px -10px}.recommend-search__empty{align-items:center;color:rgba(0,0,0,.3);display:flex;height:100px;justify-content:center}.search-cascader__menuWrapper{display:flex;flex-wrap:nowrap;margin:-8px -14px}.search-cascader__input input{cursor:pointer!important}.search-cascader__option{align-items:center;border-radius:4px;box-sizing:border-box;display:flex;height:32px;justify-content:space-between;padding:0 8px 0 16px;width:100%}.search-cascader__option--active{background:#f8f8f8}.search-cascader__option:hover{background:#f5f5f5;cursor:pointer}.search-cascader__optionWrapper{background:#fff;height:256px;overflow-x:auto;width:calc(var(--menu-width)*1px)}.search-cascader__optionWrapper:not(:last-of-type){border:solid #e5e5e5;border-width:0 1px 0 0}.search-cascader__optionText{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;width:calc(100% - 20px)}.search-cascader__option svg{color:#bfbfbf;flex-shrink:0;font-size:12px;width:20px}.search-cascader__option svg.rotate{animation:rotate 1s linear infinite}.search-cascader__emptyWrapper{align-items:center;background:#fff;box-sizing:border-box;display:flex;height:300px;justify-content:center;padding:16px;width:100%}@keyframes rotate{0%{transform:rotate(0)}to{transform:rotate(1turn)}}.form-render__wrapper{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr));max-height:var(--form-height);overflow-y:auto;position:relative}.form-render__formItem{grid-column:span min(var(--column),var(--form-item-column)) /span min(var(--column),var(--form-item-column))}.form-render__formItem .n-date-picker,.form-render__formItem .n-input-number{width:100%}.form-render__formItemLabel{align-items:center;display:inline-flex;justify-content:space-between;position:relative}.form-render__formItemLabel--operation{align-items:center;display:flex;gap:2px;position:absolute;right:0;top:50%;transform:translateY(-50%)}.form-render__formItemLabel--tooltip{font-size:0;line-height:1;width:16px}.form-render__formItem .n-form-item-label{display:inline-flex}.form-render__formItem .n-form-item-label [annotation-hover-show=true]{visibility:hidden}.form-render__formItem .n-form-item-label:hover [annotation-hover-show=true]{visibility:visible}.form-render__linebar{grid-column:span min(var(--column),var(--column)) /span min(var(--column),var(--column))}.form-render__linebarHeader{align-items:center;background:#f2f2f2;border-radius:4px;cursor:pointer;display:flex;font-size:14px;font-weight:500;height:32px;justify-content:space-between;margin-bottom:8px;padding:0 16px}.form-render__linebarHeader>svg{color:rgba(33,33,33,.4);width:14px}.form-render__linebarHeaderTitle{align-items:center;display:flex;gap:4px;vertical-align:middle}.form-render__linebarHeaderTitle svg{height:16px;transform:translateY(-1px)}.form-render__linebarItem{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr))}.form-render__linebreaks{grid-column:span min(var(--column),var(--form-item-column)) /span min(var(--column),var(--form-item-column))}.form-render__inputGroup{align-items:flex-start;display:flex;grid-column:span min(var(--column),var(--column)) /span min(var(--column),var(--column))}.form-render__inputGroup>div{flex:1}.form-render__inputGroup>div:not(:last-of-type) .n-base-selection__border,.form-render__inputGroup>div:not(:last-of-type) .n-input__border{border-bottom-right-radius:0;border-right:0;border-top-right-radius:0}.form-render__inputGroup>div:last-of-type .n-base-selection__border,.form-render__inputGroup>div:last-of-type .n-input__border{border-bottom-left-radius:0;border-top-left-radius:0}.form-render__combination{width:100%}.form-render__combinationHeader{display:flex;gap:12px}.form-render__combinationHeader>h3{font-size:16px;font-weight:700;margin:0;padding:0}.form-render__combinationHeader .n-button__icon{font-size:14px;margin:0 2px 0 0}.form-render__combinationHeaderText{font-size:16px;font-weight:500}.form-render__combinationClose{font-size:16px;height:14px;position:absolute;right:5px;top:5px;width:14px}.form-render__combinationContentJson{position:relative}.form-render__combinationContent{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr));position:relative}.form-render__complex{width:100%}.form-render__complexContent--grid{align-items:start;display:grid!important;gap:0 16px;grid-template-columns:repeat(var(--column),minmax(0,1fr))}.form-render__complexContent--flex{display:flex!important;gap:0 8px}.form-render__selectMenu .n-scrollbar-rail__scrollbar{display:none!important}.form-render__selectMenu .n-virtual-list::-webkit-scrollbar,.form-render__selectMenu .n-virtual-list::-webkit-scrollbar-thumb{display:unset!important;height:6px;width:6px}.form-render__selectMenu .n-virtual-list::-webkit-scrollbar-thumb{background:#bfbfbf;border-radius:4px}.form-render__selectMenu .v-vl-items{min-width:100%;width:max-content}.form-render__selectOption .n-base-select-option__content{overflow:visible!important;text-overflow:unset!important;word-break:keep-all!important}

package/es/components/iho-table/src/IhoTable.vue.js

@@ -105,6 +105,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     const { header, footer } = createDomInsertComponent(hooks);
     expose({
       $table,
+      async loadData(data) {
+        var _a2;
+        (_a2 = $table.value) == null ? void 0 : _a2.loadData(await dataTransfer(data));
+      },
       setFilterState(fieldName, value) {
         return { fieldName, value };
       },
@@ -133,11 +137,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           ]),
           _: 2
         }, [
-          renderList(_ctx.$slots, (k, v) => {
+          renderList(_ctx.$slots, (v, k) => {
             return {
-              name: v,
+              name: k,
               fn: withCtx(() => [
-                renderSlot(_ctx.$slots, v)
+                renderSlot(_ctx.$slots, k)
               ])
             };
           })

package/es/components/iho-table/src/constants/index.d.ts

@@ -63,6 +63,10 @@ export declare enum IHO_TABLE_TREE_TYPE {
     UNKNOWN2 = 2,
     TRANSFORM_TREE_TYPE = 3
 }
+export declare enum IHO_TABLE_FIXED_STATUS {
+    left = 1,
+    right = 2
+}
 export declare const IhoTableCustomEventNameTuple: readonly ["formChange", "settingClick", "formClick", "keyboard"];
 export declare const IhoTableEventNameTuple: readonly ["formChange", "settingClick", "formClick", "keyboard", ...("toggleRowExpand" | "toggleTreeExpand" | "copy" | "scroll" | "cut" | "paste" | "keydown" | "keydownStart" | "keydownEnd" | "currentChange" | "radioChange" | "checkboxChange" | "checkboxAll" | "checkboxRangeStart" | "checkboxRangeChange" | "checkboxRangeEnd" | "cellClick" | "cellDblclick" | "cellMenu" | "cellMouseenter" | "cellMouseleave" | "headerCellClick" | "headerCellDblclick" | "headerCellMenu" | "footerCellClick" | "footerCellDblclick" | "footerCellMenu" | "sortChange" | "filterChange" | "filterVisible" | "resizableChange" | "menuClick" | "editClosed" | "editActived" | "editDisabled" | "validError" | "custom" | "openFnr" | "fnrChange" | "fnrFind" | "fnrFindAll" | "fnrReplace" | "fnrReplaceAll" | "cellAreaCopy" | "cellAreaCut" | "cellAreaPaste" | "cellAreaMerge" | "clearCellAreaMerge" | "headerCellAreaSelection" | "cellAreaSelectionStart" | "cellAreaSelectionDrag" | "cellAreaSelectionEnd" | "cellAreaExtensionStart" | "cellAreaExtensionDrag" | "cellAreaExtensionEnd" | "cellAreaArrowsStart" | "cellAreaArrowsEnd" | "activeCellChangeStart" | "activeCellChangeEnd")[]];
 export declare const InjectionIhoTableConfig: InjectionKey<Ref<IhoTableConfig>>;

package/es/components/iho-table/src/constants/index.js

@@ -135,6 +135,11 @@ var IHO_TABLE_TREE_TYPE = /* @__PURE__ */ ((IHO_TABLE_TREE_TYPE2) => {
   IHO_TABLE_TREE_TYPE2[IHO_TABLE_TREE_TYPE2["TRANSFORM_TREE_TYPE"] = 3] = "TRANSFORM_TREE_TYPE";
   return IHO_TABLE_TREE_TYPE2;
 })(IHO_TABLE_TREE_TYPE || {});
+var IHO_TABLE_FIXED_STATUS = /* @__PURE__ */ ((IHO_TABLE_FIXED_STATUS2) => {
+  IHO_TABLE_FIXED_STATUS2[IHO_TABLE_FIXED_STATUS2["left"] = 1] = "left";
+  IHO_TABLE_FIXED_STATUS2[IHO_TABLE_FIXED_STATUS2["right"] = 2] = "right";
+  return IHO_TABLE_FIXED_STATUS2;
+})(IHO_TABLE_FIXED_STATUS || {});
 const IhoTableCustomEventNameTuple = ["formChange", "settingClick", "formClick", "keyboard"];
 const IhoTableEventNameTuple = [...IhoTableCustomEventNameTuple, ...VxeTableEventNameList];
 const InjectionIhoTableConfig = Symbol("injectionIhoTableConfig");
@@ -147,4 +152,4 @@ const InjectionIhoTableEventListener = Symbol(
   "InjectionIhoTableEventListener"
 );
 
-export { EDITABLE_WIDGET_TYPE, HIGHEST_PRIORITY, IHO_TABLE_NUMBER_STATUS, IHO_TABLE_STRING_STATUS, IHO_TABLE_TREE_TYPE, IhoTableCustomEventNameTuple, IhoTableEventNameTuple, IhoTableRowGroupSequence, InjectionIhoTableConfig, InjectionIhoTableEmits, InjectionIhoTableEventListener, InjectionIhoTableFieldList, InjectionIhoTableHandler, InjectionIhoTableInstance, InjectionIhoTableUUID, VxeEventListenerNameList, VxeTableEventNameList, WIDGET_TYPE };
+export { EDITABLE_WIDGET_TYPE, HIGHEST_PRIORITY, IHO_TABLE_FIXED_STATUS, IHO_TABLE_NUMBER_STATUS, IHO_TABLE_STRING_STATUS, IHO_TABLE_TREE_TYPE, IhoTableCustomEventNameTuple, IhoTableEventNameTuple, IhoTableRowGroupSequence, InjectionIhoTableConfig, InjectionIhoTableEmits, InjectionIhoTableEventListener, InjectionIhoTableFieldList, InjectionIhoTableHandler, InjectionIhoTableInstance, InjectionIhoTableUUID, VxeEventListenerNameList, VxeTableEventNameList, WIDGET_TYPE };

package/es/components/iho-table/src/plugins/defaultConfigPlugin/index.js

@@ -26,20 +26,22 @@ function defaultConfigPlugin() {
           },
           config
         );
-        if (config.isTree === IHO_TABLE_TREE_TYPE.TRANSFORM_TREE_TYPE) {
-          result.treeConfig = Object.assign(
-            {},
-            { transform: true, expandAll: true, lazy: true, reserve: true },
-            result.treeConfig
-          );
-        }
         if (IhoTableStatusHelper.isPositive(config.isBatchSelect) || config.selectType) {
           result.selectType = config.selectType || "checkbox";
         }
+        return result;
+      });
+      hooks.configHooks.treeConfig.tap({ name: pluginName, stage: HIGHEST_PRIORITY }, (treeConfig, config) => {
+        if (config.isTree === IHO_TABLE_TREE_TYPE.TRANSFORM_TREE_TYPE) {
+          return Object.assign({ transform: true, expandAll: true, lazy: true, reserve: true }, treeConfig);
+        }
+        return treeConfig;
+      });
+      hooks.configHooks.mouseConfig.tap({ name: pluginName, stage: HIGHEST_PRIORITY }, (mouseConfig, config) => {
         if (isObject(config.keyboardConfig)) {
-          result.mouseConfig = Object.assign({}, { selected: !!config.keyboardConfig.isEdit }, result.mouseConfig);
+          return Object.assign({ selected: !!config.keyboardConfig.isEdit }, mouseConfig);
         }
-        return result;
+        return mouseConfig;
       });
     }
   });

package/es/components/iho-table/src/plugins/keyboardEventPlugin/index.js

@@ -10,9 +10,7 @@ function keyboardEventPlugin() {
     apply(hooks) {
       hooks.eventHooks.onKeydown.tap(pluginName, async ({ $event, $table }, _, { emits }) => {
         await promiseTimeout(0);
-        const activeCellInfo = $table.getSelectedCell();
-        const editCellInfo = $table.getEditRecord();
-        const { row, column } = activeCellInfo || editCellInfo;
+        const { row, column } = $table.getSelectedCell() || $table.getEditRecord() || {};
         if (!row || !column)
           return;
         const key = $event.key;

package/es/components/iho-table/src/plugins/lowCodeFieldAdaptorPlugin/index.js

@@ -1,8 +1,9 @@
-import { pick, cloneDeep, isObject } from 'lodash-es';
-import { toRaw } from 'vue';
-import { HIGHEST_PRIORITY, WIDGET_TYPE } from '../../constants/index.js';
+import { pick, isFunction, cloneDeep, isObject } from 'lodash-es';
+import { toRaw, h } from 'vue';
+import { HIGHEST_PRIORITY, IHO_TABLE_FIXED_STATUS, WIDGET_TYPE } from '../../constants/index.js';
 import { defineTablePlugin } from '../../hooks/useTablePlugin.js';
 import { IhoTableStatusHelper, IhoTableUtils } from '../../utils/index.js';
+import { getDefaultValue } from '../rendererPlugins/editableWidgets/selectRendererPlugin/selectUtils.js';
 
 function lowCodeFieldAdaptorPlugin() {
   const pluginName = "lowCodeFieldAdaptorPlugin";
@@ -18,25 +19,52 @@ function lowCodeFieldAdaptorPlugin() {
           visible: IhoTableStatusHelper.notNegative(_field.isShow),
           minWidth: _field.colWidth,
           sortable: IhoTableStatusHelper.isPositive(_field.isSort),
-          slots: { ..._field.slots, default: _field.slotFn, header: _field.headerSlotFn },
           title: _field.alias || _field.title,
+          fixed: IHO_TABLE_FIXED_STATUS[_field.isFixed],
           ...pick(_field, ["treeNode", "resizable"])
         };
+        slotsAdaptor(result, _field);
         settingObjAdaptor(result, _field, config);
         return result;
       });
     }
   });
 }
+function slotsAdaptor(fieldItem, lowCodeField) {
+  const slots = {
+    ...lowCodeField.slots,
+    default: lowCodeField.slotFn,
+    header: lowCodeField.headerSlotFn
+  };
+  if (isFunction(lowCodeField.checkEditStatus)) {
+    const { default: defaultSlot } = slots;
+    if (isFunction(defaultSlot)) {
+      slots.default = (payload) => {
+        if (!lowCodeField.checkEditStatus(payload))
+          return [h("span", null, getDefaultValue(payload.row, payload.column.editRender.props))];
+        return defaultSlot(payload);
+      };
+    }
+  }
+  fieldItem.slots = slots;
+}
 function settingObjAdaptor(fieldItem, lowCodeField, config) {
+  var _a, _b;
   const props = cloneDeep(toRaw(lowCodeField));
-  props.componentProps = { size: config.size === "mini" ? "small" : config.size, ...props.componentProps };
+  props.componentProps = {
+    size: config.size === "mini" ? "small" : config.size,
+    options: lowCodeField.options,
+    ...props.componentProps
+  };
   fieldItem.editRender = {
     autofocus: "input",
     name: IhoTableUtils.getCellType(lowCodeField),
     props
   };
   fieldItem.editRender.enabled = !Reflect.get(WIDGET_TYPE, fieldItem.editRender.name);
+  if (isFunction((_a = fieldItem.slots) == null ? void 0 : _a.default)) {
+    fieldItem.editRender.enabled = fieldItem.editRender.enabled && isFunction((_b = fieldItem.slots) == null ? void 0 : _b.edit);
+  }
   if (!isObject(lowCodeField.settingObj))
     return;
   if (Reflect.has(lowCodeField.settingObj, "isHide")) {

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/dateRendererPlugin/index.js

@@ -17,7 +17,7 @@ function dateRendererPlugin() {
           emitFormClick,
           row,
           column,
-          rowIndex
+          $rowIndex
         }) => {
           return [createVNode(EditDate, mergeProps({
             "value": row[column.field],
@@ -25,7 +25,7 @@ function dateRendererPlugin() {
           }, fieldItem.componentProps, {
             "column": column,
             "row": row,
-            "row-index": rowIndex,
+            "row-index": $rowIndex,
             "onClick": emitFormClick
           }), null)];
         })

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/index.js

@@ -1,4 +1,6 @@
 import { createVNode, mergeProps } from 'vue';
+import { findAncestor } from '../../../../../../../shared/utils/index.js';
+import { isObject } from 'lodash-es';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../../constants/index.js';
 import { IhoTableRenderHelper } from '../../../../utils/index.js';
@@ -8,9 +10,24 @@ import { defineTablePlugin } from '../../../../hooks/useTablePlugin.js';
 
 function selectRendererPlugin() {
   const pluginName = "selectRendererPlugin";
+  function isHTMLElement(target) {
+    return isObject(target);
+  }
   return defineTablePlugin({
     name: pluginName,
     vxe(instance) {
+      instance.interceptor.add("event.clearActived", ({
+        $event,
+        column
+      }) => {
+        var _a;
+        if (((_a = column.editRender) == null ? void 0 : _a.name) !== EDITABLE_WIDGET_TYPE.SELECT)
+          return true;
+        const target = $event == null ? void 0 : $event.target;
+        if (!isHTMLElement(target))
+          return true;
+        return !findAncestor(target, (ele) => ele.classList.contains("n-base-select-menu-option-wrapper"));
+      });
       instance.renderer.add(EDITABLE_WIDGET_TYPE.SELECT, {
         renderCell({
           props
@@ -24,12 +41,12 @@ function selectRendererPlugin() {
           emitFormClick,
           row,
           column,
-          rowIndex
+          $rowIndex
         }) => {
           return [createVNode(EditSelect, mergeProps(fieldItem.componentProps, {
             "column": column,
             "row": row,
-            "row-index": rowIndex,
+            "row-index": $rowIndex,
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
             "onClick": emitFormClick

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/selectUtils.js

@@ -1,19 +1,15 @@
 function getDefaultValue(row, item) {
-  var _a;
   const value = row[item.columnName];
   if (Array.isArray(value))
-    return (_a = value.map((v) => getValue(v))) == null ? void 0 : _a.join(",");
+    return value.map((v) => getValue(v)).join(",");
   return getValue(value);
   function getValue(value2) {
-    var _a2, _b;
+    var _a;
     const findValue = (options) => {
-      var _a3;
-      return ((_a3 = options == null ? void 0 : options.find((v) => v.value == value2)) == null ? void 0 : _a3.label) || value2 || "";
+      var _a2;
+      return ((_a2 = options == null ? void 0 : options.find((v) => v.value == value2)) == null ? void 0 : _a2.label) || value2 || "";
     };
-    if (item.formatMap) {
-      return row[(_a2 = item.formatMap) == null ? void 0 : _a2.label];
-    }
-    return findValue(((_b = item.componentProps) == null ? void 0 : _b.options) || []);
+    return findValue(((_a = item.componentProps) == null ? void 0 : _a.options) || []);
   }
 }
 

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/index.js

@@ -129,7 +129,7 @@ function separateRendererPlugins() {
         context.updateTableDataRef();
       });
       hooks.configHooks.editConfig.tap(pluginName, (editConfig = {}, config) => {
-        editConfig.activeMethod = avoidOperationDecorator(editConfig.activeMethod);
+        editConfig.beforeEditMethod = avoidOperationDecorator(editConfig.beforeEditMethod);
         return editConfig;
       });
       hooks.configHooks.checkboxConfig.tap(pluginName, (checkboxConfig = {}, config) => {