@peng_kai/kit 0.3.0-beta.24 → 0.3.0-beta.25

package/admin/components/filter/src/FilterReset.vue

@@ -48,14 +48,13 @@ function reset() {
 const tableColumns = inject('tableColumns', props.tableColumns) as TableColumnsType<any>;
 const tableColumnsConfig = inject('tableColumnsConfig') as Ref<ColumnConfig[]>;
 function openTableSettingModal() {
-  // const tableColumns = props.tableColumns?.map((x: any) => ({
-  //   ...x,
-  //   title: typeof x.title === 'string' ? x.title : x.dataIndex || '',
-  // })) || [];
 
-  if (!tableColumns || !tableColumnsConfig) return;
+  if (!tableColumns) return;
 
-  TableSettingModal.open({ tableColumns, tableColumnsConfig } as any)?.then((res) => {
+  TableSettingModal.open({
+    tableColumns,
+    tableColumnsConfig: tableColumnsConfig.value || []
+   } as any)?.then((res) => {
     TableSettingModal.close();
     if (res) {
       tableColumnsConfig.value = res;
@@ -80,13 +79,13 @@ onTtaTimeZone(() => {
       <Button :disabled="loading" @click="reset()">
         重置
       </Button>
-      <Dropdown trigger="click" placement="bottomRight">
+      <Dropdown trigger="click" placement="bottomRight" >
         <Button class="px-1 w-8">
           <i class="i-si:more-square-horiz-fill scale-130 transform-origin-bottom-center" />
         </Button>
         <template #overlay>
           <Menu>
-            <MenuItem v-if="tableColumns && tableColumnsConfig" @click="openTableSettingModal">
+            <MenuItem v-if="tableColumns" @click="openTableSettingModal">
               设置表格
             </MenuItem>
           </Menu>

package/admin/components/filter/src/more/TableSetting.vue

@@ -79,13 +79,13 @@ defineExpose({
         <div v-for="(col, i) in columnsConfig" :key="col.dataIndex" :index="i"
           class="flex items-center gap-2 p-2 select-none">
           <div 
-            class="drag-handler flex items-center  justify-center p-1 -m-2 mr-auto"
-            :class="{ 'pointer-events-none !cursor-no-drop': col.fixed }"
+            class="drag-handler flex items-center  justify-center p-1 -m-2 "
+            :class="{ '!pointer-events-none !cursor-no-drop': col.fixed }"
           >
             <i class="i-material-symbols:drag-indicator" :class="{ 'op-0': col.fixed }" />&nbsp;
-            <span>{{ col.title }}</span>
           </div>
-          <RadioGroup v-model:value="columnsShowValue[col.dataIndex]" :options="columnsShowOptions[col.dataIndex]"
+          <span>{{ col.title }}</span>
+          <RadioGroup class="ml-auto" v-model:value="columnsShowValue[col.dataIndex]" :options="columnsShowOptions[col.dataIndex]"
             optionType="button" buttonStyle="solid" size="small" />
           <!-- <Select v-model:value="columnsShowValue[col.dataIndex]" :options="columnsShowOptions[col.dataIndex]" /> -->
         </div>

package/admin/components/provider/admin-router.ts

@@ -82,7 +82,7 @@ function useTab(router: ShallowRef<Router | null>, options: TOptions = {}) {
     const lastTime = Date.now();
     const isReplaced = history.state?.replaced;
     const tabType = Number(history.state?.tabType ?? 1); // 0:不新增 tab, 1:新增 tab, 2: 固定 tab（不可关闭）
-
+    
     // 0. 刷新页面
     if (toTab && toTab?.path === fromTab?.path) {
       const components = to.matched[1].components as Record<string, any>;
@@ -155,7 +155,7 @@ function useTab(router: ShallowRef<Router | null>, options: TOptions = {}) {
         const compName = currentTab.value?.path;
 
         if (mainComp && compName)
-          mainComp.__name = compName;
+          mainComp.__name = to.fullPath;
       }
     });
   });

package/admin/layout/large/Content.vue

@@ -5,18 +5,13 @@ import { KeepAlive, type KeepAliveProps } from 'vue';
 const props = defineProps<{
   cached: KeepAliveProps['include']
 }>();
-
-function side(comp: any) {
-  console.log('🤡 / side / comp:', comp)
-  return comp;
-}
 </script>
 
 <template>
   <RouterView #default="{ Component }">
     <KeepAlive :include="props.cached">
       <Suspense>
-        <component :is="Component" :key="$route.fullPath" />
+        <component :is="Component" :key="(Component as any).type?.__name" />
         <template #fallback>
           <div class="flex justify-center items-center h-full">
             <div class="flex items-center">

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@peng_kai/kit",
   "type": "module",
-  "version": "0.3.0-beta.24",
+  "version": "0.3.0-beta.25",
   "description": "",
   "author": "",
   "license": "ISC",