From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期三, 13 十二月 2023 09:01:52 +0800 Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance --- src/views/system/user/profile/thirdParty.vue | 39 +++++++++++++++++++-------------------- 1 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/views/system/user/profile/thirdParty.vue b/src/views/system/user/profile/thirdParty.vue index 4170894..7cdbea9 100644 --- a/src/views/system/user/profile/thirdParty.vue +++ b/src/views/system/user/profile/thirdParty.vue @@ -4,14 +4,14 @@ <el-table-column label="搴忓彿" width="50" type="index"></el-table-column> <el-table-column label="缁戝畾璐﹀彿骞冲彴" width="140" align="center" prop="source" show-overflow-tooltip /> <el-table-column label="澶村儚" width="120" align="center" prop="avatar"> - <template v-slot="scope"> + <template #default="scope"> <img :src="scope.row.avatar" style="width: 45px; height: 45px" /> </template> </el-table-column> <el-table-column label="绯荤粺璐﹀彿" width="180" align="center" prop="userName" :show-overflow-tooltip="true" /> <el-table-column label="缁戝畾鏃堕棿" width="180" align="center" prop="createTime" /> <el-table-column label="鎿嶄綔" width="80" align="center" class-name="small-padding fixed-width"> - <template v-slot="scope"> + <template #default="scope"> <el-button size="small" type="text" @click="unlockAuth(scope.row)">瑙g粦</el-button> </template> </el-table-column> @@ -20,25 +20,25 @@ <div id="git-user-binding"> <h4 class="provider-desc">浣犲彲浠ョ粦瀹氫互涓嬬涓夋柟甯愬彿</h4> <div id="authlist" class="user-bind"> - <a class="third-app" href="#" @click="authUrl('wechat');" title="浣跨敤 寰俊 璐﹀彿鎺堟潈鐧诲綍"> + <a class="third-app" href="#" title="浣跨敤 寰俊 璐﹀彿鎺堟潈鐧诲綍" @click="authUrl('wechat')"> <div class="git-other-login-icon"> <svg-icon icon-class="wechat" /> </div> <span class="app-name">WeiXin</span> </a> - <a class="third-app" href="#" @click="authUrl('maxkey');" title="浣跨敤 MaxKey 璐﹀彿鎺堟潈鐧诲綍"> + <a class="third-app" href="#" title="浣跨敤 MaxKey 璐﹀彿鎺堟潈鐧诲綍" @click="authUrl('maxkey')"> <div class="git-other-login-icon"> <svg-icon icon-class="maxkey" /> </div> <span class="app-name">MaxKey</span> </a> - <a class="third-app" href="#" @click="authUrl('gitee');" title="浣跨敤 Gitee 璐﹀彿鎺堟潈鐧诲綍"> + <a class="third-app" href="#" title="浣跨敤 Gitee 璐﹀彿鎺堟潈鐧诲綍" @click="authUrl('gitee')"> <div class="git-other-login-icon"> <svg-icon icon-class="gitee" /> </div> <span class="app-name">Gitee</span> </a> - <a class="third-app" href="#" @click="authUrl('github');" title="浣跨敤 GitHub 璐﹀彿鎺堟潈鐧诲綍"> + <a class="third-app" href="#" title="浣跨敤 GitHub 璐﹀彿鎺堟潈鐧诲綍" @click="authUrl('github')"> <div class="git-other-login-icon"> <svg-icon icon-class="github" /> </div> @@ -50,31 +50,32 @@ </template> <script lang="ts" setup> -import { authUnlock, authBinding } from "@/api/system/social/auth"; -import { PropType } from "vue"; +import { authUnlock, authBinding } from '@/api/system/social/auth'; +import { PropType } from 'vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const props = defineProps({ auths: { - type: Object as PropType<any>, + type: Object as PropType<any> } }); const auths = computed(() => props.auths); - const unlockAuth = (row: any) => { ElMessageBox.confirm('鎮ㄧ‘瀹氳瑙i櫎"' + row.source + '"鐨勮处鍙风粦瀹氬悧锛�') .then(() => { return authUnlock(row.id); - }).then((res: any) => { + }) + .then((res: any) => { if (res.code === 200) { - proxy?.$modal.msgSuccess("瑙g粦鎴愬姛"); + proxy?.$modal.msgSuccess('瑙g粦鎴愬姛'); proxy?.$tab.refreshPage(); } else { proxy?.$modal.msgError(res.msg); } - }).catch(() => { }); + }) + .catch(() => {}); }; const authUrl = (source: string) => { @@ -111,7 +112,7 @@ margin-top: 10px; } -.git-other-login-icon>img { +.git-other-login-icon > img { height: 32px; } @@ -122,15 +123,13 @@ } .provider-desc { - font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, - "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Liberation Sans", - "PingFang SC", "Microsoft YaHei", "Hiragino Sans GB", "Wenquanyi Micro Hei", - "WenQuanYi Zen Hei", "ST Heiti", SimHei, SimSun, "WenQuanYi Zen Hei Sharp", - sans-serif; + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', + 'Liberation Sans', 'PingFang SC', 'Microsoft YaHei', 'Hiragino Sans GB', 'Wenquanyi Micro Hei', 'WenQuanYi Zen Hei', 'ST Heiti', SimHei, SimSun, + 'WenQuanYi Zen Hei Sharp', sans-serif; font-size: 1.071rem; } -td>img { +td > img { height: 20px; width: 20px; display: inline-block; -- Gitblit v1.9.3