chore: 🔨 合并冲突解决

2024-11-16 23:00:30 +08:00
parent 2dd4421fdf
commit 711e3ba5f4
48 changed files with 207 additions and 791 deletions
--- a/src/views/demo/table-select/index.vue
+++ b/src/views/demo/table-select/index.vue
@@ -36,11 +36,7 @@ const text = computed(() => {
    >
      示例源码 请点击>>>>
    </el-link>
-    <table-select
-      :text="text"
-      :select-config="selectConfig"
-      @confirm-click="handleConfirm"
-    >
+    <table-select :text="text" :select-config="selectConfig" @confirm-click="handleConfirm">
      <template #status="scope">
        <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
          {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}