@jetlinks-web/components 2.6.8 → 2.6.10

package/es/EditTable/Body.js

@@ -29,6 +29,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onBeforeUnmount": "setup-const",
   "nextTick": "setup-const",
   "Empty": "setup-const",
+  "CellRender": "setup-const",
   "props": "setup-reactive-const",
   "emit": "setup-const",
   "viewScrollRef": "setup-ref",
@@ -47,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "rowClick": "setup-const",
   "updateSelectedKeys": "setup-const"
 } */
-import { normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, createCommentVNode as _createCommentVNode, withModifiers as _withModifiers, normalizeClass as _normalizeClass, createVNode as _createVNode } from "vue";
+import { normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, createCommentVNode as _createCommentVNode, createBlock as _createBlock, withModifiers as _withModifiers, normalizeClass as _normalizeClass, createVNode as _createVNode } from "vue";
 const _hoisted_1 = { style: { position: 'relative' } };
 const _hoisted_2 = ["data-row-key", "onContextmenu", "onClick"];
 const _hoisted_3 = {
@@ -69,6 +70,7 @@ import { randomString } from "@jetlinks-web/utils";
 import { bodyProps } from "./props";
 import { ref, reactive, computed, watch, onMounted, onBeforeUnmount, nextTick } from 'vue';
 import Empty from '../Empty/Empty.js';
+import CellRender from './CellRender.js';
 const __sfc_main__ = Object.assign({
     name: 'JEditTableBody'
 }, {
@@ -254,7 +256,17 @@ const __sfc_main__ = Object.assign({
                                                             index: item.__dataIndex,
                                                             column: column
                                                         }, () => [
-                                                            _createTextVNode(_toDisplayString(item[column.dataIndex]), 1 /* TEXT */)
+                                                            (column.customRender)
+                                                                ? (_openBlock(), _createBlock(CellRender, {
+                                                                    key: 0,
+                                                                    record: item,
+                                                                    value: item[column.dataIndex],
+                                                                    index: item.__dataIndex,
+                                                                    "render-fn": column.customRender
+                                                                }, null, 8 /* PROPS */, ["record", "value", "index", "render-fn"]))
+                                                                : (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
+                                                                    _createTextVNode(_toDisplayString(item[column.dataIndex]), 1 /* TEXT */)
+                                                                ], 64 /* STABLE_FRAGMENT */))
                                                         ])
                                                     ]))
                                             ], 4 /* STYLE */));

package/es/EditTable/CellRender.js

@@ -0,0 +1,12 @@
+/* Analyzed bindings: {} */
+import { defineComponent } from 'vue';
+const __sfc_main__ = defineComponent({
+    name: "CellRender",
+    props: ['renderFn', 'value', 'record', 'index'],
+    setup(props) {
+        return () => {
+            return props.renderFn(props.value, props.record, props.index);
+        };
+    }
+});
+export default __sfc_main__;

package/es/EditTable/EditTable.js

@@ -15,6 +15,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
     }
 } return value; }
 /* Analyzed bindings: {
+  "searchColumns": "props",
   "serial": "props",
   "validateRowKey": "props",
   "readonly": "props",
@@ -84,6 +85,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "removeFieldError": "setup-const",
   "addFieldError": "setup-const",
   "scrollWidth": "setup-ref",
+  "handleColumns": "setup-const",
   "onResize": "setup-const",
   "onScrollDown": "setup-const",
   "rightMenu": "setup-const",
@@ -117,6 +119,10 @@ const __sfc_main__ = Object.assign({
     props: {
         ...tableProps(),
         ...bodyProps(),
+        searchColumns: {
+            type: Array,
+            default: undefined
+        },
         serial: {
             type: [Object, Boolean],
             default: () => ({
@@ -304,13 +310,7 @@ const __sfc_main__ = Object.assign({
         const scrollWidth = computed(() => {
             return (props.dataSource.length * props.cellHeight) > props.height ? scrollDefaultWidth.value : 0;
         });
-        function onResize({ width = 0 }) {
-            const _width = width - scrollWidth.value;
-            tableStyle.width = width || '100%';
-            // const viewportDom = document.querySelector('.jetlinks-edit-table-body-viewport')
-            // const viewportDivDom = viewportDom.querySelector('div')
-            //
-            // scrollDefaultWidth.value = viewportDom.offsetWidth - viewportDivDom.offsetWidth
+        const handleColumns = () => {
             let newColumns = [...props.columns];
             if (props.serial) {
                 const serial = {
@@ -326,7 +326,16 @@ const __sfc_main__ = Object.assign({
                 };
                 newColumns = [serial, ...props.columns];
             }
-            myColumns.value = handleColumnsWidth(newColumns, _width);
+            myColumns.value = handleColumnsWidth(newColumns, tableStyle.width - scrollWidth.value);
+        };
+        function onResize({ width = 0 }) {
+            const _width = width - scrollWidth.value;
+            tableStyle.width = width || '100%';
+            // const viewportDom = document.querySelector('.jetlinks-edit-table-body-viewport')
+            // const viewportDivDom = viewportDom.querySelector('div')
+            //
+            // scrollDefaultWidth.value = viewportDom.offsetWidth - viewportDivDom.offsetWidth
+            handleColumns();
         }
         const onScrollDown = (len) => {
             emit('scrollDown', len);
@@ -393,6 +402,9 @@ const __sfc_main__ = Object.assign({
         watch(() => scrollWidth.value, () => {
             onResize({ width: tableStyle.width });
         });
+        watch(() => [JSON.stringify(props.columns), tableStyle.width], () => {
+            handleColumns();
+        });
         useFormContext({
             dataSource: computed(() => {
                 return props.dataSource;
@@ -435,8 +447,9 @@ const __sfc_main__ = Object.assign({
                     }, [
                         _createVNode(Header, {
                             columns: myColumns.value,
+                            searchColumns: __props.searchColumns,
                             style: _normalizeStyle({ width: tableStyle.width })
-                        }, null, 8 /* PROPS */, ["columns", "style"])
+                        }, null, 8 /* PROPS */, ["columns", "searchColumns", "style"])
                     ], 4 /* STYLE */),
                     _createElementVNode("div", {
                         class: "jetlinks-edit-table-body",

package/es/EditTable/Header.js

@@ -24,26 +24,30 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "reactive": "setup-const",
   "defineOptions": "setup-const",
   "useTableTool": "setup-maybe-ref",
+  "HeaderItemRender": "setup-const",
   "props": "setup-reactive-const",
   "tableTool": "setup-maybe-ref",
   "searchData": "setup-reactive-const",
   "showFilter": "setup-const",
   "sortClick": "setup-const"
 } */
-import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, createBlock as _createBlock, unref as _unref, mergeProps as _mergeProps, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle } from "vue";
+import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, unref as _unref, mergeProps as _mergeProps, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle } from "vue";
 const _hoisted_1 = ["id"];
 const _hoisted_2 = { class: "table-header-cell-title" };
-const _hoisted_3 = {
+const _hoisted_3 = { class: "cell-title-box" };
+const _hoisted_4 = { key: 1 };
+const _hoisted_5 = {
     key: 0,
     class: "header-cell-required"
 };
-const _hoisted_4 = {
+const _hoisted_6 = {
     key: 0,
     class: "table-header-cell-trigger"
 };
 import { SearchModal, Sort } from './components/Search';
 import { reactive, } from 'vue';
 import { useTableTool } from "./hooks";
+import HeaderItemRender from './HeaderRender.js';
 const __sfc_main__ = Object.assign({
     name: 'JEditTableHeader'
 }, {
@@ -95,13 +99,21 @@ const __sfc_main__ = Object.assign({
                             class: _normalizeClass({ 'jetlinks-edit-table-header-cell-box': true, 'header-cell-box-tool': !!(item.sort || item.filter) })
                         }, [
                             _createElementVNode("div", _hoisted_2, [
-                                _createElementVNode("span", null, _toDisplayString(item.title), 1 /* TEXT */),
+                                _createElementVNode("div", _hoisted_3, [
+                                    (item.render)
+                                        ? (_openBlock(), _createBlock(HeaderItemRender, {
+                                            key: 0,
+                                            "render-fn": item.render,
+                                            value: item.title
+                                        }, null, 8 /* PROPS */, ["render-fn", "value"]))
+                                        : (_openBlock(), _createElementBlock("span", _hoisted_4, _toDisplayString(item.title), 1 /* TEXT */))
+                                ]),
                                 (_optionalChain([item, 'access', _ => _.form, 'optionalAccess', _2 => _2.required]))
-                                    ? (_openBlock(), _createElementBlock("span", _hoisted_3, "*"))
+                                    ? (_openBlock(), _createElementBlock("span", _hoisted_5, "*"))
                                     : _createCommentVNode("v-if", true)
                             ]),
                             (!!(item.sort || item.filter))
-                                ? (_openBlock(), _createElementBlock("div", _hoisted_4, [
+                                ? (_openBlock(), _createElementBlock("div", _hoisted_6, [
                                     (item.filter)
                                         ? (_openBlock(), _createBlock(_component_AIcon, {
                                             key: 0,
@@ -128,10 +140,9 @@ const __sfc_main__ = Object.assign({
                     ? (_openBlock(), _createBlock(_unref(SearchModal), {
                         key: 0,
                         searchKey: searchData.key,
-                        rowKey: _ctx.rowKey,
                         columns: __props.searchColumns,
                         onClose: _cache[0] || (_cache[0] = $event => (searchData.visible = false))
-                    }, null, 8 /* PROPS */, ["searchKey", "rowKey", "columns"]))
+                    }, null, 8 /* PROPS */, ["searchKey", "columns"]))
                     : _createCommentVNode("v-if", true)
             ], 4 /* STYLE */));
         };

package/es/EditTable/HeaderRender.js

@@ -0,0 +1,12 @@
+/* Analyzed bindings: {} */
+import { defineComponent } from 'vue';
+const __sfc_main__ = defineComponent({
+    name: "HeaderItemRender",
+    props: ['renderFn', 'value'],
+    setup(props) {
+        return () => {
+            return props.renderFn(props.value);
+        };
+    }
+});
+export default __sfc_main__;

package/es/EditTable/components/Search/search.js

@@ -23,7 +23,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "useTableTool": "setup-maybe-ref",
   "useGroupOptions": "setup-maybe-ref",
   "ref": "setup-const",
-  "reactive": "setup-const",
+  "computed": "setup-const",
   "defineOptions": "setup-const",
   "Ellipsis": "setup-const",
   "DragModal": "setup-const",
@@ -47,7 +47,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "tableHeight": "setup-ref",
   "selectedRowKeys": "setup-ref",
   "tableRef": "setup-ref",
-  "myColumns": "setup-reactive-const",
+  "myColumns": "setup-ref",
   "selectedTableRow": "setup-const",
   "handleFilterArray": "setup-const",
   "search": "setup-const",
@@ -68,7 +68,7 @@ const _hoisted_6 = { key: 1 };
 const _hoisted_7 = { class: "jetlinks-table-search-result-total" };
 import Table from '../../EditTable.js';
 import { useTableDataSource, useTableOpenGroup, useTableTool, useGroupOptions } from "../../context";
-import { ref, reactive, } from "vue";
+import { ref, computed, } from "vue";
 import Ellipsis from '../../../Ellipsis/Ellipsis.js';
 import DragModal from '../../../DragModal/DragModal.js';
 import { useLocaleReceiver } from "../../../LocaleReciver/index";
@@ -103,16 +103,24 @@ const __sfc_main__ = Object.assign({
         const tableHeight = ref(230);
         const selectedRowKeys = ref([]);
         const tableRef = ref();
-        const myColumns = reactive([
-            {
-                title: contextLocale.value.columns.sign,
-                dataIndex: 'id',
-            },
-            {
-                title: contextLocale.value.columns.name,
-                dataIndex: 'name',
+        const myColumns = computed(() => {
+            if (props.columns) {
+                return props.columns.map(item => ({
+                    title: item.title,
+                    dataIndex: item.dataIndex
+                }));
             }
-        ]);
+            return [
+                {
+                    title: contextLocale.value.columns.sign,
+                    dataIndex: 'id',
+                },
+                {
+                    title: contextLocale.value.columns.name,
+                    dataIndex: 'name',
+                }
+            ];
+        });
         const selectedTableRow = (record) => {
             tableTool.scrollTo({
                 ...record,
@@ -272,7 +280,7 @@ const __sfc_main__ = Object.assign({
                                     ref_key: "tableRef",
                                     ref: tableRef,
                                     "data-source": filterArray.value,
-                                    columns: __props.columns || myColumns,
+                                    columns: myColumns.value,
                                     height: tableHeight.value,
                                     disableMenu: false,
                                     cellHeight: 36,

package/es/EditTable/components/Search/sort.js

@@ -42,7 +42,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onDesc": "setup-const"
 } */
 import { unref as _unref, toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, createTextVNode as _createTextVNode, withCtx as _withCtx, createVNode as _createVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1744360876126"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1744627839929"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "jetlinks-table-sort-content" };
 const _hoisted_2 = { class: "jetlinks-table-sort-title" };
 const _hoisted_3 = { class: "table-sort-body" };

package/es/EditTable/props.js

@@ -38,10 +38,6 @@ export var bodyProps = function bodyProps() {
         return [];
       }
     },
-    searchColumns: {
-      type: Array,
-      default: undefined
-    },
     cellHeight: {
       type: Number,
       default: 50

package/es/EditTable/style/header.less

@@ -26,6 +26,11 @@
         display: flex;
         align-items: center;
         font-weight: 600;
+        gap: 4px;
+
+        .cell-title-box {
+          flex: 1 1 auto;
+        }
       }
 
       .header-cell-required {

package/es/EditTable/style/index.css

@@ -116,6 +116,10 @@
   display: flex;
   align-items: center;
   font-weight: 600;
+  gap: 4px;
+}
+.jetlinks-edit-table-header-container .jetlinks-edit-table-header-cell .jetlinks-edit-table-header-cell-box .table-header-cell-title .cell-title-box {
+  flex: 1 1 auto;
 }
 .jetlinks-edit-table-header-container .jetlinks-edit-table-header-cell .jetlinks-edit-table-header-cell-box .header-cell-required {
   color: #ff4d4f;

package/es/EditTable/utils.js

@@ -1,5 +1,4 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import { omit } from "lodash-es";
+import { cloneDeep, omit } from "lodash-es";
 /**
  * 规则收集器，收集columns中的rules和watch
  * @param columns
@@ -23,7 +22,8 @@ export var handlePureRecord = function handlePureRecord(record) {
   return omit(record, ['__serial', '__index', '__top', '__selected', '__key', '__dataIndex']);
 };
 export var handleColumnsWidth = function handleColumnsWidth(columns, warpWidth) {
-  var newColumns = _toConsumableArray(columns);
+  // let newColumns = [...columns]
+  var newColumns = cloneDeep(columns);
   var noWidthLen = 0; // 没有width属性的长度
   var hasWidthCount = 0; // 有width属性的合计
   var average = 0; // 每个column宽度

package/es/FullPage/FullPage.js

@@ -9,7 +9,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1744360873449"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1744627832838"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref, inject } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/es/PermissionButton/index.js

@@ -55,8 +55,7 @@ var PermissionButton = defineComponent({
       components: undefined
     });
     var permission = computed(function () {
-      var hasOwnPrototype = Object.prototype.hasOwnProperty.call(instance.props, 'hasPermission');
-      if (props.hasPermission === true || !hasOwnPrototype) {
+      if (props.hasPermission === true || props.hasPermission === undefined) {
         return true;
       }
       return hasPerm.value;

package/es/Search/Advanced/SaveHistory.js

@@ -23,7 +23,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1744360875956"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1744627839108"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/es/Search/Item.js

@@ -80,7 +80,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1744360874856"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1744627835608"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/es/style/index.css

@@ -4940,6 +4940,10 @@ span.ant-radio + * {
   display: flex;
   align-items: center;
   font-weight: 600;
+  gap: 4px;
+}
+.jetlinks-edit-table-header-container .jetlinks-edit-table-header-cell .jetlinks-edit-table-header-cell-box .table-header-cell-title .cell-title-box {
+  flex: 1 1 auto;
 }
 .jetlinks-edit-table-header-container .jetlinks-edit-table-header-cell .jetlinks-edit-table-header-cell-box .header-cell-required {
   color: #ff4d4f;

package/lib/EditTable/Body.js

@@ -29,6 +29,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onBeforeUnmount": "setup-const",
   "nextTick": "setup-const",
   "Empty": "setup-const",
+  "CellRender": "setup-const",
   "props": "setup-reactive-const",
   "emit": "setup-const",
   "viewScrollRef": "setup-ref",
@@ -47,7 +48,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "rowClick": "setup-const",
   "updateSelectedKeys": "setup-const"
 } */
-import { normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, createCommentVNode as _createCommentVNode, withModifiers as _withModifiers, normalizeClass as _normalizeClass, createVNode as _createVNode } from "vue";
+import { normalizeStyle as _normalizeStyle, createElementVNode as _createElementVNode, renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, renderSlot as _renderSlot, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, createCommentVNode as _createCommentVNode, createBlock as _createBlock, withModifiers as _withModifiers, normalizeClass as _normalizeClass, createVNode as _createVNode } from "vue";
 const _hoisted_1 = { style: { position: 'relative' } };
 const _hoisted_2 = ["data-row-key", "onContextmenu", "onClick"];
 const _hoisted_3 = {
@@ -69,6 +70,7 @@ import { randomString } from "@jetlinks-web/utils";
 import { bodyProps } from "./props";
 import { ref, reactive, computed, watch, onMounted, onBeforeUnmount, nextTick } from 'vue';
 import Empty from '../Empty/Empty.js';
+import CellRender from './CellRender.js';
 const __sfc_main__ = Object.assign({
     name: 'JEditTableBody'
 }, {
@@ -254,7 +256,17 @@ const __sfc_main__ = Object.assign({
                                                             index: item.__dataIndex,
                                                             column: column
                                                         }, () => [
-                                                            _createTextVNode(_toDisplayString(item[column.dataIndex]), 1 /* TEXT */)
+                                                            (column.customRender)
+                                                                ? (_openBlock(), _createBlock(CellRender, {
+                                                                    key: 0,
+                                                                    record: item,
+                                                                    value: item[column.dataIndex],
+                                                                    index: item.__dataIndex,
+                                                                    "render-fn": column.customRender
+                                                                }, null, 8 /* PROPS */, ["record", "value", "index", "render-fn"]))
+                                                                : (_openBlock(), _createElementBlock(_Fragment, { key: 1 }, [
+                                                                    _createTextVNode(_toDisplayString(item[column.dataIndex]), 1 /* TEXT */)
+                                                                ], 64 /* STABLE_FRAGMENT */))
                                                         ])
                                                     ]))
                                             ], 4 /* STYLE */));

package/lib/EditTable/CellRender.js

@@ -0,0 +1,12 @@
+/* Analyzed bindings: {} */
+import { defineComponent } from 'vue';
+const __sfc_main__ = defineComponent({
+    name: "CellRender",
+    props: ['renderFn', 'value', 'record', 'index'],
+    setup(props) {
+        return () => {
+            return props.renderFn(props.value, props.record, props.index);
+        };
+    }
+});
+export default __sfc_main__;

package/lib/EditTable/EditTable.js

@@ -15,6 +15,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
     }
 } return value; }
 /* Analyzed bindings: {
+  "searchColumns": "props",
   "serial": "props",
   "validateRowKey": "props",
   "readonly": "props",
@@ -84,6 +85,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "removeFieldError": "setup-const",
   "addFieldError": "setup-const",
   "scrollWidth": "setup-ref",
+  "handleColumns": "setup-const",
   "onResize": "setup-const",
   "onScrollDown": "setup-const",
   "rightMenu": "setup-const",
@@ -117,6 +119,10 @@ const __sfc_main__ = Object.assign({
     props: {
         ...tableProps(),
         ...bodyProps(),
+        searchColumns: {
+            type: Array,
+            default: undefined
+        },
         serial: {
             type: [Object, Boolean],
             default: () => ({
@@ -304,13 +310,7 @@ const __sfc_main__ = Object.assign({
         const scrollWidth = computed(() => {
             return (props.dataSource.length * props.cellHeight) > props.height ? scrollDefaultWidth.value : 0;
         });
-        function onResize({ width = 0 }) {
-            const _width = width - scrollWidth.value;
-            tableStyle.width = width || '100%';
-            // const viewportDom = document.querySelector('.jetlinks-edit-table-body-viewport')
-            // const viewportDivDom = viewportDom.querySelector('div')
-            //
-            // scrollDefaultWidth.value = viewportDom.offsetWidth - viewportDivDom.offsetWidth
+        const handleColumns = () => {
             let newColumns = [...props.columns];
             if (props.serial) {
                 const serial = {
@@ -326,7 +326,16 @@ const __sfc_main__ = Object.assign({
                 };
                 newColumns = [serial, ...props.columns];
             }
-            myColumns.value = handleColumnsWidth(newColumns, _width);
+            myColumns.value = handleColumnsWidth(newColumns, tableStyle.width - scrollWidth.value);
+        };
+        function onResize({ width = 0 }) {
+            const _width = width - scrollWidth.value;
+            tableStyle.width = width || '100%';
+            // const viewportDom = document.querySelector('.jetlinks-edit-table-body-viewport')
+            // const viewportDivDom = viewportDom.querySelector('div')
+            //
+            // scrollDefaultWidth.value = viewportDom.offsetWidth - viewportDivDom.offsetWidth
+            handleColumns();
         }
         const onScrollDown = (len) => {
             emit('scrollDown', len);
@@ -393,6 +402,9 @@ const __sfc_main__ = Object.assign({
         watch(() => scrollWidth.value, () => {
             onResize({ width: tableStyle.width });
         });
+        watch(() => [JSON.stringify(props.columns), tableStyle.width], () => {
+            handleColumns();
+        });
         useFormContext({
             dataSource: computed(() => {
                 return props.dataSource;
@@ -435,8 +447,9 @@ const __sfc_main__ = Object.assign({
                     }, [
                         _createVNode(Header, {
                             columns: myColumns.value,
+                            searchColumns: __props.searchColumns,
                             style: _normalizeStyle({ width: tableStyle.width })
-                        }, null, 8 /* PROPS */, ["columns", "style"])
+                        }, null, 8 /* PROPS */, ["columns", "searchColumns", "style"])
                     ], 4 /* STYLE */),
                     _createElementVNode("div", {
                         class: "jetlinks-edit-table-body",

package/lib/EditTable/Header.js

@@ -24,26 +24,30 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "reactive": "setup-const",
   "defineOptions": "setup-const",
   "useTableTool": "setup-maybe-ref",
+  "HeaderItemRender": "setup-const",
   "props": "setup-reactive-const",
   "tableTool": "setup-maybe-ref",
   "searchData": "setup-reactive-const",
   "showFilter": "setup-const",
   "sortClick": "setup-const"
 } */
-import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, createCommentVNode as _createCommentVNode, resolveComponent as _resolveComponent, createBlock as _createBlock, unref as _unref, mergeProps as _mergeProps, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle } from "vue";
+import { renderList as _renderList, Fragment as _Fragment, openBlock as _openBlock, createElementBlock as _createElementBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, unref as _unref, mergeProps as _mergeProps, normalizeClass as _normalizeClass, normalizeStyle as _normalizeStyle } from "vue";
 const _hoisted_1 = ["id"];
 const _hoisted_2 = { class: "table-header-cell-title" };
-const _hoisted_3 = {
+const _hoisted_3 = { class: "cell-title-box" };
+const _hoisted_4 = { key: 1 };
+const _hoisted_5 = {
     key: 0,
     class: "header-cell-required"
 };
-const _hoisted_4 = {
+const _hoisted_6 = {
     key: 0,
     class: "table-header-cell-trigger"
 };
 import { SearchModal, Sort } from './components/Search';
 import { reactive, } from 'vue';
 import { useTableTool } from "./hooks";
+import HeaderItemRender from './HeaderRender.js';
 const __sfc_main__ = Object.assign({
     name: 'JEditTableHeader'
 }, {
@@ -95,13 +99,21 @@ const __sfc_main__ = Object.assign({
                             class: _normalizeClass({ 'jetlinks-edit-table-header-cell-box': true, 'header-cell-box-tool': !!(item.sort || item.filter) })
                         }, [
                             _createElementVNode("div", _hoisted_2, [
-                                _createElementVNode("span", null, _toDisplayString(item.title), 1 /* TEXT */),
+                                _createElementVNode("div", _hoisted_3, [
+                                    (item.render)
+                                        ? (_openBlock(), _createBlock(HeaderItemRender, {
+                                            key: 0,
+                                            "render-fn": item.render,
+                                            value: item.title
+                                        }, null, 8 /* PROPS */, ["render-fn", "value"]))
+                                        : (_openBlock(), _createElementBlock("span", _hoisted_4, _toDisplayString(item.title), 1 /* TEXT */))
+                                ]),
                                 (_optionalChain([item, 'access', _ => _.form, 'optionalAccess', _2 => _2.required]))
-                                    ? (_openBlock(), _createElementBlock("span", _hoisted_3, "*"))
+                                    ? (_openBlock(), _createElementBlock("span", _hoisted_5, "*"))
                                     : _createCommentVNode("v-if", true)
                             ]),
                             (!!(item.sort || item.filter))
-                                ? (_openBlock(), _createElementBlock("div", _hoisted_4, [
+                                ? (_openBlock(), _createElementBlock("div", _hoisted_6, [
                                     (item.filter)
                                         ? (_openBlock(), _createBlock(_component_AIcon, {
                                             key: 0,
@@ -128,10 +140,9 @@ const __sfc_main__ = Object.assign({
                     ? (_openBlock(), _createBlock(_unref(SearchModal), {
                         key: 0,
                         searchKey: searchData.key,
-                        rowKey: _ctx.rowKey,
                         columns: __props.searchColumns,
                         onClose: _cache[0] || (_cache[0] = $event => (searchData.visible = false))
-                    }, null, 8 /* PROPS */, ["searchKey", "rowKey", "columns"]))
+                    }, null, 8 /* PROPS */, ["searchKey", "columns"]))
                     : _createCommentVNode("v-if", true)
             ], 4 /* STYLE */));
         };

package/lib/EditTable/HeaderRender.js

@@ -0,0 +1,12 @@
+/* Analyzed bindings: {} */
+import { defineComponent } from 'vue';
+const __sfc_main__ = defineComponent({
+    name: "HeaderItemRender",
+    props: ['renderFn', 'value'],
+    setup(props) {
+        return () => {
+            return props.renderFn(props.value);
+        };
+    }
+});
+export default __sfc_main__;

package/lib/EditTable/components/Search/search.js

@@ -23,7 +23,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "useTableTool": "setup-maybe-ref",
   "useGroupOptions": "setup-maybe-ref",
   "ref": "setup-const",
-  "reactive": "setup-const",
+  "computed": "setup-const",
   "defineOptions": "setup-const",
   "Ellipsis": "setup-const",
   "DragModal": "setup-const",
@@ -47,7 +47,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "tableHeight": "setup-ref",
   "selectedRowKeys": "setup-ref",
   "tableRef": "setup-ref",
-  "myColumns": "setup-reactive-const",
+  "myColumns": "setup-ref",
   "selectedTableRow": "setup-const",
   "handleFilterArray": "setup-const",
   "search": "setup-const",
@@ -68,7 +68,7 @@ const _hoisted_6 = { key: 1 };
 const _hoisted_7 = { class: "jetlinks-table-search-result-total" };
 import Table from '../../EditTable.js';
 import { useTableDataSource, useTableOpenGroup, useTableTool, useGroupOptions } from "../../context";
-import { ref, reactive, } from "vue";
+import { ref, computed, } from "vue";
 import Ellipsis from '../../../Ellipsis/Ellipsis.js';
 import DragModal from '../../../DragModal/DragModal.js';
 import { useLocaleReceiver } from "../../../LocaleReciver/index";
@@ -103,16 +103,24 @@ const __sfc_main__ = Object.assign({
         const tableHeight = ref(230);
         const selectedRowKeys = ref([]);
         const tableRef = ref();
-        const myColumns = reactive([
-            {
-                title: contextLocale.value.columns.sign,
-                dataIndex: 'id',
-            },
-            {
-                title: contextLocale.value.columns.name,
-                dataIndex: 'name',
+        const myColumns = computed(() => {
+            if (props.columns) {
+                return props.columns.map(item => ({
+                    title: item.title,
+                    dataIndex: item.dataIndex
+                }));
             }
-        ]);
+            return [
+                {
+                    title: contextLocale.value.columns.sign,
+                    dataIndex: 'id',
+                },
+                {
+                    title: contextLocale.value.columns.name,
+                    dataIndex: 'name',
+                }
+            ];
+        });
         const selectedTableRow = (record) => {
             tableTool.scrollTo({
                 ...record,
@@ -272,7 +280,7 @@ const __sfc_main__ = Object.assign({
                                     ref_key: "tableRef",
                                     ref: tableRef,
                                     "data-source": filterArray.value,
-                                    columns: __props.columns || myColumns,
+                                    columns: myColumns.value,
                                     height: tableHeight.value,
                                     disableMenu: false,
                                     cellHeight: 36,

package/lib/EditTable/components/Search/sort.js

@@ -42,7 +42,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
   "onDesc": "setup-const"
 } */
 import { unref as _unref, toDisplayString as _toDisplayString, createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, createTextVNode as _createTextVNode, withCtx as _withCtx, createVNode as _createVNode, normalizeClass as _normalizeClass, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1744360876152"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1744627839975"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "jetlinks-table-sort-content" };
 const _hoisted_2 = { class: "jetlinks-table-sort-title" };
 const _hoisted_3 = { class: "table-sort-body" };

package/lib/EditTable/props.js

@@ -44,10 +44,6 @@ var bodyProps = exports.bodyProps = function bodyProps() {
         return [];
       }
     },
-    searchColumns: {
-      type: Array,
-      default: undefined
-    },
     cellHeight: {
       type: Number,
       default: 50

package/lib/EditTable/style/header.less

@@ -26,6 +26,11 @@
         display: flex;
         align-items: center;
         font-weight: 600;
+        gap: 4px;
+
+        .cell-title-box {
+          flex: 1 1 auto;
+        }
       }
 
       .header-cell-required {

package/lib/EditTable/style/index.css

@@ -116,6 +116,10 @@
   display: flex;
   align-items: center;
   font-weight: 600;
+  gap: 4px;
+}
+.jetlinks-edit-table-header-container .jetlinks-edit-table-header-cell .jetlinks-edit-table-header-cell-box .table-header-cell-title .cell-title-box {
+  flex: 1 1 auto;
 }
 .jetlinks-edit-table-header-container .jetlinks-edit-table-header-cell .jetlinks-edit-table-header-cell-box .header-cell-required {
   color: #ff4d4f;

package/lib/EditTable/utils.js

@@ -1,11 +1,9 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.isFullScreen = exports.handlePureRecord = exports.handleColumnsWidth = exports.collectValidateRules = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodashEs = require("lodash");
 /**
  * 规则收集器，收集columns中的rules和watch
@@ -30,7 +28,8 @@ var handlePureRecord = exports.handlePureRecord = function handlePureRecord(reco
   return (0, _lodashEs.omit)(record, ['__serial', '__index', '__top', '__selected', '__key', '__dataIndex']);
 };
 var handleColumnsWidth = exports.handleColumnsWidth = function handleColumnsWidth(columns, warpWidth) {
-  var newColumns = (0, _toConsumableArray2.default)(columns);
+  // let newColumns = [...columns]
+  var newColumns = (0, _lodashEs.cloneDeep)(columns);
   var noWidthLen = 0; // 没有width属性的长度
   var hasWidthCount = 0; // 有width属性的合计
   var average = 0; // 每个column宽度

package/lib/FullPage/FullPage.js

@@ -9,7 +9,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, renderSlot as _renderSlot, createElementVNode as _createElementVNode, normalizeStyle as _normalizeStyle, openBlock as _openBlock, createElementBlock as _createElementBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1744360873455"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1744627832852"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref, inject } from 'vue';
 import { useElementBounding } from '@vueuse/core';

package/lib/PermissionButton/index.js

@@ -62,8 +62,7 @@ var PermissionButton = (0, _vue.defineComponent)({
       components: undefined
     });
     var permission = (0, _vue.computed)(function () {
-      var hasOwnPrototype = Object.prototype.hasOwnProperty.call(instance.props, 'hasPermission');
-      if (props.hasPermission === true || !hasOwnPrototype) {
+      if (props.hasPermission === true || props.hasPermission === undefined) {
         return true;
       }
       return hasPerm.value;

package/lib/Search/Advanced/SaveHistory.js

@@ -23,7 +23,7 @@
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, createVNode as _createVNode, withCtx as _withCtx, toDisplayString as _toDisplayString, createTextVNode as _createTextVNode, openBlock as _openBlock, createElementBlock as _createElementBlock, createCommentVNode as _createCommentVNode, createBlock as _createBlock, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1744360875938"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1744627839173"), n = n(), _popScopeId(), n);
 const _hoisted_1 = {
     key: 0,
     style: { "width": "240px" }

package/lib/Search/Item.js

@@ -80,7 +80,7 @@ function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]
 } */
 import { defineComponent as _defineComponent } from 'vue';
 import { unref as _unref, openBlock as _openBlock, createBlock as _createBlock, createCommentVNode as _createCommentVNode, toDisplayString as _toDisplayString, createElementBlock as _createElementBlock, createVNode as _createVNode, Fragment as _Fragment, normalizeStyle as _normalizeStyle, mergeProps as _mergeProps, resolveDynamicComponent as _resolveDynamicComponent, withCtx as _withCtx, createElementVNode as _createElementVNode, pushScopeId as _pushScopeId, popScopeId as _popScopeId } from "vue";
-const _withScopeId = n => (_pushScopeId("data-v-1744360874926"), n = n(), _popScopeId(), n);
+const _withScopeId = n => (_pushScopeId("data-v-1744627835796"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/lib/style/index.css

@@ -4940,6 +4940,10 @@ span.ant-radio + * {
   display: flex;
   align-items: center;
   font-weight: 600;
+  gap: 4px;
+}
+.jetlinks-edit-table-header-container .jetlinks-edit-table-header-cell .jetlinks-edit-table-header-cell-box .table-header-cell-title .cell-title-box {
+  flex: 1 1 auto;
 }
 .jetlinks-edit-table-header-container .jetlinks-edit-table-header-cell .jetlinks-edit-table-header-cell-box .header-cell-required {
   color: #ff4d4f;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.6.8",
+  "version": "2.6.10",
   "description": "",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -158,9 +158,9 @@
     "webpack-dev-server": "^4.0.0",
     "webpack-merge": "^5.0.0",
     "webpackbar": "^5.0.2",
-    "@jetlinks-web/utils": "^1.2.8",
+    "@jetlinks-web/constants": "^1.0.9",
     "@jetlinks-web/hooks": "^1.0.25",
-    "@jetlinks-web/constants": "^1.0.9"
+    "@jetlinks-web/utils": "^1.2.9"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",