自动创建 PR (#83)

* 更新依赖版本 Co-authored-by: biaov <biaov2017@qq.com> Co-authored-by: biaov2017 <biao2017@qq.com> Co-authored-by: biaov2018 <biaov2017@qq.com> * 更新依赖版本 * 更新依赖版本 * 更新推荐 * 组件里的 `v-model` 语法改为 `defineModel` * 修复缺陷 * 格式代码 * 格式化代码 * 更新代码 * 修复缺陷 --------- Co-authored-by: biaov <biaov@qq.com> Co-authored-by: biaov <biaov2017@qq.com> Co-authored-by: biaov2017 <biao2017@qq.com>
biaov · Jun 18, 2024 · c3f0008 · c3f0008
1 parent 3aafa78
commit c3f0008
Show file tree

Hide file tree

Showing 100 changed files with 1,066 additions and 909 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -17,15 +17,13 @@ jobs:
         with:
           node-version: '20.12.x'
           registry-url: 'https://registry.npmjs.org'
-      - run: npm install -g npm
-      - run: npm ci
+      - run: npm i
       - run: npm run build:theme
       - run: npm run build:package
       - run: npm run pre-publish
-      - run: echo "VERSION=" >> $GITHUB_ENV
       - run: |
           VERSION=$(node -p "require('./package.json').version")
-          cd ./dist/packages
+          cd dist/packages
           if [[ "$VERSION" == *"beta"* ]]; then
             npm publish --tag=beta-v2
           else

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,4 +1,4 @@
 {
   /* 推荐扩展 */
-  "recommendations": ["Vue.volar"]
+  "recommendations": ["Vue.volar", "esbenp.prettier-vscode"]
 }
diff --git a/auto-cli.jsonc b/auto-cli.jsonc
diff --git a/auto-cli.yml b/auto-cli.yml
@@ -0,0 +1 @@
+reject: ['eslint']
diff --git a/config/plugins.ts b/config/plugins.ts
@@ -5,7 +5,7 @@ import type MarkdownIt from 'markdown-it'
 import { VitePWAOptions } from 'vite-plugin-pwa'
 import { resolve } from 'path'
 import type { Options as EslintOptions } from 'vite-plugin-eslint'
-import { eslintBaseConfig } from './eslint.config'
+import { eslintBaseConfig } from '../eslint.config'
 import type { MarkdownViteOptions, TokenItem } from './types'
 
 const { dirname } = import.meta
@@ -103,17 +103,20 @@ export const eslintConfig: EslintOptions = {
  */
 export const tailwindcssConfig = () => {
   const spacing = {}
+  const zIndex = {}
 
   for (let i = 0; i < 1000; i++) {
     spacing[i] = `${i}px`
+    i < 10 && (zIndex[i] = i)
   }
 
   return {
     content: ['./examples/**/*.vue', './mobile/**/*.vue'],
     theme: {
       spacing,
       extend: {
-        fontSize: ({ theme }) => theme('spacing')
+        fontSize: ({ theme }) => theme('spacing'),
+        zIndex
       }
     }
   }

diff --git a/config/eslint.config.ts → eslint.config.ts b/config/eslint.config.ts → eslint.config.ts
@@ -60,7 +60,11 @@ export const eslintBaseConfig: Linter.Config = {
         /**
          * 禁止未使用的变量, ts 变量
          */
-        'no-unused-vars': 'off'
+        'no-unused-vars': 'off',
+        /**
+         * 重复变量
+         */
+        'no-shadow': 'off'
       }
     }
   ],

diff --git a/examples/components/MineHeader/index.vue b/examples/components/MineHeader/index.vue
@@ -8,7 +8,7 @@ const { navList: navListData, versionList, isHome } = useListData()
 
 <template>
   <!-- 头部 -->
-  <div class="header fixed top-0 left-0 z-9 w-full h-60 z-2" :class="{ home: isHome }">
+  <div class="header fixed top-0 left-0 w-full h-60 z-2" :class="{ home: isHome }">
     <div class="flex justify-between items-center h-60 w-11/12 my-0 mx-auto">
       <!-- logo -->
       <router-link to="/" class="w-50"><img src="../../assets/logo.svg" title="mineh5ui" alt="mineh5ui logo" class="w-full" /></router-link>

diff --git a/examples/docs/logs.md b/examples/docs/logs.md
@@ -14,7 +14,17 @@
 
 :::TimeLine
 
-## v2.9.2 - 最新版本
+## v2.9.3 - 最新版本
+
+`2024-06-18`
+
+- ⚙️ `auto-cli.jsonc` 更换为 `auto-cli.yml`
+- ⚙️ 更新 `.vscode/extensions.json` 的新增插件
+- ⚙️ 更新依赖版本
+- ⚙️ 组件里的 `v-model` 语法改为 `defineModel`
+- 🐞 修复 `MeDatetimePicker` 组件不显示问题
+
+## v2.9.2
 
 `2024-05-17`
 

diff --git a/examples/docs/mask.md b/examples/docs/mask.md
@@ -44,7 +44,7 @@ createApp(App).use(MeMask).mount('#app')
 ```vue
 <template>
   <me-mask v-model:visible="visible" mask-close>
-    <me-loading type="circle2" color="#f56c6c" size="100px">
+    <me-loading color="#f56c6c" size="100px">
       <div class="text">加载中...</div>
     </me-loading>
   </me-mask>

diff --git a/examples/docs/popup.md b/examples/docs/popup.md
@@ -78,12 +78,12 @@ createApp(App).use(MePopup).mount('#app')
 
 ### 参数
 
-| 参数      | 说明           | 类型    | 可选值                               | 默认值 | 版本   |
-| --------- | -------------- | ------- | ------------------------------------ | ------ | ------ |
-| visible   | 弹出层显示状态 | boolean | true / false                         | --     | v2.0.0 |
-| position  | 弹窗位置       | string  | center / top / right / bottom / left | center | v2.0.0 |
-| closeable | 关闭图标的显示 | boolean | true / false                         | false  | v2.0.0 |
-| radius    | 弹窗倒角       | string  | --                                   | 0      | v2.0.0 |
+| 参数                     | 说明           | 类型    | 可选值                               | 默认值 | 版本   |
+| ------------------------ | -------------- | ------- | ------------------------------------ | ------ | ------ |
+| visible(v-model:visible) | 弹出层显示状态 | boolean | true / false                         | --     | v2.0.0 |
+| position                 | 弹窗位置       | string  | center / top / right / bottom / left | center | v2.0.0 |
+| closeable                | 关闭图标的显示 | boolean | true / false                         | false  | v2.0.0 |
+| radius                   | 弹窗倒角       | string  | --                                   | 0      | v2.0.0 |
 
 ### Slots
 

diff --git a/examples/docs/slider.md b/examples/docs/slider.md
@@ -144,14 +144,14 @@ const sliderValue = ref(30)
 
 ### 参数
 
-| 参数                | 说明                            | 类型    | 可选值       | 默认值 | 版本 |
-| ------------------- | ------------------------------- | ------- | ------------ | ------ | ---- |
-| modelValue(v-model) | 双向绑定滑块的值                | number  | --           | --     | --   |
-| max                 | 范围最大值                      | number  | --           | 100    | --   |
-| min                 | 范围最小值                      | number  | --           | 0      | --   |
+| 参数                | 说明                                 | 类型    | 可选值       | 默认值 | 版本 |
+| ------------------- | ------------------------------------ | ------- | ------------ | ------ | ---- |
+| modelValue(v-model) | 双向绑定滑块的值                     | number  | --           | --     | --   |
+| max                 | 范围最大值                           | number  | --           | 100    | --   |
+| min                 | 范围最小值                           | number  | --           | 0      | --   |
 | styles              | 自定义样式，[查看详情](#styles-属性) | Object  | --           | --     | --   |
-| is-btn              | 自定义按钮                      | boolean | true / false | false  | --   |
-| disabled            | 禁用状态                        | boolean | true / false | false  | --   |
+| is-btn              | 自定义按钮                           | boolean | true / false | false  | --   |
+| disabled            | 禁用状态                             | boolean | true / false | false  | --   |
 
 ### styles 属性
 

diff --git a/examples/router/docs.ts b/examples/router/docs.ts
@@ -1,3 +1,4 @@
+import type { RouteRecordRaw } from 'vue-router'
 import NavConfig from '@/config/nav.config'
 import type { Docs } from './types'
 
@@ -51,4 +52,4 @@ Object.keys(NavConfig).forEach(elem => {
 addComponent(docs)
 const exportDocs = docs
 
-export default exportDocs
+export default exportDocs as unknown[] as RouteRecordRaw[]
diff --git a/examples/router/index.ts b/examples/router/index.ts
@@ -22,7 +22,7 @@ const routes: RouteRecordRaw[] = [
       name: 'introduce'
     },
     component: () => import(`@/views/doc/index.vue`),
-    children: docs as any[]
+    children: docs
   }
 ]
 

diff --git a/examples/views/doc/index.vue b/examples/views/doc/index.vue
@@ -39,17 +39,17 @@ const changeFrameRouter = (frame: HTMLIFrameElement) => {
   <!-- 文档 -->
   <div class="doc">
     <!-- 头部 -->
-    <mine-header></mine-header>
+    <mine-header />
     <!-- 内容 -->
     <div class="content">
       <!-- 菜单列表 -->
-      <side-bar></side-bar>
+      <side-bar />
       <div class="md">
         <!-- 使用文档 -->
-        <router-view></router-view>
+        <router-view />
       </div>
-      <!-- H5演示 -->
-      <demo-h5 @getframe="changeFrameRouter"></demo-h5>
+      <!-- H5 演示 -->
+      <demo-h5 @getframe="changeFrameRouter" />
     </div>
   </div>
 </template>

diff --git a/mobile/components/MineHeader/index.vue b/mobile/components/MineHeader/index.vue
@@ -1,10 +1,10 @@
 <template>
   <!-- 头部组件 -->
-  <div class="header fixed top-0 left-0 z-9 w-full">
+  <div class="header fixed top-0 left-0 z-10 w-full">
     <router-link :to="{ name: 'Layout' }" class="return absolute top-0 left-0 w-40 block">
       <me-icon name="icon-left" color="#949494" size="20px" />
     </router-link>
-    <h3 class="tit w-full p-40">
+    <h3 class="tit w-full">
       <slot>演示</slot>
     </h3>
   </div>

diff --git a/mobile/router/docs.ts b/mobile/router/docs.ts
@@ -1,3 +1,4 @@
+import type { RouteRecordRaw } from 'vue-router'
 import { componentConfig } from '@/config/nav.config'
 import type { Docs } from './types'
 
@@ -46,4 +47,4 @@ const addComponent = (arr: Docs[]) => {
 addComponent(docs)
 const exportDocs = docs
 
-export default exportDocs
+export default exportDocs as unknown[] as RouteRecordRaw[]
diff --git a/mobile/router/index.ts b/mobile/router/index.ts
@@ -8,7 +8,7 @@ import docs from './docs'
 const routes: RouteRecordRaw[] = [
   {
     path: '/:pathMatch(.*)*',
-    redirect: { name: 'Layout' }
+    redirect: { name: 'Layout', params: {} }
   },
   {
     path: '/',
@@ -18,7 +18,7 @@ const routes: RouteRecordRaw[] = [
   {
     path: '/doc',
     component: () => import(`^/views/doc/index.vue`),
-    children: docs as any[]
+    children: docs
   }
 ]
 

diff --git a/mobile/views/doc/img/index.vue b/mobile/views/doc/img/index.vue
@@ -23,7 +23,7 @@ const { isShowMask, listData, onLoad, onError } = useWebData()
       </li>
     </ul>
     <me-mask :visible="isShowMask">
-      <me-loading type="circle2" color="#f56c6c" size="100px">
+      <me-loading color="#f56c6c" size="100px">
         <div class="text">加载中...</div>
       </me-loading>
     </me-mask>

diff --git a/mobile/views/doc/index.vue b/mobile/views/doc/index.vue
@@ -11,7 +11,7 @@ const { title } = useRouteHandler()
     <!-- 头部 -->
     <mine-header>{{ title }}</mine-header>
     <!-- 内容 -->
-    <router-view></router-view>
+    <router-view />
   </div>
 </template>
 

diff --git a/mobile/views/doc/mask/index.vue b/mobile/views/doc/mask/index.vue
@@ -14,7 +14,7 @@ const { listData } = useWebData()
           <span>{{ it.value }}</span>
           <me-icon name="icon-right1" size="20px" color="#ccc" />
           <me-mask v-model:visible="it.visible" mask-close>
-            <me-loading type="circle2" color="#f56c6c" size="100px">
+            <me-loading color="#f56c6c" size="100px">
               <div class="text">加载中...</div>
             </me-loading>
           </me-mask>