@jetlinks-web/components 2.6.8 → 2.6.9

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",
@@ -117,6 +118,10 @@ const __sfc_main__ = Object.assign({
     props: {
         ...tableProps(),
         ...bodyProps(),
+        searchColumns: {
+            type: Array,
+            default: undefined
+        },
         serial: {
             type: [Object, Boolean],
             default: () => ({
@@ -435,8 +440,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

@@ -128,10 +128,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/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-1744361871270"), 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/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-1744361869037"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref, inject } from 'vue';
 import { useElementBounding } from '@vueuse/core';

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-1744361871107"), 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-1744361870452"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

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",
@@ -117,6 +118,10 @@ const __sfc_main__ = Object.assign({
     props: {
         ...tableProps(),
         ...bodyProps(),
+        searchColumns: {
+            type: Array,
+            default: undefined
+        },
         serial: {
             type: [Object, Boolean],
             default: () => ({
@@ -435,8 +440,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

@@ -128,10 +128,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/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-1744361871288"), 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/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-1744361869027"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "full-page-warp-content" };
 import { ref, inject } from 'vue';
 import { useElementBounding } from '@vueuse/core';

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-1744361871121"), 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-1744361870525"), n = n(), _popScopeId(), n);
 const _hoisted_1 = { class: "JSearch-item" };
 const _hoisted_2 = {
     key: 0,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "2.6.8",
+  "version": "2.6.9",
   "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.8"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",