Merge branch 'main' of http://192.168.1.22:3000/zcy/canneng-admin

2024-01-18 18:20:01 +08:00
parent d9f5112f81 3b8293d975
commit 343bda8c70
7 changed files with 366 additions and 324 deletions
--- a/src/components/table/fieldRender/index.vue
+++ b/src/components/table/fieldRender/index.vue
@@ -67,10 +67,11 @@
                :class="btn.class"
                class="table-operate"
                :type="btn.type"
+                :loading="props.row.loading || false"
                :disabled="btn.disabled && btn.disabled(row, field)"
                v-bind="btn.attr"
            >
-                <Icon :name="btn.icon" />
+                <Icon v-if="!props.row.loading" :name="btn.icon" />
                <div v-if="btn.text" class="table-operate-text">{{ btn.text }}</div>
            </el-button>