From 9a643d435f3f4e89a89f27d6e655c4abb53ac02a Mon Sep 17 00:00:00 2001
From: icssoa <615206459@qq.com>
Date: Mon, 21 Jun 2021 22:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20upload=20=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/cool/modules/test/components/about.vue   | 79 --------------------
 src/cool/modules/test/components/index.ts    |  7 --
 src/cool/modules/test/directives/index.ts    | 13 ----
 src/cool/modules/test/index.ts               | 19 -----
 src/cool/modules/test/pages/about.vue        |  3 -
 src/cool/modules/test/pages/index.ts         |  8 --
 src/cool/modules/test/service/index.ts       |  5 --
 src/cool/modules/test/service/test.ts        | 19 -----
 src/cool/modules/test/store/calc.ts          | 13 ----
 src/cool/modules/test/store/index.ts         |  7 --
 src/cool/modules/test/views/about.vue        |  3 -
 src/cool/modules/test/views/index.ts         | 12 ---
 src/cool/modules/upload/components/index.vue |  5 +-
 13 files changed, 2 insertions(+), 191 deletions(-)
 delete mode 100644 src/cool/modules/test/components/about.vue
 delete mode 100644 src/cool/modules/test/components/index.ts
 delete mode 100644 src/cool/modules/test/directives/index.ts
 delete mode 100644 src/cool/modules/test/index.ts
 delete mode 100644 src/cool/modules/test/pages/about.vue
 delete mode 100644 src/cool/modules/test/pages/index.ts
 delete mode 100644 src/cool/modules/test/service/index.ts
 delete mode 100644 src/cool/modules/test/service/test.ts
 delete mode 100644 src/cool/modules/test/store/calc.ts
 delete mode 100644 src/cool/modules/test/store/index.ts
 delete mode 100644 src/cool/modules/test/views/about.vue
 delete mode 100644 src/cool/modules/test/views/index.ts

diff --git a/src/cool/modules/test/components/about.vue b/src/cool/modules/test/components/about.vue
deleted file mode 100644
index 40d3044..0000000
--- a/src/cool/modules/test/components/about.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-	<div class="module-view">
-		<a href="https://cool-js.com/" target="blank">
-			<img src="https://admin.cool-js.com/logo.png" width="200" alt="cool-admin Logo" />
-		</a>
-
-		<p class="title">COOL-ADMIN 一个很酷的后台权限管理框架</p>
-		<p class="desc">开源免费可商用、快速开发、模块化、插件化</p>
-
-		<p class="tag">
-			<img
-				src="https://img.shields.io/badge/license-MIT-green?style=flat-square"
-				alt="GitHub license"
-			/>
-			<img
-				src="https://img.shields.io/github/package-json/v/cool-team-official/cool-admin-vue?style=flat-square"
-				alt="GitHub tag"
-			/>
-			<img
-				src="https://img.shields.io/github/last-commit/cool-team-official/cool-admin-vue?style=flat-square"
-				alt="GitHub tag"
-			/>
-		</p>
-
-		<div class="link">
-			<a href="https://cool-js.com/" target="blank">
-				<el-button type="primary" round>快速开始</el-button>
-			</a>
-
-			<a href="https://github.com/cool-team-official/cool-admin-vue" target="blank">
-				<el-button round>GitHub</el-button>
-			</a>
-		</div>
-	</div>
-</template>
-
-<script lang="ts">
-import { defineComponent } from "vue";
-
-export default defineComponent({
-	name: "cl-about"
-});
-</script>
-
-<style lang="scss" scoped>
-.module-view {
-	text-align: center;
-	background-color: #fff;
-	padding: 100px 20px;
-	overflow: auto;
-	box-sizing: border-box;
-
-	.title {
-		font-size: 36px;
-		font-weight: bold;
-		margin: 30px 0 10px 0;
-	}
-
-	.desc {
-		color: #6a8bad;
-		font-size: 22px;
-		margin-bottom: 20px;
-	}
-
-	.tag {
-		img {
-			margin: 0 3px;
-		}
-	}
-
-	.link {
-		margin-top: 30px;
-
-		a {
-			margin: 0 10px;
-		}
-	}
-}
-</style>
diff --git a/src/cool/modules/test/components/index.ts b/src/cool/modules/test/components/index.ts
deleted file mode 100644
index 9e37562..0000000
--- a/src/cool/modules/test/components/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import About from "./about.vue";
-
-export default {
-	About
-};
-
-// 导出的组件会以 name 参数命名全局注册，当前为: cl-about
diff --git a/src/cool/modules/test/directives/index.ts b/src/cool/modules/test/directives/index.ts
deleted file mode 100644
index 08dd2c8..0000000
--- a/src/cool/modules/test/directives/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// 参考官方例子 https://v3.vuejs.org/guide/custom-directive.html
-
-export default {
-	// 聚焦元素
-	focus: {
-		mounted(el) {
-			el.focus();
-		}
-	}
-};
-
-// 在模块中使用
-// <input v-focus />
diff --git a/src/cool/modules/test/index.ts b/src/cool/modules/test/index.ts
deleted file mode 100644
index 9684a62..0000000
--- a/src/cool/modules/test/index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import components from "./components";
-import directives from "./directives";
-import pages from "./pages";
-import service from "./service";
-import store from "./store";
-import views from "./views";
-
-export default {
-	install() {
-		return {
-			components,
-			directives,
-			pages,
-			service,
-			store,
-			views
-		};
-	}
-};
diff --git a/src/cool/modules/test/pages/about.vue b/src/cool/modules/test/pages/about.vue
deleted file mode 100644
index 364bb4c..0000000
--- a/src/cool/modules/test/pages/about.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-	<cl-about />
-</template>
diff --git a/src/cool/modules/test/pages/index.ts b/src/cool/modules/test/pages/index.ts
deleted file mode 100644
index cdbbf0c..0000000
--- a/src/cool/modules/test/pages/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-// 导出的列表会自动注册到路由中
-
-export default [
-	{
-		path: "/test-pages/about", // 路由地址
-		component: () => import("./about.vue") // 组件实例
-	}
-];
diff --git a/src/cool/modules/test/service/index.ts b/src/cool/modules/test/service/index.ts
deleted file mode 100644
index bd271d2..0000000
--- a/src/cool/modules/test/service/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import Test from "./test";
-
-export default {
-	test: new Test()
-};
diff --git a/src/cool/modules/test/service/test.ts b/src/cool/modules/test/service/test.ts
deleted file mode 100644
index 22adc01..0000000
--- a/src/cool/modules/test/service/test.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { BaseService, Service, Permission } from "/@/core";
-
-@Service("test")
-class Test extends BaseService {
-	// 继承后可使用：page、list、add、delete、update、info 6个基本接口
-
-	// 添加其他接口
-	@Permission("batchAdd") // 是否需要权限控制，建议参数与请求地址保持一致
-	batchAdd(params: any): Promise<any> {
-		return this.request({
-			url: "/batchAdd",
-			method: "GET",
-			params
-			// 参数与 axios 一致
-		});
-	}
-}
-
-export default Test;
diff --git a/src/cool/modules/test/store/calc.ts b/src/cool/modules/test/store/calc.ts
deleted file mode 100644
index 7be1bf2..0000000
--- a/src/cool/modules/test/store/calc.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// 参考官方例子 https://vuex.vuejs.org/zh/
-
-export default {
-	state: {
-		count: 0
-	},
-	mutations: {
-		increment(state: any) {
-			state.count++;
-		}
-	},
-	actions: {}
-};
diff --git a/src/cool/modules/test/store/index.ts b/src/cool/modules/test/store/index.ts
deleted file mode 100644
index 9513ead..0000000
--- a/src/cool/modules/test/store/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import calc from "./calc";
-
-export default {
-	calc
-};
-
-// 导出后会以 模块名-calc 命名注册
diff --git a/src/cool/modules/test/views/about.vue b/src/cool/modules/test/views/about.vue
deleted file mode 100644
index 364bb4c..0000000
--- a/src/cool/modules/test/views/about.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-	<cl-about />
-</template>
diff --git a/src/cool/modules/test/views/index.ts b/src/cool/modules/test/views/index.ts
deleted file mode 100644
index ed088e4..0000000
--- a/src/cool/modules/test/views/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// 导出的列表会自动注册到 "/" 子路由中
-
-export default [
-	{
-		path: "/test-views/about", // 路由地址
-		component: () => import("./about.vue"), // 组件实例
-		meta: {
-			keepAlive: true, // 是否缓存路由
-			label: "关于 cool-admin" // 路由名称
-		}
-	}
-];
diff --git a/src/cool/modules/upload/components/index.vue b/src/cool/modules/upload/components/index.vue
index af5f9d0..0100256 100644
--- a/src/cool/modules/upload/components/index.vue
+++ b/src/cool/modules/upload/components/index.vue
@@ -108,9 +108,8 @@
 
 <script>
 import { mapGetters } from "vuex";
-import { last, isArray, isNumber, isBoolean, basename } from "/@/core/utils";
+import { clone, last, isArray, isNumber, isBoolean, basename } from "/@/core/utils";
 import { v4 as uuidv4 } from "uuid";
-import { clone } from "/@/core/utils";
 
 export default {
 	name: "cl-upload",
@@ -223,7 +222,7 @@ export default {
 		},
 
 		_text() {
-			return this.text || this.conf.text || "选择文件";
+			return this.text === undefined ? this.conf.text : this.text;
 		},
 
 		_accept() {