Merge branch 'v4' into v4-radio-button-size_2

.github/workflows/sync-gitee.yml

@@ -1,8 +1,9 @@
 name: Sync to Gitee
 
 on:
-  push:
-    branches: [v4]
+  workflow_dispatch:
+  schedule:
+    - cron: '0 1 * * *'
 
 jobs:
   deploy-site-sync-gitee:

.github/workflows/sync-h5.yml

@@ -7,6 +7,7 @@ on:
     paths:
       - '.github/workflows/**'
       - 'src/**'
+      - 'package.json'
 
 jobs:
   copy:
@@ -29,7 +30,7 @@ jobs:
         run: pnpm copy:h5
 
       - name: Sync
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           branch: new-site # action 应该部署到的分支 。
           folder: site_docs #操作应该部署的文件夹 。

.github/workflows/sync-pkg.yml

@@ -0,0 +1,42 @@
+name: sync to pkg branch
+
+permissions:
+  contents: write
+
+on:
+  push:
+    branches:
+      - v4 # default branch
+
+jobs:
+  copy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install pnpm
+        run: corepack enable
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install
+
+      - name: Build @nutui/nutui
+        run: pnpm build
+
+      - name: Build @nutui/nutui-taro
+        run: pnpm build:taro
+
+      - name: Sync
+        uses: JamesIves/[email protected]
+        with:
+          branch: pkg # action 应该部署到的分支 。
+          folder: publish #操作应该部署的文件夹 。
+          clean: true
+          target-folder: publish
+          git-config-name: github-actions
+          git-config-email: [email protected]

.github/workflows/sync-taro.yml

@@ -7,6 +7,7 @@ on:
     paths:
       - '.github/workflows/**'
       - 'src/**'
+      - 'package.json'
 
 jobs:
   copy:
@@ -29,7 +30,7 @@ jobs:
         run: pnpm copy:taro
 
       - name: Sync
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           branch: new-site # action 应该部署到的分支 。
           folder: site_docs #操作应该部署的文件夹 。

CHANGELOG.md

@@ -1,3 +1,17 @@
+## v4.2.3
+
+`2023-11-30`
+
+Bug Fixes
+
+- ellipsis: 修复 taro 组件导出问题 @eiinu
+- number-keyboard: 修复标题栏完成按钮样式丢失的问题 (#2696) @Moonofweisheng
+
+Other Changes
+
+- refactor: 优化组件间 provide & inject (#2681) @eiinu
+- deps: bump vite to v5 (#2689) @eiinu
+
 ## v4.2.2
 
 `2023-11-24`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库（支持小程序开发）",
   "main": "dist/nutui.umd.js",
   "module": "dist/nutui.es.js",
@@ -85,8 +85,8 @@
     "@types/node": "^18.18.5",
     "@vitejs/plugin-vue": "^4.5.0",
     "@vitejs/plugin-vue-jsx": "^3.1.0",
-    "@vitest/coverage-v8": "^0.34.6",
-    "@vitest/ui": "^0.34.6",
+    "@vitest/coverage-v8": "^1.0.1",
+    "@vitest/ui": "^1.0.1",
     "@vue/test-utils": "^2.4.1",
     "autoprefixer": "^10.4.16",
     "codesandbox": "^2.2.3",
@@ -100,13 +100,13 @@
     "prettier": "^3.0.3",
     "rimraf": "^5.0.5",
     "typescript": "^5.2.2",
-    "unplugin-vue-components": "^0.25.2",
+    "unplugin-vue-components": "^0.26.0",
     "vite": "^5.0.2",
-    "vitest": "^0.34.6",
+    "vitest": "^1.0.1",
     "vitest-canvas-mock": "^0.3.3",
     "vue": "^3.3.4",
     "vue-tsc": "^1.8.22",
-    "vite-plugin-inspect": "^0.7.42"
+    "vite-plugin-inspect": "^0.8.0"
   },
   "engines": {
     "pnpm": ">= 8.0.0"

packages/nutui-playground/package.json

@@ -2,6 +2,7 @@
   "name": "@nutui/playground",
   "version": "1.0.0",
   "private": true,
+  "type": "module",
   "description": "NutUI Vue SFC Playground",
   "keywords": [
     "nutui",
@@ -15,13 +16,13 @@
   },
   "devDependencies": {
     "@types/node": "^18.18.5",
-    "@vitejs/plugin-vue": "^4.5.0",
+    "@vitejs/plugin-vue": "^4.5.1",
     "rimraf": "^5.0.5",
-    "vite": "^5.0.2",
-    "vue": "^3.3.4"
+    "vite": "^5.0.4",
+    "vue": "^3.3.9"
   },
   "dependencies": {
-    "@vue/repl": "^2.5.8",
+    "@vue/repl": "^3.0.0",
     "file-saver": "^2.0.5",
     "jszip": "^3.10.1"
   }

packages/nutui-playground/src/download/template/package.json

@@ -14,6 +14,6 @@
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.5.0",
     "vite": "^5.0.2",
-    "unplugin-vue-components": "^0.25.2"
+    "unplugin-vue-components": "^0.26.0"
   }
 }

packages/nutui-playground/src/main.ts

@@ -1,6 +1,5 @@
 import { createApp } from 'vue';
 import App from './App.vue';
-import '@vue/repl/style.css';
 import './style.css';
 
 // @ts-expect-error Custom window property

packages/nutui-taro-demo/src/dentry/pages/form/index.vue

@@ -162,6 +162,18 @@
         ></nut-address>
       </nut-form-item>
     </nut-form>
+    <h2>自定义labe位置</h2>
+    <nut-form label-position="top" star-position="right">
+      <nut-form-item label="姓名" required>
+        <nut-input v-model="basicData.name" class="nut-input-text" placeholder="请输入姓名" type="text" />
+      </nut-form-item>
+      <nut-form-item label="年龄" required>
+        <nut-input v-model="basicData.age" class="nut-input-text" placeholder="请输入年龄" type="text" />
+      </nut-form-item>
+      <nut-form-item label-position="left" label="备注">
+        <nut-textarea placeholder="请输入备注" type="text" />
+      </nut-form-item>
+    </nut-form>
   </Demo>
 </template>
 

packages/nutui-taro-demo/src/dentry/pages/textarea/index.vue

@@ -18,16 +18,3 @@ const value = ref('');
 const value2 = ref('');
 const value3 = ref('');
 </script>
-
-<style lang="scss">
-.nut-textarea__textarea__readonly {
-  background-color: #f9f9f9;
-}
-.nut-textarea--disabled {
-  textarea {
-    padding: 5px 10px;
-    height: 30px;
-    background-color: #f9f9f9;
-  }
-}
-</style>