From 0d3a8b23879eee9f8e772ed491b6c2010f3241ba Mon Sep 17 00:00:00 2001
From: zhaojinfeng <121016171@qq.com>
Date: Thu, 13 Jul 2023 13:06:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=BB=84=E4=BB=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 utils/resolver.js  | 21 +++++++++++++--------
 utils/resolver.mjs | 19 ++++++++++++-------
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/utils/resolver.js b/utils/resolver.js
index 442fd89..c598058 100644
--- a/utils/resolver.js
+++ b/utils/resolver.js
@@ -2,7 +2,7 @@
  * @Author: zhaojinfeng 121016171@qq.com
  * @Date: 2023-06-25 10:56:32
  * @LastEditors: zhaojinfeng 121016171@qq.com
- * @LastEditTime: 2023-07-13 12:47:21
+ * @LastEditTime: 2023-07-13 13:05:09
  * @FilePath: \uni\utils\resolver.js
  * @Description: 自动导入组件的解析器
  *
@@ -12,21 +12,26 @@ const reg = /[A-Z]/
 function toLower(name) {
   let lower = ''
   for (let i = 0; i <= name.length - 1; i++) {
-    if (reg.test(name[i]))
+    if (i === 0) {
+      lower += name[i].toLowerCase()
+      continue
+    }
+    if (reg.test(name[i])) {
       lower += `-${name[i].toLowerCase()}`
-    else
-      lower += name[i]
+      continue
+    }
+    lower += name[i]
   }
   return lower
 }
 
 module.exports.resolverThzxcx = function (name) {
   if (name.startsWith('Th')) {
-    const componentName = toLower(name.slice(2))
+    const componentName = toLower(name.slice(2)).slice(1)
     return {
       name: 'default',
       as: name,
-      from: `@thzxcx/uni/packages/th${componentName}/index.vue`,
+      from: `@thzxcx/uni/packages/${componentName}/index.vue`,
     }
   }
 }
@@ -36,7 +41,7 @@ module.exports.resolverThorUi = function (name) {
     return {
       name: 'default',
       as: name,
-      from: `thorui-uni/lib/thorui/tui${componentName}/tui${componentName}.vue`,
+      from: `thorui-uni/lib/thorui/tui-${componentName}/tui${componentName}.vue`,
     }
   }
 }
@@ -47,7 +52,7 @@ module.exports.resolverUniUi = function (name) {
     return {
       name: 'default',
       as: name,
-      from: `@dcloudio/uni-ui/lib/uni${componentName}/uni${componentName}.vue`,
+      from: `@dcloudio/uni-ui/lib/uni-${componentName}/uni${componentName}.vue`,
     }
   }
 }
diff --git a/utils/resolver.mjs b/utils/resolver.mjs
index 55534e5..c7643f3 100644
--- a/utils/resolver.mjs
+++ b/utils/resolver.mjs
@@ -2,7 +2,7 @@
  * @Author: zhaojinfeng 121016171@qq.com
  * @Date: 2023-06-25 10:56:32
  * @LastEditors: zhaojinfeng 121016171@qq.com
- * @LastEditTime: 2023-07-13 12:52:10
+ * @LastEditTime: 2023-07-13 13:06:00
  * @FilePath: \uni\utils\resolver.mjs
  * @Description: 自动导入组件的解析器
  *
@@ -12,10 +12,15 @@ const reg = /[A-Z]/
 function toLower(name) {
   let lower = ''
   for (let i = 0; i <= name.length - 1; i++) {
-    if (reg.test(name[i]))
+    if (i === 0) {
+      lower += name[i].toLowerCase()
+      continue
+    }
+    if (reg.test(name[i])) {
       lower += `-${name[i].toLowerCase()}`
-    else
-      lower += name[i]
+      continue
+    }
+    lower += name[i]
   }
   return lower
 }
@@ -26,7 +31,7 @@ export function resolverThzxcx(name) {
     return {
       name: 'default',
       as: name,
-      from: `@thzxcx/uni/packages/th${componentName}/index.vue`,
+      from: `@thzxcx/uni/packages/${componentName}/index.vue`,
     }
   }
 }
@@ -37,7 +42,7 @@ export function resolverThorUi(name) {
     return {
       name: 'default',
       as: name,
-      from: `thorui-uni/lib/thorui/tui${componentName}/tui${componentName}.vue`,
+      from: `thorui-uni/lib/thorui/tui-${componentName}/tui${componentName}.vue`,
     }
   }
 }
@@ -48,7 +53,7 @@ export function resolverUniUi(name) {
     return {
       name: 'default',
       as: name,
-      from: `@dcloudio/uni-ui/lib/uni${componentName}/uni${componentName}.vue`,
+      from: `@dcloudio/uni-ui/lib/uni-${componentName}/uni${componentName}.vue`,
     }
   }
 }