@neatui/vue 2.7.3 → 2.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@neatui/vue",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "basic component ui",
   "main": "./src/index.ts",
   "license": "MIT",
@@ -20,15 +20,14 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@fekit/floor": "^2.2.2",
-    "@fekit/follow": "^1.4.0",
+    "@fekit/floor": "^3.0.1",
+    "@fekit/follow": "^1.7.0",
     "@fekit/itable": "^1.1.6",
     "@fekit/pullload": "^1.3.5",
     "@fekit/scale": "^2.0.1",
     "@fekit/scrollto": "^3.0.3",
     "@fekit/toast": "^2.7.2",
-    "@fekit/url": "^2.0.1",
-    "@fekit/utils": "^2.16.1",
+    "@fekit/utils": "^3.1.0",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@vue/compiler-sfc": "^3.4.30",

package/src/components/loader/TableLoader/TableLoader.vue

@@ -10,10 +10,10 @@
           <template v-for="(col, idx) in state.table" :key="idx">
             <th v-if="!col.__close" :min-width="col.fixed" :col-fixed="col.fixed" :col-fixed-side="col.fixed || 'l'" :data-field="col.field">
               <slot :name="`thead-${col.field}`" :col="col" :idx="idx">
-                <div v-bind="{ ...col.attrs, ...col.thead }">
+                <div v-bind="col.thead">
                   <span class="nl-xs ux-none" v-if="col.order === 0 || col.order === 1 || col.order === 2" @click="fSetOrder(col)">
                     <span>{{ col.label }}</span>
-                    <span ui-btn="@a none s" :ui-order="col.__order"></span>
+                    <span ui-btn="@a none s :square" :ui-order="col.__order"></span>
                   </span>
                   <span class="nl-xs" v-else>{{ col.label }}</span>
                   <!-- 设置 -->
@@ -152,7 +152,7 @@
   import { IFollowView, Icon } from '../../basic';
   import { itable } from '@fekit/itable';
   import TableColView from './TableColView.vue';
-  import { isFunction, isObject, deepcopy } from '@fekit/utils';
+  import { isFunction, isObject, hasOwnProp, deepcopy } from '@fekit/utils';
   const route = useRoute();
   const router = useRouter();
   // 外部插槽
@@ -211,7 +211,7 @@
     limit: computed(() => {
       const _cache = JSON.parse(localStorage.getItem(`${state.name}_limit`) || '{}');
       return (props.limit || [])?.map((item: any) => {
-        if (_cache[item.field] && Object.prototype.hasOwnProperty.call(_cache[item.field], '__close')) {
+        if (_cache[item.field] && hasOwnProp(_cache[item.field], '__close')) {
           item.__close = _cache[item.field]?.__close;
         } else {
           if (item.close === true || item.close === 1 || item.close === 'always') {
@@ -257,21 +257,18 @@
       state.table = deepcopy(props.table || [])
         ?.map((col: any, idx: number) => {
           // 表头属性处理
-          if (!col.thead) {
-            col.thead = {};
+          col.thead ??= {};
+          col.thead.class = (col.thead.class || '').split(/\s+/);
+          if (!col.thead.class.some((c: any) => c === 'wrap' || c === 'nowrap')) {
+            col.thead.class.push('nowrap');
           }
-          // 表头默认样式
-          const _thc = (col.thead.class || '').split(/\s+/);
-          if (!_thc.includes('wrap') && !_thc.includes('nowrap')) {
-            _thc.push('nowrap');
+          // 如果没有以 fs- 开头的类，就加 fs-xs
+          if (!col.thead.class.some((c: string) => /^fs-/.test(c))) {
+            col.thead.class.push('fs-xs');
           }
-          if (!_thc.some((c: any) => c.startsWith('fs-'))) {
-            _thc.unshift('fs-xs');
-          }
-          col.thead.class = _thc.join(' ').trim();
 
           // 缓存的显示信息
-          if (_cache[col.field] && Object.prototype.hasOwnProperty.call(_cache[col.field], '__close')) {
+          if (_cache[col.field] && hasOwnProp(_cache[col.field], '__close')) {
             col.__close = _cache[col.field]?.__close;
           } else {
             if (col.close === true || col.close === 1 || col.close === 'always') {
@@ -279,12 +276,12 @@
             }
           }
           // 获取缓存的表格列顺序（注意不是数据记录的排序）
-          if (_cache[col.field] && Object.prototype.hasOwnProperty.call(_cache[col.field], '_sort')) {
+          if (_cache[col.field] && hasOwnProp(_cache[col.field], '_sort')) {
             col._sort = _cache[col.field]?._sort;
           }
 
           // 获取本地存储的字段升降序（注意不是表格列的顺序）
-          if (col.order === 0 || col.order === 1 || col.order === 2 || (_cache[col.field] && Object.prototype.hasOwnProperty.call(_cache[col.field], '__order'))) {
+          if (col.order === 0 || col.order === 1 || col.order === 2 || (_cache[col.field] && hasOwnProp(_cache[col.field], '__order'))) {
             col.__order = _cache[col.field]?.__order || col.order;
           }
 
@@ -316,10 +313,10 @@
       state._last = 0;
       state.table.forEach((col: any, idx: number) => {
         _table[col.field] = { _sort: idx };
-        if (Object.prototype.hasOwnProperty.call(col, '__close')) {
+        if (hasOwnProp(col, '__close')) {
           _table[col.field].__close = col.__close ? 1 : 0;
         }
-        if (Object.prototype.hasOwnProperty.call(col, '__order')) {
+        if (hasOwnProp(col, '__order')) {
           _table[col.field].__order = col.__order;
         }
         if (!col.__close) {