From 7fe49081312b5b9f6fa67711ccc88a89bf95594c Mon Sep 17 00:00:00 2001
From: zhaojinfeng <121016171@qq.com>
Date: Fri, 21 Jul 2023 04:30:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bin/build.ts                          | 18 ++++++++++++++----
 ejs/index.esm.ts.ejs                  |  8 ++++----
 ejs/index.umd.ts.ejs                  |  8 ++++----
 packages/upload-single-file/index.vue |  9 +++++++--
 packages/upload-table/index.vue       |  9 ++++++---
 types/components.d.ts                 |  8 --------
 vite.config.ts                        |  6 +++---
 7 files changed, 38 insertions(+), 28 deletions(-)

diff --git a/bin/build.ts b/bin/build.ts
index 24fc669..8d3e277 100644
--- a/bin/build.ts
+++ b/bin/build.ts
@@ -2,8 +2,8 @@
  * @Author: zhaojinfeng 121016171@qq.com
  * @Date: 2023-06-19 10:38:07
  * @LastEditors: zhaojinfeng 121016171@qq.com
- * @LastEditTime: 2023-06-20 16:41:47
- * @FilePath: \tianheng-design\bin\build.ts
+ * @LastEditTime: 2023-07-21 04:26:58
+ * @FilePath: \vue3\bin\build.ts
  * @Description:
  *
  */
@@ -42,15 +42,25 @@ function buildAComponent(name: string) {
   })
 }
 
+function dirPathToName(dirPath: string) {
+  let component = ''
+
+  dirPath.split('-').forEach((name) => {
+    const first = name[0]
+    component += first.toUpperCase() + name.slice(1)
+  })
+  return component
+}
+
 async function renderDTSwithESM(dir: string[]) {
-  const text = await renderFile(resolve(process.cwd(), './ejs/index.esm.ts.ejs'), { dir })
+  const text = await renderFile(resolve(process.cwd(), './ejs/index.esm.ts.ejs'), { dir, dirPathToName })
   return Promise.all([
     outputFile(resolve(process.cwd(), './es/index.mjs'), text),
     outputFile(resolve(process.cwd(), './es/index.d.ts'), text),
   ])
 }
 async function renderDTSwithUMD(dir: string[]) {
-  const text = await renderFile(resolve(process.cwd(), './ejs/index.umd.ts.ejs'), { dir })
+  const text = await renderFile(resolve(process.cwd(), './ejs/index.umd.ts.ejs'), { dir, dirPathToName })
   return Promise.all([
     outputFile(resolve(process.cwd(), './lib/index.d.ts'), text),
   ])
diff --git a/ejs/index.esm.ts.ejs b/ejs/index.esm.ts.ejs
index 39f13c3..606c371 100644
--- a/ejs/index.esm.ts.ejs
+++ b/ejs/index.esm.ts.ejs
@@ -1,9 +1,9 @@
-<% dir.forEach(name => { -%>
-import <%- name %> from './<%- name %>/index.vue';
+<% dir.forEach(dirPath => { -%>
+import <%- dirPathToName(dirPath) %> from './<%- dirPath %>/index.vue';
 <% }) -%>
 
 export {
-<% dir.forEach((name, index) => { -%>
-  <%- name %><% if (dir.length>index+1) { %>,<% } %>
+<% dir.forEach((dirPath, index) => { -%>
+  <%- dirPathToName(dirPath) %><% if (dir.length>index+1) { %>,<% } %>
 <% }) -%>
 }
diff --git a/ejs/index.umd.ts.ejs b/ejs/index.umd.ts.ejs
index c8b1eea..a4dd4b1 100644
--- a/ejs/index.umd.ts.ejs
+++ b/ejs/index.umd.ts.ejs
@@ -2,12 +2,12 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-<% dir.forEach(name => { -%>
-var <%- name %> = require('./<%- name %>/index.js');
+<% dir.forEach(dirPath => { -%>
+var <%- dirPathToName(dirPath) %> = require('./<%- dirPath %>/index.js');
 <% }) -%>
 var Components = [
-<% dir.forEach(name => { -%>
-  <%- name %>,
+<% dir.forEach(dirPath => { -%>
+  <%- dirPathToName(dirPath) %>,
 <% }) -%>
 ]
 
diff --git a/packages/upload-single-file/index.vue b/packages/upload-single-file/index.vue
index 93c48c8..9be5f57 100644
--- a/packages/upload-single-file/index.vue
+++ b/packages/upload-single-file/index.vue
@@ -2,14 +2,17 @@
  * @Author: zhaojinfeng 121016171@qq.com
  * @Date: 2023-07-21 00:37:46
  * @LastEditors: zhaojinfeng 121016171@qq.com
- * @LastEditTime: 2023-07-21 03:31:04
+ * @LastEditTime: 2023-07-21 04:02:43
  * @FilePath: \vue3\packages\upload-single-file\index.vue
  * @Description:
  *
 -->
 <template>
   <div v-loading="loading" @click="startUpload">
-    <slot :loading="loading">
+    <slot v-if="modelValue" name="download" :loading="loading">
+      <DownloadLink :src="modelValue" :file-name="fileName" />
+    </slot>
+    <slot v-else name="upload" :loading="loading">
       <el-button type="primary" plain :text="text">
         点击上传
       </el-button>
@@ -18,6 +21,8 @@
 </template>
 
 <script lang="ts" setup name="ThUploadSingleFile">
+import DownloadLink from '../download-link/index.vue'
+
 const props = withDefaults(defineProps<{
   /** 文件id */
   modelValue?: string | number
diff --git a/packages/upload-table/index.vue b/packages/upload-table/index.vue
index 2a2c13d..4459668 100644
--- a/packages/upload-table/index.vue
+++ b/packages/upload-table/index.vue
@@ -14,10 +14,10 @@
       </el-table-column>
       <el-table-column align="center" :label="label2">
         <template #default="{ row, $index }">
-          <download-link v-if="row.createdBy" :src="row" :file-name="row.name">
+          <DownloadLink v-if="row.createdBy" :src="row" :file-name="row.name">
             {{ row.name }}
-          </download-link>
-          <upload-single-file
+          </DownloadLink>
+          <UploadSingleFile
             v-else
             :accept="accept"
             :auto-upload="allLoading[`${row.id}`]"
@@ -66,6 +66,9 @@
 </template>
 
 <script lang="ts" setup name="ThUploadTable">
+import DownloadLink from '../download-link/index.vue'
+import UploadSingleFile from '../upload-single-file/index.vue'
+
 const props = withDefaults(defineProps<{
   /** 上传格式 */
   accept?: string
diff --git a/types/components.d.ts b/types/components.d.ts
index 9dad37e..6c84b28 100644
--- a/types/components.d.ts
+++ b/types/components.d.ts
@@ -13,12 +13,7 @@ declare module 'vue' {
     ElCol: typeof import('element-plus/es')['ElCol']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElInput: typeof import('element-plus/es')['ElInput']
-    ElLink: typeof import('element-plus/es')['ElLink']
-    ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
     ElRow: typeof import('element-plus/es')['ElRow']
-    ElTable: typeof import('element-plus/es')['ElTable']
-    ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     Header: typeof import('./../packages/header/index.vue')['default']
     PreviewOffice: typeof import('./../packages/preview-office/index.vue')['default']
     PreviewOfficeView: typeof import('./../packages/preview-office-view/index.vue')['default']
@@ -29,7 +24,4 @@ declare module 'vue' {
     UploadSingleFile: typeof import('./../packages/upload-single-file/index.vue')['default']
     UploadTable: typeof import('./../packages/upload-table/index.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }
diff --git a/vite.config.ts b/vite.config.ts
index b5f3068..319a007 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -2,7 +2,7 @@
  * @Author: zhaojinfeng 121016171@qq.com
  * @Date: 2023-06-15 13:22:04
  * @LastEditors: zhaojinfeng 121016171@qq.com
- * @LastEditTime: 2023-07-20 13:05:21
+ * @LastEditTime: 2023-07-21 04:29:57
  * @FilePath: \vue3\vite.config.ts
  * @Description:
  *
@@ -11,7 +11,7 @@ import { URL, fileURLToPath } from 'node:url'
 import { defineConfig } from 'vite'
 import vue from '@vitejs/plugin-vue'
 import vueJsx from '@vitejs/plugin-vue-jsx'
-import libCss from 'vite-plugin-libcss'
+// import libCss from 'vite-plugin-libcss'
 import AutoImport from 'unplugin-auto-import/vite'
 import eslint from 'vite-plugin-eslint'
 import Components from 'unplugin-vue-components/vite'
@@ -40,7 +40,7 @@ export default defineConfig({
   plugins: [
     vue({ reactivityTransform: true }),
     vueJsx(),
-    libCss({}),
+    // libCss({}),
     AutoImport({
       resolvers: [
         ElementPlusResolver(),