@skyfox2000/webui 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "@skyfox2000/webui",
-   "version": "1.0.13",
+   "version": "1.0.14",
    "description": "后台前端通用组件定义",
    "type": "module",
    "keywords": [],

package/src/components/content/table/index.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { onMounted, Ref, ref, watch, provide, useAttrs, onActivated } from 'vue';
+import { onMounted, Ref, ref, watch, provide, useAttrs, onActivated, computed } from 'vue';
 import { Table, TablePaginationConfig, TableProps } from 'ant-design-vue';
 import {
    gridQueryFind,
@@ -55,6 +55,9 @@ const attrs = useAttrs(); // 手动获取 $attrs
 
 const gridCtrl = props.gridCtrl;
 
+// 响应式获取当前路由路径
+const currentPath = computed(() => AppRouter.currentRoute.value.path);
+
 if (gridCtrl) {
    gridCtrl.pageNo.value = 1;
    gridCtrl.total.value = 0;
@@ -199,7 +202,7 @@ onMounted(async () => {
          <template v-if="gridCtrl && bodyCell?.column?.dataIndex === 'enabled'">
             <Switch
                v-model:checked="bodyCell.record.Enabled"
-               v-auth:disable="{ url: AppRouter.currentRoute.value.path, role: ['Super', 'Admin'], permit: ':enabled' }"
+               v-auth:disable="{ url: currentPath, role: ['Super', 'Admin'], permit: ':enabled' }"
                :disabled="statusDisabled ? statusDisabled(bodyCell.record) : false"
                :data="OPTIONS.EnableDisable"
                @click="gridStatusUpdate(gridCtrl, bodyCell.record)"

package/src/components/content/table/tableOperate.vue

@@ -11,6 +11,7 @@ import {
    AppRouter,
 } from '@skyfox2000/webbase';
 import { ConfigProvider, Button, Space, DropdownButton, Menu, MenuItem, Popconfirm } from 'ant-design-vue';
+import { computed } from 'vue';
 
 const props = defineProps<{
    /**
@@ -25,6 +26,9 @@ const props = defineProps<{
 
 const gridCtrl = props.gridCtrl;
 
+// 响应式获取当前路由路径
+const currentPath = computed(() => AppRouter.currentRoute.value.path);
+
 /// 兼容其它按钮操作参数
 const defaultOperates: ButtonTool[] = [
    {
@@ -96,7 +100,7 @@ const disabled = (item: ButtonTool): boolean => {
                   :danger="item.danger"
                   v-if="getToolVisible(item, props.record)"
                   :disabled="disabled(item)"
-                  v-auth="{ url: AppRouter.currentRoute.value.path, role: item.role, permit: item.permit }"
+                  v-auth="{ url: currentPath, role: item.role, permit: item.permit }"
                   @click="onToolClicked(item, gridCtrl.page, gridCtrl, props.record)"
                   size="small"
                   :style="{
@@ -117,7 +121,7 @@ const disabled = (item: ButtonTool): boolean => {
                         <MenuItem
                            v-if="getToolVisible(item, props.record)"
                            :disabled="disabled(item)"
-                           v-auth="{ url: AppRouter.currentRoute.value.path, role: item.role, permit: item.permit }"
+                           v-auth="{ url: currentPath, role: item.role, permit: item.permit }"
                            @click="onToolClicked(item, gridCtrl.page, gridCtrl, props.record)"
                         >
                            {{ item.label }}

package/src/components/content/toolbar/index.vue

@@ -12,7 +12,7 @@ import {
 import { Dropdown, Menu, MenuItem, Space } from 'ant-design-vue';
 import { Button } from '../../common';
 import IconTool from './icontool.vue';
-import { ref, watch } from 'vue';
+import { ref, watch, computed } from 'vue';
 
 const props = defineProps<{
    /**
@@ -29,6 +29,9 @@ const gridCtrl = props.gridCtrl;
 const pageCtrl = gridCtrl.page;
 const editorCtrl = props.editorCtrl;
 
+// 响应式获取当前路由路径
+const currentPath = computed(() => AppRouter.currentRoute.value.path);
+
 const defaultButtons: ButtonTool[] = [
    {
       key: 'New',
@@ -76,7 +79,7 @@ watch(
             :danger="item.danger"
             :disabled="getToolStatus(item)"
             :icon="item.icon"
-            v-auth="{ url: AppRouter.currentRoute.value.path, role: item.role, permit: item.permit }"
+            v-auth="{ url: currentPath, role: item.role, permit: item.permit }"
             @click="onToolClicked(item, pageCtrl, gridCtrl)"
          >
             {{ item.label }}
@@ -88,7 +91,7 @@ watch(
                      v-for="item in ToolbarMenus"
                      :key="item.key"
                      :disabled="getToolStatus(item)"
-                     v-auth="{ url: AppRouter.currentRoute.value.path, role: item.role, permit: item.permit }"
+                     v-auth="{ url: currentPath, role: item.role, permit: item.permit }"
                      @click="onToolClicked(item, pageCtrl, gridCtrl)"
                   >
                      {{ item.label }}