From 6169d0a2f64771961bfad994b2b7f76a6dffcc73 Mon Sep 17 00:00:00 2001
From: toesbieya <1647775459@qq.com>
Date: Wed, 23 Dec 2020 00:02:35 +0800
Subject: [PATCH] =?UTF-8?q?template=E4=B8=AD=E7=9A=84slot=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BAv-slot=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/Menu/MenuItem.vue               |  4 +-
 .../src/asset/style/cover/element-ui.scss     | 12 ++++
 vue/full/src/component/CollapseCard/index.vue | 10 +--
 .../component/RegionSelector/Tab/index.vue    |  2 +-
 vue/full/src/component/TreeSelect/index.vue   | 62 ++++++++++---------
 .../src/component/form/ValidateInfo/index.vue |  2 +-
 vue/full/src/component/menu/NavMenu/item.vue  |  5 +-
 vue/full/src/globalMethod/Guide/main.vue      |  4 +-
 .../admin/purchase/inbound/detailPage.vue     |  4 +-
 .../view/admin/purchase/order/detailPage.vue  | 28 +++++----
 .../src/view/admin/sell/order/detailPage.vue  | 28 +++++----
 .../view/admin/sell/outbound/detailPage.vue   | 14 ++++-
 .../src/view/admin/system/menu/indexPage.vue  | 20 ++++--
 .../src/view/admin/system/role/EditDialog.vue | 14 +++--
 .../userCenter/component/LoginHistory.vue     |  4 +-
 .../admin/userCenter/component/UserAction.vue | 16 +++--
 .../src/view/admin/userCenter/indexPage.vue   |  4 +-
 17 files changed, 145 insertions(+), 88 deletions(-)

diff --git a/vue/full/element-ui-personal/component/Menu/MenuItem.vue b/vue/full/element-ui-personal/component/Menu/MenuItem.vue
index cbe6fa7..ef8835b 100644
--- a/vue/full/element-ui-personal/component/Menu/MenuItem.vue
+++ b/vue/full/element-ui-personal/component/Menu/MenuItem.vue
@@ -10,9 +10,9 @@
             effect="dark"
             placement="right"
         >
-            <div slot="content">
+            <template v-slot:content>
                 <slot name="title"/>
-            </div>
+            </template>
             <div :style="iconContainerStyle">
                 <slot/>
             </div>
diff --git a/vue/full/src/asset/style/cover/element-ui.scss b/vue/full/src/asset/style/cover/element-ui.scss
index 60203f3..4a11829 100644
--- a/vue/full/src/asset/style/cover/element-ui.scss
+++ b/vue/full/src/asset/style/cover/element-ui.scss
@@ -1,4 +1,16 @@
 // cover some element-ui styles
+.el-alert {
+    &--info.is-light {
+        color: $--color-text-regular;
+        background-color: rgba($--color-primary, .1);
+        border: 1px solid rgba($--color-primary, .5);
+
+        .el-icon-info {
+            color: $--color-primary;
+        }
+    }
+}
+
 .el-backtop {
     border-radius: 0;
 }
diff --git a/vue/full/src/component/CollapseCard/index.vue b/vue/full/src/component/CollapseCard/index.vue
index 2006dae..1e00f7e 100644
--- a/vue/full/src/component/CollapseCard/index.vue
+++ b/vue/full/src/component/CollapseCard/index.vue
@@ -1,9 +1,11 @@
 <template>
     <el-card :class="{collapsed}">
-        <div slot="header" class="clearfix">
-            <slot name="header">{{ header }}</slot>
-            <i class="el-icon-arrow-up collapse-card-icon"/>
-        </div>
+        <template v-slot:header>
+            <div class="clearfix">
+                <slot name="header">{{ header }}</slot>
+                <i class="el-icon-arrow-up collapse-card-icon"/>
+            </div>
+        </template>
         <slot/>
     </el-card>
 </template>
diff --git a/vue/full/src/component/RegionSelector/Tab/index.vue b/vue/full/src/component/RegionSelector/Tab/index.vue
index 2eb21a8..2ade1f7 100644
--- a/vue/full/src/component/RegionSelector/Tab/index.vue
+++ b/vue/full/src/component/RegionSelector/Tab/index.vue
@@ -9,7 +9,7 @@
         @clear="() => $emit('clear')"
         @visible-change="visibleChange"
     >
-        <template slot="empty">
+        <template v-slot:empty>
             <div class="rg-header">
                 <h3>行政区划选择</h3>
 
diff --git a/vue/full/src/component/TreeSelect/index.vue b/vue/full/src/component/TreeSelect/index.vue
index c62edd2..259d89b 100644
--- a/vue/full/src/component/TreeSelect/index.vue
+++ b/vue/full/src/component/TreeSelect/index.vue
@@ -13,36 +13,38 @@
         @change="e => $emit('change',e)"
         @remove-tag="removeTag"
     >
-        <div class="tree-select-container" slot="empty">
-            <el-input
-                ref="search"
-                v-if="filterable && filterMethod"
-                v-model="search"
-                size="mini"
-                clearable
-                @input="onSearch"
-            />
-            <el-tree
-                ref="tree"
-                :data="data"
-                :node-key="nodeKey"
-                :props="props"
-                :show-checkbox="multiple"
-                :default-checked-keys="defaultCheckedKeys"
-                :current-node-key="multiple ? undefined : value"
-                :highlight-current="!multiple"
-                :expand-on-click-node="false"
-                :check-on-click-node="multiple"
-                :filter-node-method="filterMethod"
-                :accordion="accordion"
-                @node-click="nodeClick"
-                @check="check"
-            >
-                <slot slot-scope="{node,data}">
-                    <span :class="{'el-tree-node__label':true,'is-disabled':node.disabled}">{{ node.label }}</span>
-                </slot>
-            </el-tree>
-        </div>
+        <template v-slot:empty>
+            <div class="tree-select-container">
+                <el-input
+                    ref="search"
+                    v-if="filterable && filterMethod"
+                    v-model="search"
+                    size="mini"
+                    clearable
+                    @input="onSearch"
+                />
+                <el-tree
+                    ref="tree"
+                    :data="data"
+                    :node-key="nodeKey"
+                    :props="props"
+                    :show-checkbox="multiple"
+                    :default-checked-keys="defaultCheckedKeys"
+                    :current-node-key="multiple ? undefined : value"
+                    :highlight-current="!multiple"
+                    :expand-on-click-node="false"
+                    :check-on-click-node="multiple"
+                    :filter-node-method="filterMethod"
+                    :accordion="accordion"
+                    @node-click="nodeClick"
+                    @check="check"
+                >
+                    <slot slot-scope="{node,data}">
+                        <span :class="{'el-tree-node__label':true,'is-disabled':node.disabled}">{{ node.label }}</span>
+                    </slot>
+                </el-tree>
+            </div>
+        </template>
     </el-select>
 </template>
 
diff --git a/vue/full/src/component/form/ValidateInfo/index.vue b/vue/full/src/component/form/ValidateInfo/index.vue
index d0c37b3..ff4d40a 100644
--- a/vue/full/src/component/form/ValidateInfo/index.vue
+++ b/vue/full/src/component/form/ValidateInfo/index.vue
@@ -15,7 +15,7 @@
                 <div class="form-validate-info-item-label">{{ i.label }}</div>
             </div>
         </div>
-        <template slot="reference">
+        <template v-slot:reference>
             <span v-show="error.length > 0" class="form-validate-info-ref">
                 <i class="el-icon-circle-close"/>
                 {{ error.length }}
diff --git a/vue/full/src/component/menu/NavMenu/item.vue b/vue/full/src/component/menu/NavMenu/item.vue
index 781e37b..3e26f7d 100644
--- a/vue/full/src/component/menu/NavMenu/item.vue
+++ b/vue/full/src/component/menu/NavMenu/item.vue
@@ -16,7 +16,10 @@ const MenuItemContent = {
             ? title
             : getHighlightContent(h, title, highlight)
 
-        return [<v-icon icon={icon}/>, <span slot="title" class="menu-item-content">{content}</span>]
+        return [
+            <v-icon icon={icon}/>,
+            <span slot="title" class="menu-item-content">{content}</span>
+        ]
     }
 }
 
diff --git a/vue/full/src/globalMethod/Guide/main.vue b/vue/full/src/globalMethod/Guide/main.vue
index 2d261dc..2d313df 100644
--- a/vue/full/src/globalMethod/Guide/main.vue
+++ b/vue/full/src/globalMethod/Guide/main.vue
@@ -22,7 +22,9 @@
                 </div>
             </div>
 
-            <div slot="reference" v-show="showStage" id="guide-stage" :style="stageStyle"/>
+            <template v-slot:reference>
+                <div v-show="showStage" id="guide-stage" :style="stageStyle"/>
+            </template>
         </el-popover>
 
         <div v-if="showStage" id="guide-highlight-element-cover" :style="stageStyle" @click.prevent.stop/>
diff --git a/vue/full/src/view/admin/purchase/inbound/detailPage.vue b/vue/full/src/view/admin/purchase/inbound/detailPage.vue
index dba070e..0829ac7 100644
--- a/vue/full/src/view/admin/purchase/inbound/detailPage.vue
+++ b/vue/full/src/view/admin/purchase/inbound/detailPage.vue
@@ -17,7 +17,9 @@
             <collapse-card ref="base" header="基础信息">
                 <abstract-form-item label="采购订单" prop="pid">
                     <el-input v-if="canSave" :value="form.pid" readonly>
-                        <el-button slot="append" @click="parentDialog=true">选择</el-button>
+                        <template v-slot:append>
+                            <el-button @click="parentDialog=true">选择</el-button>
+                        </template>
                     </el-input>
                     <template v-else>{{ form.pid }}</template>
                 </abstract-form-item>
diff --git a/vue/full/src/view/admin/purchase/order/detailPage.vue b/vue/full/src/view/admin/purchase/order/detailPage.vue
index ea0cebc..0ed8f52 100644
--- a/vue/full/src/view/admin/purchase/order/detailPage.vue
+++ b/vue/full/src/view/admin/purchase/order/detailPage.vue
@@ -17,7 +17,9 @@
             <collapse-card ref="base" header="基础信息">
                 <abstract-form-item label="供应商" prop="sname">
                     <el-input v-if="canSave" :value="form.sname" readonly>
-                        <el-button slot="append" @click="supplierDialog=true">选择</el-button>
+                        <template v-slot:append>
+                            <el-button @click="supplierDialog = true">选择</el-button>
+                        </template>
                     </el-input>
                     <template v-else>{{ form.sname }}</template>
                 </abstract-form-item>
@@ -75,17 +77,19 @@
                             <el-button type="text" @click="() => delSub(row,$index)">删除</el-button>
                         </template>
                     </el-table-column>
-                    <div v-if="canSave" slot="append" class="table-add-btn">
-                        <el-button
-                            plain
-                            type="dashed"
-                            icon="el-icon-plus"
-                            :disabled="!canAddSub"
-                            @click="addSub"
-                        >
-                            添加采购商品
-                        </el-button>
-                    </div>
+                    <template v-if="canSave" v-slot:append>
+                        <div class="table-add-btn">
+                            <el-button
+                                plain
+                                type="dashed"
+                                icon="el-icon-plus"
+                                :disabled="!canAddSub"
+                                @click="addSub"
+                            >
+                                添加采购商品
+                            </el-button>
+                        </div>
+                    </template>
                 </abstract-table>
             </collapse-card>
 
diff --git a/vue/full/src/view/admin/sell/order/detailPage.vue b/vue/full/src/view/admin/sell/order/detailPage.vue
index ab2f8cd..c1e25a4 100644
--- a/vue/full/src/view/admin/sell/order/detailPage.vue
+++ b/vue/full/src/view/admin/sell/order/detailPage.vue
@@ -17,7 +17,9 @@
             <collapse-card ref="base" header="基础信息">
                 <abstract-form-item label="客 户" prop="customerName">
                     <el-input v-if="canSave" :value="form.customerName" readonly>
-                        <el-button slot="append" @click="customerDialog=true">选择</el-button>
+                        <template v-slot:append>
+                            <el-button @click="customerDialog=true">选择</el-button>
+                        </template>
                     </el-input>
                     <template v-else>{{ form.customerName }}</template>
                 </abstract-form-item>
@@ -58,17 +60,19 @@
                             {{ row.remainNum === 0 ? '已全部出库' : '未全部出库' }}
                         </template>
                     </el-table-column>
-                    <div v-if="canSave" slot="append" class="table-add-btn">
-                        <el-button
-                            plain
-                            type="dashed"
-                            icon="el-icon-plus"
-                            :disabled="!canAddSub"
-                            @click="stockDialog=true"
-                        >
-                            添加销售商品
-                        </el-button>
-                    </div>
+                    <template v-if="canSave" v-slot:append>
+                        <div class="table-add-btn">
+                            <el-button
+                                plain
+                                type="dashed"
+                                icon="el-icon-plus"
+                                :disabled="!canAddSub"
+                                @click="stockDialog=true"
+                            >
+                                添加销售商品
+                            </el-button>
+                        </div>
+                    </template>
                 </abstract-table>
             </collapse-card>
 
diff --git a/vue/full/src/view/admin/sell/outbound/detailPage.vue b/vue/full/src/view/admin/sell/outbound/detailPage.vue
index 5ea057d..964170f 100644
--- a/vue/full/src/view/admin/sell/outbound/detailPage.vue
+++ b/vue/full/src/view/admin/sell/outbound/detailPage.vue
@@ -17,7 +17,9 @@
             <collapse-card ref="base" header="基础信息">
                 <abstract-form-item label="销售订单" prop="pid">
                     <el-input v-if="canSave" :value="form.pid" readonly>
-                        <el-button slot="append" @click="parentDialog=true">选择</el-button>
+                        <template v-slot:append>
+                            <el-button @click="parentDialog=true">选择</el-button>
+                        </template>
                     </el-input>
                     <template v-else>{{ form.pid }}</template>
                 </abstract-form-item>
@@ -30,9 +32,15 @@
                                   :summary-method="summaryStock(row)">
                             <el-table-column align="center" label="#" type="index" width="80"/>
                             <el-table-column align="center">
-                                <template slot="header">
+                                <template v-slot:header>
                                     出库数量
-                                    <el-button v-if="canSave" type="text" size="small" @click="openStock(row)">选择库存
+                                    <el-button
+                                        v-if="canSave"
+                                        type="text"
+                                        size="small"
+                                        @click="openStock(row)"
+                                    >
+                                        选择库存
                                     </el-button>
                                 </template>
                                 <template v-slot="d">
diff --git a/vue/full/src/view/admin/system/menu/indexPage.vue b/vue/full/src/view/admin/system/menu/indexPage.vue
index 8b30d08..95dea08 100644
--- a/vue/full/src/view/admin/system/menu/indexPage.vue
+++ b/vue/full/src/view/admin/system/menu/indexPage.vue
@@ -7,17 +7,22 @@
                 <el-button icon="el-icon-plus" size="small" type="primary" @click="addRoot">添加根节点</el-button>
                 <el-button icon="el-icon-plus" size="small" type="primary" @click="addChild">添加子节点</el-button>
             </template>
+
             <el-button v-if="canDel" icon="el-icon-delete" size="small" type="danger" @click="del">删 除</el-button>
+
             <el-dropdown placement="bottom" size="small" @command="more">
                 <el-button plain size="small">
                     更多操作
                     <i class="el-icon-arrow-down el-icon--right"/>
                 </el-button>
-                <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="{action:'expand',level:0}">展开全部</el-dropdown-item>
-                    <el-dropdown-item :command="{action:'collapse',level:0}">收起全部</el-dropdown-item>
-                    <el-dropdown-item :command="{action:'expand',level:1}">仅展开一级</el-dropdown-item>
-                </el-dropdown-menu>
+
+                <template v-slot:dropdown>
+                    <el-dropdown-menu>
+                        <el-dropdown-item :command="{action:'expand',level:0}">展开全部</el-dropdown-item>
+                        <el-dropdown-item :command="{action:'collapse',level:0}">收起全部</el-dropdown-item>
+                        <el-dropdown-item :command="{action:'expand',level:1}">仅展开一级</el-dropdown-item>
+                    </el-dropdown-menu>
+                </template>
             </el-dropdown>
         </el-row>
 
@@ -69,7 +74,10 @@
                             placeholder="请选择类型"
                             @change="typeChange"
                         >
-                            <v-icon slot="prefix" :icon="getNodeInfo({data:form}).icon"/>
+                            <template v-slot:prefix>
+                                <v-icon :icon="getNodeInfo({data:form}).icon"/>
+                            </template>
+
                             <el-option
                                 v-for="{label,value,icon} in nodeType"
                                 :key="value"
diff --git a/vue/full/src/view/admin/system/role/EditDialog.vue b/vue/full/src/view/admin/system/role/EditDialog.vue
index 6c2e0aa..d1baea4 100644
--- a/vue/full/src/view/admin/system/role/EditDialog.vue
+++ b/vue/full/src/view/admin/system/role/EditDialog.vue
@@ -49,12 +49,16 @@
                     权限树操作
                     <i class="el-icon-arrow-up el-icon--right"/>
                 </el-button>
-                <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item :command="{action:'expand',level:0}">展开全部</el-dropdown-item>
-                    <el-dropdown-item :command="{action:'collapse',level:0}">收起全部</el-dropdown-item>
-                    <el-dropdown-item :command="{action:'expand',level:1}">仅展开一级</el-dropdown-item>
-                </el-dropdown-menu>
+
+                <template v-slot:dropdown>
+                    <el-dropdown-menu>
+                        <el-dropdown-item :command="{action:'expand',level:0}">展开全部</el-dropdown-item>
+                        <el-dropdown-item :command="{action:'collapse',level:0}">收起全部</el-dropdown-item>
+                        <el-dropdown-item :command="{action:'expand',level:1}">仅展开一级</el-dropdown-item>
+                    </el-dropdown-menu>
+                </template>
             </el-dropdown>
+
             <el-button plain size="small" @click="closeDialog">取 消</el-button>
             <el-button v-if="canEdit" size="small" type="primary" @click="confirm">确 定</el-button>
         </template>
diff --git a/vue/full/src/view/admin/userCenter/component/LoginHistory.vue b/vue/full/src/view/admin/userCenter/component/LoginHistory.vue
index c3f8b4b..58062cc 100644
--- a/vue/full/src/view/admin/userCenter/component/LoginHistory.vue
+++ b/vue/full/src/view/admin/userCenter/component/LoginHistory.vue
@@ -2,7 +2,9 @@
     <div v-loading="config.loading">
         <abstract-table :data="tableData" :highlight-current-row="false">
             <el-table-column align="center" type="index" width="60">
-                <el-button icon="el-icon-refresh-right" slot="header" style="padding: 0" type="text" @click="search"/>
+                <template v-slot:header>
+                    <el-button icon="el-icon-refresh-right" style="padding: 0" type="text" @click="search"/>
+                </template>
             </el-table-column>
             <el-table-column align="center" label="ip" prop="ip" show-overflow-tooltip/>
             <el-table-column align="center" label="地址" prop="address" show-overflow-tooltip/>
diff --git a/vue/full/src/view/admin/userCenter/component/UserAction.vue b/vue/full/src/view/admin/userCenter/component/UserAction.vue
index 22d3ad0..ea6a3e3 100644
--- a/vue/full/src/view/admin/userCenter/component/UserAction.vue
+++ b/vue/full/src/view/admin/userCenter/component/UserAction.vue
@@ -2,7 +2,9 @@
     <div v-loading="config.loading">
         <abstract-table :data="tableData" :highlight-current-row="false">
             <el-table-column align="center" label="#" type="index" width="60">
-                <el-button icon="el-icon-refresh-right" slot="header" style="padding: 0" type="text" @click="search"/>
+                <template v-slot:header>
+                    <el-button icon="el-icon-refresh-right" style="padding: 0" type="text" @click="search"/>
+                </template>
             </el-table-column>
             <el-table-column align="center" label="ip" prop="ip" show-overflow-tooltip/>
             <el-table-column align="center" label="操作" prop="action" show-overflow-tooltip/>
@@ -12,11 +14,13 @@
             <el-table-column align="center" label="状态" width="80">
                 <template v-slot="{row}">
                     <el-tooltip :disabled="row.success" placement="left">
-                        <div slot="content" style="max-width: 60vw">
-                            <el-scrollbar wrap-class="el-select-dropdown__wrap">
-                                <p>{{ row.error }}</p>
-                            </el-scrollbar>
-                        </div>
+                        <template v-slot:content>
+                            <div style="max-width: 60vw">
+                                <el-scrollbar wrap-class="el-select-dropdown__wrap">
+                                    <p>{{ row.error }}</p>
+                                </el-scrollbar>
+                            </div>
+                        </template>
                         <el-tag :type="row.success ? 'success' : 'danger'" size="small" effect="dark">
                             {{ row.success ? '成功' : '失败' }}
                         </el-tag>
diff --git a/vue/full/src/view/admin/userCenter/indexPage.vue b/vue/full/src/view/admin/userCenter/indexPage.vue
index 365ac7b..179f6c6 100644
--- a/vue/full/src/view/admin/userCenter/indexPage.vue
+++ b/vue/full/src/view/admin/userCenter/indexPage.vue
@@ -8,12 +8,12 @@
             <el-card>
                 <el-tabs v-model="activeTab" stretch>
                     <el-tab-pane v-for="i in tabs" v-once :key="i.label" :name="i.name">
-                        <span slot="label">
+                        <template v-slot:label>
                             {{ i.label }}
                             <el-tooltip :content="i.intro" placement="top">
                                 <i v-if="i.intro" class="el-icon-question" style="color: #4AB7BD"/>
                             </el-tooltip>
-                        </span>
+                        </template>
                     </el-tab-pane>
 
                     <transition mode="out-in" name="el-fade-in-linear">