Merge branch 'main' into pages

src/components/RePureTableBar/src/bar.tsx

@@ -54,7 +54,7 @@ const props = {
 export default defineComponent({
   name: "PureTableBar",
   props,
-  emits: ["refresh"],
+  emits: ["refresh", "fullscreen"],
   setup(props, { emit, slots, attrs }) {
     const size = ref("default");
     const loading = ref(false);
@@ -117,6 +117,11 @@ export default defineComponent({
       toggleRowExpansionAll(props.tableRef.data, isExpandAll.value);
     }
 
+    function onFullscreen() {
+      isFullscreen.value = !isFullscreen.value;
+      emit("fullscreen", isFullscreen.value);
+    }
+
     function toggleRowExpansionAll(data, isExpansion) {
       data.forEach(item => {
         props.tableRef.toggleRowExpansion(item, isExpansion);
@@ -378,7 +383,7 @@ export default defineComponent({
                 class={["w-[16px]", iconClass.value]}
                 icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
                 v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
-                onClick={() => (isFullscreen.value = !isFullscreen.value)}
+                onClick={() => onFullscreen()}
               />
             </div>
           </div>

src/components/ReVxeTableBar/src/bar.tsx

@@ -52,7 +52,7 @@ const props = {
 export default defineComponent({
   name: "VxeTableBar",
   props,
-  emits: ["refresh"],
+  emits: ["refresh", "fullscreen"],
   setup(props, { emit, slots, attrs }) {
     const size = ref("small");
     const loading = ref(false);
@@ -113,6 +113,11 @@ export default defineComponent({
       props.vxeTableRef.refreshColumn();
     }
 
+    function onFullscreen() {
+      isFullscreen.value = !isFullscreen.value;
+      emit("fullscreen", isFullscreen.value);
+    }
+
     function reloadColumn() {
       const curCheckedColumns = cloneDeep(dynamicColumns.value).filter(item =>
         checkedColumns.value.includes(item.title)
@@ -369,7 +374,7 @@ export default defineComponent({
                 class={["w-[16px]", iconClass.value]}
                 icon={isFullscreen.value ? ExitFullscreen : Fullscreen}
                 v-tippy={isFullscreen.value ? "退出全屏" : "全屏"}
-                onClick={() => (isFullscreen.value = !isFullscreen.value)}
+                onClick={() => onFullscreen()}
               />
             </div>
           </div>

src/views/system/dept/index.vue

@@ -26,6 +26,11 @@ const {
   handleDelete,
   handleSelectionChange
 } = useDept();
+
+function onFullscreen() {
+  // 重置表格高度
+  tableRef.value.setAdaptive();
+}
 </script>
 
 <template>
@@ -75,6 +80,7 @@ const {
       :columns="columns"
       :tableRef="tableRef?.getTableRef()"
       @refresh="onSearch"
+      @fullscreen="onFullscreen"
     >
       <template #buttons>
         <el-button

src/views/system/menu/index.vue

@@ -27,6 +27,11 @@ const {
   handleDelete,
   handleSelectionChange
 } = useMenu();
+
+function onFullscreen() {
+  // 重置表格高度
+  tableRef.value.setAdaptive();
+}
 </script>
 
 <template>
@@ -66,6 +71,7 @@ const {
       :isExpandAll="false"
       :tableRef="tableRef?.getTableRef()"
       @refresh="onSearch"
+      @fullscreen="onFullscreen"
     >
       <template #buttons>
         <el-button

src/views/system/user/tree.vue

@@ -96,7 +96,7 @@ defineExpose({ onTreeReset });
 <template>
   <div
     v-loading="treeLoading"
-    class="h-full bg-bg_color overflow-auto"
+    class="h-full bg-bg_color overflow-hidden relative"
     :style="{ minHeight: `calc(100vh - 141px)` }"
   >
     <div class="flex items-center h-[34px]">
@@ -151,54 +151,56 @@ defineExpose({ onTreeReset });
       </el-dropdown>
     </div>
     <el-divider />
-    <el-tree
+    <el-scrollbar height="calc(90vh - 88px)">
-      ref="treeRef"
+      <el-tree
-      :data="treeData"
+        ref="treeRef"
-      node-key="id"
+        :data="treeData"
-      size="small"
+        node-key="id"
-      :props="defaultProps"
+        size="small"
-      default-expand-all
+        :props="defaultProps"
-      :expand-on-click-node="false"
+        default-expand-all
-      :filter-node-method="filterNode"
+        :expand-on-click-node="false"
-      @node-click="nodeClick"
+        :filter-node-method="filterNode"
-    >
+        @node-click="nodeClick"
-      <template #default="{ node, data }">
+      >
-        <span
+        <template #default="{ node, data }">
-          :class="[
+          <div
-            'pl-1',
+            :class="[
-            'pr-1',
+              'rounded',
-            'rounded',
+              'flex',
-            'flex',
+              'items-center',
-            'items-center',
+              'select-none',
-            'select-none',
+              'hover:text-primary',
-            'hover:text-primary',
+              searchValue.trim().length > 0 &&
-            searchValue.trim().length > 0 &&
+                node.label.includes(searchValue) &&
-              node.label.includes(searchValue) &&
+                'text-red-500',
-              'text-red-500',
+              highlightMap[node.id]?.highlight ? 'dark:text-primary' : ''
-            highlightMap[node.id]?.highlight ? 'dark:text-primary' : ''
+            ]"
-          ]"
+            :style="{
-          :style="{
+              color: highlightMap[node.id]?.highlight
-            color: highlightMap[node.id]?.highlight
+                ? 'var(--el-color-primary)'
-              ? 'var(--el-color-primary)'
+                : '',
-              : '',
+              background: highlightMap[node.id]?.highlight
-            background: highlightMap[node.id]?.highlight
+                ? 'var(--el-color-primary-light-7)'
-              ? 'var(--el-color-primary-light-7)'
+                : 'transparent'
-              : 'transparent'
+            }"
-          }"
+          >
-        >
+            <IconifyIconOffline
-          <IconifyIconOffline
+              :icon="
-            :icon="
+                data.type === 1
-              data.type === 1
+                  ? OfficeBuilding
-                ? OfficeBuilding
+                  : data.type === 2
-                : data.type === 2
+                    ? LocationCompany
-                  ? LocationCompany
+                    : Dept
-                  : Dept
+              "
-            "
+            />
-          />
+            <span class="!w-[120px] !truncate" :title="node.label">
-          {{ node.label }}
+              {{ node.label }}
-        </span>
+            </span>
-      </template>
+          </div>
-    </el-tree>
+        </template>
+      </el-tree>
+    </el-scrollbar>
   </div>
 </template>
 

src/views/table/high/header/columns.tsx

@@ -1,6 +1,6 @@
 import { tableData } from "../data";
 import { ref, onMounted } from "vue";
-import { clone, delay } from "@pureadmin/utils";
+import { clone } from "@pureadmin/utils";
 
 export function useColumns() {
   const dataList = ref([]);
@@ -38,14 +38,8 @@ export function useColumns() {
   }
 
   onMounted(() => {
-    delay(600).then(() => {
+    clone(tableData, true).forEach((item, index) => {
-      const newList = [];
+      dataList.value.push({ id: index, ...item });
-      Array.from({ length: 6 }).forEach(() => {
-        newList.push(clone(tableData, true));
-      });
-      newList.flat(Infinity).forEach((item, index) => {
-        dataList.value.push({ id: index, ...item });
-      });
     });
   });