@ibiz-template/vue3-components 0.7.41-alpha.111 → 0.7.41-alpha.113

package/lib/editor/dropdown-list/ibiz-virtualized-list/ibiz-virtualized-list.cjs

@@ -96,6 +96,10 @@ const IBizVirtualizedList = /* @__PURE__ */ vue.defineComponent({
     const isLoading = vue.ref(false);
     let editorState = "";
     const codeItemValueNumber = vue.ref(false);
+    const {
+      getSelection,
+      getSelectionValue
+    } = runtime.useCodeListSelection(c.allItemsValue);
     const handleTreeNodes = (nodes) => {
       if (nodes.length === 0) {
         return [];
@@ -123,6 +127,20 @@ const IBizVirtualizedList = /* @__PURE__ */ vue.defineComponent({
       });
       return list;
     };
+    const autoSelectFirstOption = () => {
+      const item = items.value[0];
+      if (!c.autoSelectFirstOption || props.value || !item)
+        return;
+      if (c.multiple) {
+        const value = c.allItems && !hasChildren.value ? getSelectionValue(item.value).map((v) => "".concat(v)) : [item.value];
+        emit("change", c.model.valueType === "SIMPLES" ? value : value.join(","), void 0, true);
+      } else if (editorItems && editorItems.length > 0) {
+        emit("change", item.value, editorItems[0].id, true);
+        emit("change", item.text, void 0, true);
+      } else {
+        emit("change", item.value, void 0, true);
+      }
+    };
     const afterLoadCodeList = (codeList) => {
       items.value = [];
       codeListItems.value = [];
@@ -145,6 +163,7 @@ const IBizVirtualizedList = /* @__PURE__ */ vue.defineComponent({
           break;
         }
       }
+      autoSelectFirstOption();
     };
     const loadCodeList = async () => {
       if (c.model.appCodeListId) {
@@ -196,10 +215,6 @@ const IBizVirtualizedList = /* @__PURE__ */ vue.defineComponent({
       const list = hasChildren.value ? codeListItems.value : items.value;
       return list.find((item) => item.value === value);
     };
-    const {
-      getSelection,
-      getSelectionValue
-    } = runtime.useCodeListSelection(c.allItemsValue);
     const curValue = vue.computed({
       get() {
         var _a, _b, _c;

package/lib/editor/list-box/ibiz-list-box/ibiz-list-box.cjs

@@ -66,16 +66,31 @@ const IBizListBox = /* @__PURE__ */ vue.defineComponent({
     });
     const codeList = c.codeList;
     const editorType = editorModel.editorType;
+    const valueSeparator = (codeList == null ? void 0 : codeList.valueSeparator) || ",";
     const items = vue.ref([]);
+    const autoSelectFirstOption = () => {
+      const item = items.value[0];
+      if (!c.autoSelectFirstOption || props.value || !item)
+        return;
+      let value;
+      if (multiple) {
+        const selections = c.allItems ? items.value.filter((_item) => _item.value !== c.allItemsValue).map((_item) => _item.value) : [item.value];
+        value = c.model.valueType === "SIMPLES" ? selections : selections.join(valueSeparator);
+      } else {
+        value = item.value;
+      }
+      emit("change", value, void 0, true);
+    };
     const loadListBoxItems = async () => {
       if (Object.is("LISTBOX", editorType)) {
         const controller = c;
         controller.loadCodeList(props.data).then((_codeList) => {
           if (multiple) {
             items.value = controller.handleCodeListAllItems(_codeList);
-            return;
+          } else {
+            items.value = _codeList;
           }
-          items.value = _codeList;
+          autoSelectFirstOption();
         });
       } else if (Object.is("LISTBOXPICKUP", editorType)) {
         const controller = c;
@@ -86,11 +101,17 @@ const IBizListBox = /* @__PURE__ */ vue.defineComponent({
               value: item[controller.keyName],
               text: item[controller.textName]
             }));
+            autoSelectFirstOption();
           }
         }
       }
     };
-    loadListBoxItems();
+    vue.watch(() => props.data, () => {
+      loadListBoxItems();
+    }, {
+      immediate: true,
+      deep: true
+    });
     const fn = (data) => {
       if (data) {
         if (Object.is("LISTBOX", editorType) && multiple) {
@@ -108,10 +129,6 @@ const IBizListBox = /* @__PURE__ */ vue.defineComponent({
       return "STR";
     });
     const calcOrMode = runtime.useCalcOrMode(currentMode.value, c.model.valueType);
-    let valueSeparator = ",";
-    if (codeList && codeList.valueSeparator) {
-      valueSeparator = codeList.valueSeparator;
-    }
     const {
       getSelection,
       getSelectionValue

package/lib/editor/list-box/list-box-editor.controller.cjs

@@ -19,13 +19,24 @@ class ListBoxEditorController extends runtime.CodeListEditorController {
      * @Date: 2023-05-24 10:55:50
      */
     __publicField(this, "codeList");
+    /**
+     * @description 自动选中第一个
+     * @memberof ListBoxEditorController
+     */
+    __publicField(this, "autoSelectFirstOption", false);
   }
   async onInit() {
+    var _a;
     super.onInit();
     if (this.model.appCodeListId) {
       const app = await ibiz.hub.getApp(this.context.srfappid);
       this.codeList = app.codeList.getCodeList(this.model.appCodeListId);
     }
+    if ((_a = this.editorParams) == null ? void 0 : _a.autoselectfirstoption) {
+      this.autoSelectFirstOption = this.toBoolean(
+        this.editorParams.autoselectfirstoption
+      );
+    }
   }
 }
 

package/lib/editor/list-box/list-box-picker-editor.controller.cjs

@@ -42,9 +42,20 @@ class ListBoxPickerEditorController extends runtime.EditorController {
      * @type {IAcItemProvider}
      */
     __publicField(this, "acItemProvider");
+    /**
+     * @description 自动选中第一个
+     * @memberof ListBoxPickerEditorController
+     */
+    __publicField(this, "autoSelectFirstOption", false);
   }
   async onInit() {
+    var _a;
     super.onInit();
+    if ((_a = this.editorParams) == null ? void 0 : _a.autoselectfirstoption) {
+      this.autoSelectFirstOption = this.toBoolean(
+        this.editorParams.autoselectfirstoption
+      );
+    }
     if (this.model.editorType === "LISTBOXPICKUP") {
       if (this.model.appDEDataSetId) {
         this.interfaceName = this.model.appDEDataSetId;

package/lib/editor/radio-button-list/ibiz-radio/ibiz-radio.cjs

@@ -73,9 +73,16 @@ const IBizRadio = /* @__PURE__ */ vue.defineComponent({
       useInValueChange();
     };
     const items = vue.ref([]);
+    const autoSelectFirstOption = () => {
+      const item = items.value[0];
+      if (!c.autoSelectFirstOption || props.value || !item)
+        return;
+      emit("change", item.value, void 0, true);
+    };
     vue.watch(() => props.data, (newVal) => {
       c.loadCodeList(newVal).then((_codeList) => {
         items.value = _codeList;
+        autoSelectFirstOption();
       });
     }, {
       immediate: true,

package/lib/editor/radio-button-list/radio-button-list.controller.cjs

@@ -19,9 +19,14 @@ class RadioButtonListEditorController extends runtime.CodeListEditorController {
      * @type {(number | undefined)}
      */
     __publicField(this, "rowNumber");
+    /**
+     * @description 自动选中第一个
+     * @memberof RadioButtonListEditorController
+     */
+    __publicField(this, "autoSelectFirstOption", false);
   }
   async onInit() {
-    var _a, _b;
+    var _a, _b, _c;
     super.onInit();
     if ((_a = this.editorParams) == null ? void 0 : _a.rowNumber) {
       this.rowNumber = Number(this.editorParams.rowNumber);
@@ -29,6 +34,11 @@ class RadioButtonListEditorController extends runtime.CodeListEditorController {
     if ((_b = this.editorParams) == null ? void 0 : _b.rownumber) {
       this.rowNumber = Number(this.editorParams.rownumber);
     }
+    if ((_c = this.editorParams) == null ? void 0 : _c.autoselectfirstoption) {
+      this.autoSelectFirstOption = this.toBoolean(
+        this.editorParams.autoselectfirstoption
+      );
+    }
   }
 }
 

package/lib/panel-component/auth-userinfo/auth-userinfo.css

@@ -1 +1 @@
-.ibiz-user-info{--ibiz-user-info-padding:0 var(--ibiz-spacing-loose);--ibiz-user-info-color:var(--ibiz-color-text-0);--ibiz-user-info-font-size:var(--ibiz-font-size-header-5);--ibiz-user-info-height:44px;--ibiz-user-info-collapse-padding:0 var(--ibiz-spacing-base-tight);--ibiz-user-info-avatar-max-width:32px;--ibiz-user-info-avatar-max-height:32px;--ibiz-user-info-avatar-gap:var(--ibiz-spacing-base);--ibiz-user-info-name-max-width:130px;--ibiz-user-info-name-font-size:var(--ibiz-user-info-font-size);--ibiz-user-info-name-person-font-size:var(--ibiz-font-size-small);--ibiz-user-info-name-person-gap:var(--ibiz-spacing-extra-tight);--ibiz-user-info-name-arrow-gap:var(--ibiz-spacing-base-tight);display:flex;align-items:center;justify-content:flex-start;width:100%;height:100%}.ibiz-user-info .el-dropdown{width:100%;height:var(--ibiz-user-info-height);padding:var(--ibiz-user-info-padding);cursor:pointer}.ibiz-user-info__icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-user-info.is-left .ibiz-user-info__down{display:none}.ibiz-user-info.is-top .ibiz-user-info__down{margin-left:var(--ibiz-user-info-name-arrow-gap);font-size:var(--ibiz-user-info-font-size)}.ibiz-user-info.is-top .ibiz-user-info-avatar{max-width:var(--ibiz-user-info-avatar-max-width);max-height:var(--ibiz-user-info-avatar-max-height);margin-right:var(--ibiz-user-info-avatar-gap)}.ibiz-user-info.is-collapse .el-dropdown{padding:0 var(--ibiz-user-info-collapse-padding)}.ibiz-user-info.is-collapse .ibiz-user-info-avatar{max-width:var(--ibiz-user-info-avatar-max-width);max-height:var(--ibiz-user-info-avatar-max-height);margin:0}.ibiz-user-info.is-readonly .el-dropdown{cursor:default}.ibiz-user-info-avatar{width:var(--ibiz-user-info-height);height:var(--ibiz-user-info-height);margin-right:10px}.ibiz-user-info-info{width:100%;display:flex;align-items:center;justify-content:space-between;color:var(--ibiz-user-info-color)}.ibiz-user-info-info.is-collapse{justify-content:center}.ibiz-user-info-name__user-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:var(--ibiz-user-info-name-max-width);font-size:var(--ibiz-user-info-name-font-size);line-height:1.3}.ibiz-user-info-name__person-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:var(--ibiz-user-info-name-max-width);margin-top:var(--ibiz-user-info-name-person-gap);font-size:var(--ibiz-user-info-name-person-font-size);line-height:1.2}.ibiz-user-info-name.is-collapse{display:none}.ibiz-user-info-label{display:flex;align-items:center;justify-content:flex-start;font-size:var(--ibiz-user-info-font-size);color:var(--ibiz-user-info-color);outline:0}
+.ibiz-user-info{--ibiz-user-info-padding:0 var(--ibiz-spacing-loose);--ibiz-user-info-color:var(--ibiz-color-text-0);--ibiz-user-info-font-size:var(--ibiz-font-size-header-5);--ibiz-user-info-height:44px;--ibiz-user-info-collapse-padding:0 var(--ibiz-spacing-base-tight);--ibiz-user-info-avatar-max-width:32px;--ibiz-user-info-avatar-max-height:32px;--ibiz-user-info-avatar-gap:var(--ibiz-spacing-base);--ibiz-user-info-name-max-width:130px;--ibiz-user-info-name-font-size:var(--ibiz-user-info-font-size);--ibiz-user-info-name-person-font-size:var(--ibiz-font-size-small);--ibiz-user-info-name-person-gap:var(--ibiz-spacing-extra-tight);--ibiz-user-info-name-arrow-gap:var(--ibiz-spacing-base-tight);display:flex;align-items:center;justify-content:flex-start;width:100%;height:100%}.ibiz-user-info .el-dropdown{width:100%;height:var(--ibiz-user-info-height);padding:var(--ibiz-user-info-padding);cursor:pointer}.ibiz-user-info__icon{margin-right:var(--ibiz-spacing-extra-tight)}.ibiz-user-info.is-left .ibiz-user-info__down{display:none}.ibiz-user-info.is-top .ibiz-user-info__down{margin-left:var(--ibiz-user-info-name-arrow-gap);font-size:var(--ibiz-user-info-font-size)}.ibiz-user-info.is-top .ibiz-user-info-avatar{max-width:var(--ibiz-user-info-avatar-max-width);max-height:var(--ibiz-user-info-avatar-max-height);margin-right:var(--ibiz-user-info-avatar-gap)}.ibiz-user-info.is-collapse .el-dropdown{padding:var(--ibiz-user-info-collapse-padding)}.ibiz-user-info.is-collapse .ibiz-user-info-avatar{max-width:var(--ibiz-user-info-avatar-max-width);max-height:var(--ibiz-user-info-avatar-max-height);margin:0}.ibiz-user-info.is-readonly .el-dropdown{cursor:default}.ibiz-user-info-avatar{width:var(--ibiz-user-info-height);height:var(--ibiz-user-info-height);margin-right:10px}.ibiz-user-info-info{width:100%;display:flex;align-items:center;justify-content:space-between;color:var(--ibiz-user-info-color)}.ibiz-user-info-info.is-collapse{justify-content:center}.ibiz-user-info-name__user-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:var(--ibiz-user-info-name-max-width);font-size:var(--ibiz-user-info-name-font-size);line-height:1.3}.ibiz-user-info-name__person-name{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:var(--ibiz-user-info-name-max-width);margin-top:var(--ibiz-user-info-name-person-gap);font-size:var(--ibiz-user-info-name-person-font-size);line-height:1.2}.ibiz-user-info-name.is-collapse{display:none}.ibiz-user-info-label{display:flex;align-items:center;justify-content:flex-start;font-size:var(--ibiz-user-info-font-size);color:var(--ibiz-user-info-color);outline:0}

package/lib/util/fullscreen/fullscreen-util.cjs

@@ -2,7 +2,7 @@
 
 var vue = require('vue');
 var ElementPlus = require('element-plus');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.113_axios@1.12.2_lodash-es@4.17.21_qs@6.14.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.41-alpha.117_axios@1.12.2_lodash-es@4.17.21_qs@6.14.0_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 var fullscreenToolbar = require('../../common/fullscreen-toolbar/fullscreen-toolbar.cjs');
 
 "use strict";

package/lib/web-app/adaptive-screen-width.cjs

@@ -53,7 +53,7 @@ const fixContextMenuPosition = (el) => {
     el.style.top = fixedTop;
   }
 };
-const fixFormItemContainerPopperTransform = (el) => {
+const fixPopperTransform = (el) => {
   if (currentScale === 1)
     return;
   const transform = el.style.transform;
@@ -99,8 +99,8 @@ const startObservePoppers = () => {
           const el = node;
           if ((_a2 = el.classList) == null ? void 0 : _a2.contains("el-popper")) {
             fixPopperInset(el);
-            if (el.classList.contains("ibiz-form-item-container__popper")) {
-              fixFormItemContainerPopperTransform(el);
+            if (el.classList.contains("ibiz-form-item-container__popper") || el.classList.contains("ibiz-form-mdctrl-popper")) {
+              fixPopperTransform(el);
             }
           } else if ((_b2 = el.classList) == null ? void 0 : _b2.contains("mx-context-menu")) {
             fixContextMenuPosition(el);
@@ -110,8 +110,8 @@ const startObservePoppers = () => {
         const el = mutation.target;
         if ((_a = el.classList) == null ? void 0 : _a.contains("el-popper")) {
           fixPopperInset(el);
-          if (el.classList.contains("ibiz-form-item-container__popper")) {
-            fixFormItemContainerPopperTransform(el);
+          if (el.classList.contains("ibiz-form-item-container__popper") || el.classList.contains("ibiz-form-mdctrl-popper")) {
+            fixPopperTransform(el);
           }
         } else if ((_b = el.classList) == null ? void 0 : _b.contains("mx-context-menu")) {
           fixContextMenuPosition(el);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ibiz-template/vue3-components",
-  "version": "0.7.41-alpha.111",
+  "version": "0.7.41-alpha.113",
   "description": "web端组件库(vue3)",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -35,14 +35,14 @@
     "@ibiz-template-plugin/gantt": "0.1.8-alpha.468",
     "@ibiz-template-plugin/bi-report": "0.0.32",
     "@ibiz-template-plugin/data-view": "0.0.7",
-    "@ibiz-template/core": "0.7.41-alpha.113",
+    "@ibiz-template/core": "0.7.41-alpha.117",
     "@ibiz-template/devtool": "0.0.16",
-    "@ibiz-template/model-helper": "0.7.41-alpha.116",
-    "@ibiz-template/runtime": "0.7.41-alpha.116",
+    "@ibiz-template/model-helper": "0.7.41-alpha.118",
+    "@ibiz-template/runtime": "0.7.41-alpha.118",
     "@ibiz-template/theme": "0.7.39",
-    "@ibiz-template/vue3-util": "0.7.41-alpha.116",
+    "@ibiz-template/vue3-util": "0.7.41-alpha.118",
     "@ibiz-template/web-theme": "3.16.0",
-    "@ibiz/model-core": "^0.1.88",
+    "@ibiz/model-core": "^0.1.89",
     "@imengyu/vue3-context-menu": "^1.3.5",
     "@monaco-editor/loader": "^1.4.0",
     "@wangeditor/editor": "^5.1.23",
@@ -113,7 +113,7 @@
     "@ibiz-template/runtime": "^0.7.0",
     "@ibiz-template/theme": "^0.7.0",
     "@ibiz-template/vue3-util": "^0.7.0",
-    "@ibiz/model-core": "^0.1.88",
+    "@ibiz/model-core": "^0.1.89",
     "@imengyu/vue3-context-menu": "^1.3.3",
     "@monaco-editor/loader": "^1.3.3",
     "@wangeditor/editor": "^5.1.23",

package/src/common/map-chart/map-chart.tsx

@@ -1,7 +1,7 @@
 /* eslint-disable eqeqeq */
 import { defineComponent, onMounted, PropType, computed } from 'vue';
 import { isNil, mergeDeepWithKey } from 'ramda';
-import { useNamespace, useSemanticNode } from '@ibiz-template/vue3-util';
+import { useNamespace } from '@ibiz-template/vue3-util';
 import { IMapData, MapController } from '@ibiz-template/runtime';
 import { defaultOpts, MapOptions } from './map-chart.util';
 import { useMapManager } from './map-manager';
@@ -27,7 +27,6 @@ export const IBizMapChart = defineComponent({
   },
   setup(props, { emit }) {
     const ns = useNamespace('map-chart');
-    const { semanticClass, semanticStyle } = useSemanticNode(props.controller);
     const options = computed<MapOptions>(() => {
       // 后一个的undefined不覆盖
       return mergeDeepWithKey(
@@ -203,7 +202,7 @@ export const IBizMapChart = defineComponent({
       changeMap(options.value.defaultAreaCode, true);
     });
 
-    return { ns, chartRef, historyNames, semanticClass, semanticStyle, goBack };
+    return { ns, chartRef, historyNames, goBack };
   },
   render() {
     return (
@@ -211,8 +210,7 @@ export const IBizMapChart = defineComponent({
         <div class={this.ns.e('chart')} ref='chartRef'></div>
         {this.historyNames.length > 1 && (
           <div
-            style={this.semanticStyle('goback')}
-            class={[this.ns.e('goback'), this.semanticClass('goback')]}
+            class={this.ns.e('goback')}
             onClick={() => {
               this.goBack();
             }}

package/src/common/map-chart-user/map-chart-user.tsx

@@ -8,7 +8,7 @@ import {
   onBeforeUnmount,
 } from 'vue';
 import { isNil, mergeDeepLeft, mergeDeepWithKey } from 'ramda';
-import { useNamespace, useSemanticNode } from '@ibiz-template/vue3-util';
+import { useNamespace } from '@ibiz-template/vue3-util';
 import {
   IMapData,
   MapController,
@@ -49,7 +49,6 @@ export const IBizMapChartUser = defineComponent({
   },
   setup(props) {
     const ns = useNamespace('map-chart-user');
-    const { semanticClass, semanticStyle } = useSemanticNode(props.controller);
     const c = props.controller;
     let option: IData = defaultOpts;
     const mapRef = ref();
@@ -182,8 +181,6 @@ export const IBizMapChartUser = defineComponent({
       isFull,
       chartRef,
       historyNames,
-      semanticClass,
-      semanticStyle,
       onBack,
       toggleFullScreen,
     };
@@ -196,8 +193,7 @@ export const IBizMapChartUser = defineComponent({
           <el-button
             type='info'
             onClick={this.toggleFullScreen}
-            style={this.semanticStyle('fullscreen')}
-            class={[this.ns.e('fullscreen'), this.semanticClass('fullscreen')]}
+            class={this.ns.e('fullscreen')}
             title={
               this.isFull
                 ? ibiz.i18n.t('app.cancelFullscreen')
@@ -212,8 +208,7 @@ export const IBizMapChartUser = defineComponent({
         <div class={this.ns.e('chart')} ref='chartRef'></div>
         {this.historyNames.length > 1 && (
           <div
-            style={this.semanticStyle('goback')}
-            class={[this.ns.e('goback'), this.semanticClass('goback')]}
+            class={this.ns.e('goback')}
             onClick={() => {
               this.onBack();
             }}

package/src/control/calendar/calendar.tsx

@@ -111,6 +111,22 @@ export const CalendarControl = defineComponent({
     const showDateRange = ref(c.controlParams.showmode === 'daterange');
     const showDateList = ref(c.controlParams.showmode === 'expand');
 
+    // 子类类名透传
+    const childClass = [
+      {
+        class: semanticClass('body'),
+        selector: '.el-calendar__body',
+      },
+    ];
+
+    // 子类样式透传
+    const childStyle = [
+      {
+        style: semanticStyle('body'),
+        selector: '.el-calendar__body',
+      },
+    ];
+
     /**
      * 无限滚动元素
      */
@@ -552,6 +568,8 @@ export const CalendarControl = defineComponent({
       c,
       ns,
       legends,
+      childClass,
+      childStyle,
       semanticClass,
       semanticStyle,
       curPopover,
@@ -729,6 +747,11 @@ export const CalendarControl = defineComponent({
                 this.curPopover = el;
               }
             }}
+            popper-class={[
+              this.semanticClass('popup'),
+              this.ns.be('more', 'popper'),
+            ]}
+            popper-style={this.semanticStyle('popup')}
             onShow={() => {
               this.popoverValue = items[0].id;
             }}
@@ -737,7 +760,8 @@ export const CalendarControl = defineComponent({
               reference: () => {
                 return (
                   <span
-                    class={this.ns.b('more')}
+                    style={this.semanticStyle('more')}
+                    class={[this.ns.b('more'), this.semanticClass('more')]}
                   >{`+${items.length - 1} ${ibiz.i18n.t('app.more')}...`}</span>
                 );
               },
@@ -788,6 +812,8 @@ export const CalendarControl = defineComponent({
             ref='calendarRef'
             v-model={this.c.state.selectedDate}
             class={this.ns.b('month')}
+            v-child-class={this.childClass}
+            v-child-style={this.childStyle}
           >
             {{
               header: ({ date }: { date: string }): VNode => {

package/src/control/calendar/components/calendar-user/calendar-user.tsx

@@ -55,12 +55,17 @@ export const CalendarUser = defineComponent({
           slots.event?.({ data: items[0] }),
           <el-popover
             trigger='click'
-            popper-class={ns.e('custom-user-popover')}
             ref={(el: IData) => {
               if (el && items[0].id === popoverValue.value) {
                 curPopover.value = el;
               }
             }}
+            popper-class={[
+              ns.em('more', 'popper'),
+              ns.e('custom-user-popover'),
+              props.semanticClass('popup'),
+            ]}
+            popper-style={props.semanticStyle('popup')}
             onShow={() => {
               popoverValue.value = items[0].id;
             }}
@@ -69,7 +74,8 @@ export const CalendarUser = defineComponent({
               reference: () => {
                 return (
                   <span
-                    class={ns.e('more')}
+                    style={props.semanticStyle('more')}
+                    class={[ns.e('more'), props.semanticClass('more')]}
                   >{`+${items.length - 1} ${ibiz.i18n.t('app.more')}...`}</span>
                 );
               },

package/src/control/calendar/components/calendar-user2/calendar-user2.tsx

@@ -239,7 +239,11 @@ export const CalendarUser2 = defineComponent({
                         trigger='click'
                         persistent={false}
                         disabled={!marks.length}
-                        popperClass={this.ns.e('popover')}
+                        popper-style={this.semanticStyle('popup')}
+                        popper-class={[
+                          this.ns.e('popover'),
+                          this.semanticClass('popup'),
+                        ]}
                       >
                         {{
                           default: () => {
@@ -277,13 +281,13 @@ export const CalendarUser2 = defineComponent({
                                         class={[
                                           this.ns.e('mark'),
                                           this.ns.e('item'),
-                                          this.semanticClass('item', {
+                                          this.semanticClass('mark', {
                                             item: mark,
                                           }),
                                         ]}
                                         style={{
                                           backgroundColor: mark.bkcolor,
-                                          ...this.semanticStyle('item', {
+                                          ...this.semanticStyle('mark', {
                                             item: mark,
                                           }),
                                         }}

package/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid/repeater-grid.tsx

@@ -178,6 +178,7 @@ export const RepeaterGrid: ReturnType<typeof defineComponent> = defineComponent(
               title={showTitle(
                 ibiz.i18n.t('control.form.repeaterGrid.promptInformation'),
               )}
+              popper-class={['el-popover', ns2.b('popper')]}
               confirm-button-text={ibiz.i18n.t('app.confirm')}
               cancel-button-text={ibiz.i18n.t('app.cancel')}
               onConfirm={() => props.controller.remove(index)}

package/src/control/form/form-detail/form-mdctrl/form-mdctrl-repeater/repeater-grid2/repeater-grid2.tsx

@@ -164,6 +164,7 @@ export const RepeaterGrid2: ReturnType<typeof defineComponent> =
         if (ibiz.config.form.mdCtrlConfirmBeforeRemove) {
           return (
             <el-popconfirm
+              popper-class={['el-popover', ns2.b('popper')]}
               title={ibiz.i18n.t('control.form.repeaterGrid.promptInformation')}
               confirm-button-text={ibiz.i18n.t('app.confirm')}
               cancel-button-text={ibiz.i18n.t('app.cancel')}

package/src/control/grid/grid/grid-control.util.ts

@@ -134,6 +134,7 @@ export function useITableEvent(c: GridController): {
   cleanClick: () => void;
   cleanEnter: () => void;
   cleanTab: () => void;
+  onSelectAll: (selections: ControlVO[]) => void;
 } {
   const tableRef = ref<IData>();
   let forbidChange = false;
@@ -455,6 +456,15 @@ export function useITableEvent(c: GridController): {
   function onSelectionChange(selection: ControlVO[]): void {
     // 选中数据在回显的时候屏蔽值变更事件，否则会递归。
     if (!forbidChange && !c.state.isLoading) c.setSelection(selection);
+    // 设置表格全选状态
+    if (
+      c.state.selectedData.length === c.state.items.length &&
+      c.state.items.length !== 0
+    ) {
+      c.state.isSelectedAll = true;
+    } else {
+      c.state.isSelectedAll = false;
+    }
   }
 
   // element表格选中数据
@@ -615,6 +625,15 @@ export function useITableEvent(c: GridController): {
     },
   );
 
+  // 表格是否全选
+  function onSelectAll(selections: ControlVO[]) {
+    if (selections.length === c.state.items.length) {
+      c.state.isSelectedAll = true;
+    } else {
+      c.state.isSelectedAll = false;
+    }
+  }
+
   return {
     tableRef,
     onRowClick,
@@ -626,6 +645,7 @@ export function useITableEvent(c: GridController): {
     cleanClick,
     cleanEnter,
     cleanTab,
+    onSelectAll,
   };
 }
 

package/src/control/grid/grid/grid.tsx

@@ -453,6 +453,7 @@ export const GridControl = defineComponent({
       cleanClick = NOOP,
       cleanEnter = NOOP,
       cleanTab = NOOP,
+      onSelectAll,
     } = useITableEvent(c);
     const { pageSemantic, onPageChange, onPageRefresh, onPageSizeChange } =
       usePagination(c);
@@ -724,6 +725,7 @@ export const GridControl = defineComponent({
       renderBatchToolBar,
       renderDragIconColumn,
       handleHeaderCellClassName,
+      onSelectAll,
     };
   },
   render() {
@@ -769,6 +771,7 @@ export const GridControl = defineComponent({
               default-sort={this.defaultSort}
               show-summary={this.c.enableAgg}
               onSortChange={this.onSortChange}
+              onSelectAll={this.onSelectAll}
               onRowDblclick={this.onDbRowClick}
               summary-method={this.summaryMethod}
               onHeaderDragend={this.headerDragend}

package/src/control/grid/grid-column/grid-field-column/grid-field-column.scss

@@ -47,13 +47,13 @@ $grid-field-column: (
       flex-shrink: 0;
     }
     .#{bem('grid-field-column', 'script')} {
-      max-height: calc(getCssVar(control-grid, content-row, height) - 2 * getCssVar(grid-field-column, cell-padding));
-      line-height: calc(getCssVar(control-grid, content-row, height) - 2 * getCssVar(grid-field-column, cell-padding));
+      max-height: calc(getCssVar(control-grid, body-row, height) - 2 * getCssVar(grid-field-column, cell-padding));
+      line-height: calc(getCssVar(control-grid, body-row, height) - 2 * getCssVar(grid-field-column, cell-padding));
 
       * {
         margin: 0;
         @include utils-ellipsis;
-    }
+      }
     }
 
     span {