ソースを参照

Merge branch 'next' of https://github.com/jdf2e/nutui into next

Drjingfubo 4 年 前
コミット
03e9038156
100 ファイル変更113 行追加390 行削除
  1. 17 0
      .github/workflows/sync-gitee.yml
  2. 2 2
      .github/workflows/test.yml
  3. 2 0
      .gitignore
  4. 23 0
      CHANGELOG.md
  5. 6 1
      index.html
  6. 11 0
      jd/generate-nutui-taro-vue.js
  7. 12 0
      jd/generate-nutui.js
  8. 4 6
      package.json
  9. 0 3
      src/packages/__VUE/actionsheet/index.taro.vue
  10. 0 3
      src/packages/__VUE/actionsheet/index.vue
  11. 0 4
      src/packages/__VUE/address/index.taro.vue
  12. 0 4
      src/packages/__VUE/address/index.vue
  13. 0 3
      src/packages/__VUE/avatar/index.taro.vue
  14. 0 3
      src/packages/__VUE/avatar/index.vue
  15. 0 4
      src/packages/__VUE/backtop/index.taro.vue
  16. 0 4
      src/packages/__VUE/backtop/index.vue
  17. 4 6
      src/packages/__VUE/barrage/demo.vue
  18. 1 5
      src/packages/__VUE/barrage/index.taro.vue
  19. 0 4
      src/packages/__VUE/barrage/index.vue
  20. 0 4
      src/packages/__VUE/button/index.taro.vue
  21. 0 4
      src/packages/__VUE/button/index.vue
  22. 0 4
      src/packages/__VUE/calendaritem/index.vue
  23. 0 4
      src/packages/__VUE/cell/index.taro.vue
  24. 0 4
      src/packages/__VUE/cell/index.vue
  25. 0 4
      src/packages/__VUE/cellgroup/index.vue
  26. 10 33
      src/packages/__VUE/checkbox/demo.vue
  27. 7 15
      src/packages/__VUE/checkbox/doc.md
  28. 0 4
      src/packages/__VUE/checkbox/index.taro.vue
  29. 0 4
      src/packages/__VUE/checkbox/index.vue
  30. 0 4
      src/packages/__VUE/circleprogress/index.taro.vue
  31. 0 4
      src/packages/__VUE/circleprogress/index.vue
  32. 0 2
      src/packages/__VUE/col/index.scss
  33. 0 4
      src/packages/__VUE/col/index.vue
  34. 0 4
      src/packages/__VUE/collapse/index.taro.vue
  35. 0 4
      src/packages/__VUE/collapse/index.vue
  36. 0 4
      src/packages/__VUE/collapseitem/index.taro.vue
  37. 0 4
      src/packages/__VUE/collapseitem/index.vue
  38. 0 4
      src/packages/__VUE/countdown/index.taro.vue
  39. 0 4
      src/packages/__VUE/countdown/index.vue
  40. 0 4
      src/packages/__VUE/countup/index.taro.vue
  41. 0 4
      src/packages/__VUE/countup/index.vue
  42. 0 2
      src/packages/__VUE/datepicker/index.taro.vue
  43. 0 4
      src/packages/__VUE/datepicker/index.vue
  44. 0 4
      src/packages/__VUE/dialog/index.taro.vue
  45. 0 4
      src/packages/__VUE/dialog/index.vue
  46. 0 5
      src/packages/__VUE/divider/demo.vue
  47. 4 4
      src/packages/__VUE/divider/index.scss
  48. 0 4
      src/packages/__VUE/divider/index.taro.vue
  49. 0 4
      src/packages/__VUE/divider/index.vue
  50. 0 4
      src/packages/__VUE/drag/index.taro.vue
  51. 0 4
      src/packages/__VUE/drag/index.vue
  52. 0 4
      src/packages/__VUE/elevator/index.taro.vue
  53. 0 4
      src/packages/__VUE/elevator/index.vue
  54. 0 4
      src/packages/__VUE/fixednav/index.taro.vue
  55. 0 4
      src/packages/__VUE/fixednav/index.vue
  56. 0 4
      src/packages/__VUE/icon/index.taro.vue
  57. 0 4
      src/packages/__VUE/icon/index.vue
  58. 0 4
      src/packages/__VUE/infiniteloading/index.taro.vue
  59. 0 4
      src/packages/__VUE/infiniteloading/index.vue
  60. 3 2
      src/packages/__VUE/input/doc.md
  61. 7 1
      src/packages/__VUE/input/index.scss
  62. 0 4
      src/packages/__VUE/input/index.taro.vue
  63. 0 4
      src/packages/__VUE/input/index.vue
  64. 0 4
      src/packages/__VUE/inputnumber/index.taro.vue
  65. 0 4
      src/packages/__VUE/inputnumber/index.vue
  66. 0 0
      src/packages/__VUE/layout/index.scss
  67. 0 2
      src/packages/__VUE/layout/index.taro.vue
  68. 0 2
      src/packages/__VUE/layout/index.vue
  69. 0 4
      src/packages/__VUE/menu/index.vue
  70. 0 4
      src/packages/__VUE/menuitem/index.vue
  71. 0 4
      src/packages/__VUE/navbar/index.taro.vue
  72. 0 4
      src/packages/__VUE/navbar/index.vue
  73. 0 4
      src/packages/__VUE/noticebar/index.taro.vue
  74. 0 4
      src/packages/__VUE/noticebar/index.vue
  75. 0 4
      src/packages/__VUE/notify/index.taro.vue
  76. 0 4
      src/packages/__VUE/notify/index.vue
  77. 0 4
      src/packages/__VUE/numberkeyboard/index.taro.vue
  78. 0 4
      src/packages/__VUE/numberkeyboard/index.vue
  79. 0 3
      src/packages/__VUE/overlay/index.taro.vue
  80. 0 3
      src/packages/__VUE/overlay/index.vue
  81. 0 4
      src/packages/__VUE/picker/Column.vue
  82. 0 2
      src/packages/__VUE/picker/index.taro.vue
  83. 0 3
      src/packages/__VUE/picker/index.vue
  84. 0 4
      src/packages/__VUE/popup/index.taro.vue
  85. 0 4
      src/packages/__VUE/popup/index.vue
  86. 0 4
      src/packages/__VUE/price/index.taro.vue
  87. 0 4
      src/packages/__VUE/price/index.vue
  88. 0 4
      src/packages/__VUE/progress/index.taro.vue
  89. 0 4
      src/packages/__VUE/progress/index.vue
  90. 0 4
      src/packages/__VUE/pullrefresh/index.vue
  91. 0 4
      src/packages/__VUE/radio/index.taro.vue
  92. 0 4
      src/packages/__VUE/radio/index.vue
  93. 0 4
      src/packages/__VUE/range/index.taro.vue
  94. 0 4
      src/packages/__VUE/range/index.vue
  95. 0 4
      src/packages/__VUE/rate/index.taro.vue
  96. 0 4
      src/packages/__VUE/rate/index.vue
  97. 0 3
      src/packages/__VUE/row/index.vue
  98. 0 4
      src/packages/__VUE/shortpassword/index.taro.vue
  99. 0 4
      src/packages/__VUE/shortpassword/index.vue
  100. 0 0
      src/packages/__VUE/signature/index.taro.vue

+ 17 - 0
.github/workflows/sync-gitee.yml

@@ -0,0 +1,17 @@
+name: Sync to Gitee
+
+on:
+  push:
+    branches: [next]
+
+jobs:
+  deploy-site-sync-gitee:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Sync to Gitee
+        uses: wearerequired/git-mirror-action@master
+        env:
+          SSH_PRIVATE_KEY: ${{ secrets.GITEE_RSA_PRIVATE_KEY }}
+        with:
+          source-repo: git@github.com:jdf2e/nutui.git
+          destination-repo: git@gitee.com:jd-platform-opensource/nutui.git

+ 2 - 2
.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: github pages
+name: test
 
 on:
   push:
@@ -11,4 +11,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - run: yarn install
-      - run: yarn test
+      - run: yarn test

+ 2 - 0
.gitignore

@@ -8,7 +8,9 @@ package-lock.json
 /cache
 /src/nutui.ts
 /src/packages/nutui.vue.ts
+/src/packages/nutui.vue.build.ts
 /src/packages/nutui.taro.vue.ts
+/src/packages/nutui.taro.vue.build.ts
 /.nyc_output
 /coverage
 /tsc/test

+ 23 - 0
CHANGELOG.md

@@ -1,4 +1,27 @@
 
+## v3.1.5~6
+
+`2021-09-18`
+
+* :zap: feat: 新增 signature 签名组件 @guoxiaoxiao
+* :zap: feat: 新增 divider (#644) @yangjinjun3
+* :bug: fix(tabbar,cell): 支持路由跳转 (#667) @Drjingfubo
+* :bug: fix(barrage): demo 优化 (#661) @Ymm0008
+* :bug: fix(price): 配置为整数时小数位显示问题修复 #659 (#665) @Drjingfubo
+* :bug: fix(address): 点击空白处触发事件问题修改 (#657) @yangxiaolu3
+* :bug: fix(shortpassword): 密码圆点不展示修复 (#638)  @Drjingfubo
+* :bug: fix(tab): 修复 switch-tab 事件失效、点击事件报错处理 #635 @zhenyulei
+* :bug: fix(input): change event data update delay @richard1015
+* :bug: fix(popup): h5 滑动内容穿透修复 @richard1015
+* :bug: fix(calendar): 个别月份不展示问题, 滑动卡顿问题 、滑动月份不变更问题 (#618) @irisSong
+* :zap: upd(tabbar): 新增支持自定义图片链接 (#620) @Drjingfubo
+* :zap: style(noticebar) : 默认样式调整 (#641) @yangxiaolu3
+* :zap: chore: add postcss plugin autoprefixer @richard1015
+* :zap: chore: components docs、install optimization @richard1015
+* :zap: docs: toast optimization @richard1015
+* :zap: docs(address): address docs modify @szg2008
+* :zap: docs: add version intro @richard1015
+
 ## v3.1.4
 
 `2021-09-01`

+ 6 - 1
index.html

@@ -8,7 +8,12 @@
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
       name="viewport"
     />
-    <title>NutUI - 移动端Vue组件库</title>
+    <title>NutUI - 移动端 Vue2、Vue3 组件库</title>
+    <meta name="keywords" content="Vue3组件库,移动端组件库,Vite,Vue组件库,Vue3,Vue2" />
+    <meta name="description" content="京东风格的轻量级移动端 Vue 组件库" />
+    <meta http-equiv="Cache-Control" content="no-cache" />
+    <meta http-equiv="Pragma" content="no-cache" />
+    <meta http-equiv="Expires" content="0" />
     <script crossorigin src="https://sgm-static.jd.com/sgm-pc-1.0.1.js" name="SGMH5" sid="3df6f31cb70143f09b19bd426bfdbe30" appKey="nutui-site" ></script>
     <script src="https://h5.m.jd.com/babelDiy/Zeus/2846ykuM7PwipD9E2RzMj2BGEQpA/plugin/share.min.js"></script>
     <style>

+ 11 - 0
jd/generate-nutui-taro-vue.js

@@ -3,6 +3,7 @@ const config = require('../src/config.json');
 const path = require('path');
 const fs = require('fs-extra');
 let importStr = `//import { App } from 'vue';\n`;
+let importScssStr = `\n`;
 const packages = [];
 config.nav.map((item) => {
   item.packages.forEach((element) => {
@@ -11,6 +12,7 @@ config.nav.map((item) => {
       importStr += `import ${name} from './__VUE/${name.toLowerCase()}/index${
         exportEmpty ? '' : '.taro'
       }.vue';\n`;
+      importScssStr += `import './__VUE/${name.toLowerCase()}/index.scss';\n`;
       packages.push(name);
     }
   });
@@ -30,6 +32,15 @@ ${installFunction}
 export { ${packages.join(',')}  };
 export default { install, version:'${package.version}'};`;
 fs.outputFile(
+  path.resolve(__dirname, '../src/packages/nutui.taro.vue.build.ts'),
+  fileStr,
+  'utf8',
+  (error) => {
+    // logger.success(`${package_config_path} 文件写入成功`);
+  }
+);
+fileStr += importScssStr;
+fs.outputFile(
   path.resolve(__dirname, '../src/packages/nutui.taro.vue.ts'),
   fileStr,
   'utf8',

+ 12 - 0
jd/generate-nutui.js

@@ -3,6 +3,7 @@ const config = require('../src/config.json');
 const path = require('path');
 const fs = require('fs-extra');
 let importStr = `import { App } from 'vue';\n`;
+let importScssStr = `\n`;
 const packages = [];
 config.nav.map((item) => {
   item.packages.forEach((element) => {
@@ -11,6 +12,7 @@ config.nav.map((item) => {
       importStr += `import ${name} from './__VUE/${name.toLowerCase()}/index${
         type === 'methods' ? '' : '.vue'
       }';\n`;
+      importScssStr += `import './__VUE/${name.toLowerCase()}/index.scss';\n`;
       packages.push(name);
     }
   });
@@ -30,6 +32,16 @@ ${installFunction}
 export { install, ${packages.join(',')}  };
 export default { install, version:'${package.version}'};`;
 fs.outputFile(
+  path.resolve(__dirname, '../src/packages/nutui.vue.build.ts'),
+  fileStr,
+  'utf8',
+  (error) => {
+    // logger.success(`${package_config_path} 文件写入成功`);
+  }
+);
+
+fileStr += importScssStr;
+fs.outputFile(
   path.resolve(__dirname, '../src/packages/nutui.vue.ts'),
   fileStr,
   'utf8',

+ 4 - 6
package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "京东风格的轻量级移动端 Vue2、Vue3 组件库(支持小程序开发)",
   "main": "dist/nutui.umd.js",
   "module": "dist/nutui.es.js",
@@ -41,9 +41,8 @@
     "build:site": "npm run checked && vite build",
     "build:gh-pages": "npm run checked && vite build --base=/nutui/",
     "build:site:oss": "npm run checked && vite build --base=/nutui/3x/",
-    "build": "npm run checked && vite build --config vite.config.build.ts && npm run generate:types && npm run generate:themes",
-    "build:taro:vue": "npm run checked:taro:vue && vite build --config vite.config.build.taro.vue.ts && npm run generate:types && npm run generate:themes",
-    "build:disperse": "vite build --config vite.config.build.disperse.ts",
+    "build": "npm run checked && vite build --config vite.config.build.ts && npm run generate:types && npm run generate:themes && vite build --config vite.config.build.css.ts",
+    "build:taro:vue": "npm run checked:taro:vue && vite build --config vite.config.build.taro.vue.ts && npm run generate:types && npm run generate:themes && vite build --config vite.config.build.css.ts",
     "serve": "vite preview",
     "upload": "yarn build:site:oss && node ./jd/upload.js",
     "add": "node jd/createComponentMode.js",
@@ -64,6 +63,7 @@
     }
   },
   "dependencies": {
+    "pinyin": "^2.10.2",
     "sass": "^1.34.0",
     "vue": "^3.0.5",
     "vue-router": "^4.0.4"
@@ -86,13 +86,11 @@
     "eslint": "^6.7.2",
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-vue": "^7.0.0-0",
-    "front-matter": "^4.0.2",
     "fs-extra": "^9.1.0",
     "highlight.js": "^10.3.1",
     "husky": "^6.0.0",
     "jest": "^26.6.3",
     "lint-staged": "^10.5.0",
-    "pinyin": "^2.10.2",
     "prettier": "^2.0.0",
     "standard-version": "^9.3.0",
     "swiper": "6.5.1",

+ 0 - 3
src/packages/__VUE/actionsheet/index.taro.vue

@@ -120,6 +120,3 @@ export default create({
   }
 });
 </script>
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 3
src/packages/__VUE/actionsheet/index.vue

@@ -120,6 +120,3 @@ export default create({
   }
 });
 </script>
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/address/index.taro.vue

@@ -552,7 +552,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import './index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/address/index.vue

@@ -538,7 +538,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss" scoped>
-@import 'index.scss';
-</style>

+ 0 - 3
src/packages/__VUE/avatar/index.taro.vue

@@ -72,6 +72,3 @@ export default create({
   }
 });
 </script>
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 3
src/packages/__VUE/avatar/index.vue

@@ -72,6 +72,3 @@ export default create({
   }
 });
 </script>
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/backtop/index.taro.vue

@@ -85,7 +85,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/backtop/index.vue

@@ -173,7 +173,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 4 - 6
src/packages/__VUE/barrage/demo.vue

@@ -5,7 +5,9 @@
       <nut-barrage ref="danmu" :danmu="list"></nut-barrage>
     </nut-cell>
     <div class="test">
-      <button @click="addDanmu" class="add">随机添加</button>
+      <button @click="addDanmu" class="add nut-button--primary"
+        >随机添加</button
+      >
     </div>
   </div>
 </template>
@@ -47,17 +49,13 @@ export default createDemo({
   padding: 20px 0;
   height: 150px;
 }
-#app .demo {
-  background: #fff;
-}
+
 .test {
   .add {
     display: block;
     padding: 5px 30px;
     margin: 20px auto;
     border-radius: 15px;
-    background: #949494;
-    color: white;
     font-size: 12px;
   }
 }

+ 1 - 5
src/packages/__VUE/barrage/index.taro.vue

@@ -123,7 +123,7 @@ export default create({
           .boundingClientRect((rec) => {
             let danmuCWidth = rec.width;
             // let width = domList[_index]['width'];
-            let height = domList[_index]['height'];
+            let height = domList[_index]?.height || 0;
             el.classList.add('move');
             el.style.animationDuration = `${speeds}ms`;
             el.style.top =
@@ -145,7 +145,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/barrage/index.vue

@@ -134,7 +134,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/button/index.taro.vue

@@ -114,7 +114,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/button/index.vue

@@ -115,7 +115,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/calendaritem/index.vue

@@ -668,7 +668,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/cell/index.taro.vue

@@ -81,7 +81,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/cell/index.vue

@@ -94,7 +94,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/cellgroup/index.vue

@@ -28,7 +28,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 10 - 33
src/packages/__VUE/checkbox/demo.vue

@@ -60,20 +60,14 @@
     <nut-cell-group title="checkboxGroup使用">
       <nut-cell>
         <nut-checkboxgroup v-model="checkboxgroup1">
-          <nut-checkbox
-            v-model="checkbox9"
-            label="1"
-            style="margin: 2px 20px 0 0"
+          <nut-checkbox label="1" style="margin: 2px 20px 0 0"
             >组合复选框</nut-checkbox
           >
-          <nut-checkbox v-model="checkbox10" label="2">组合复选框</nut-checkbox>
-          <nut-checkbox
-            v-model="checkbox11"
-            label="3"
-            style="margin: 2px 20px 0 0"
+          <nut-checkbox label="2">组合复选框</nut-checkbox>
+          <nut-checkbox label="3" style="margin: 2px 20px 0 0"
             >组合复选框</nut-checkbox
           >
-          <nut-checkbox v-model="checkbox12" label="4">组合复选框</nut-checkbox>
+          <nut-checkbox label="4">组合复选框</nut-checkbox>
         </nut-checkboxgroup>
       </nut-cell>
       <nut-cell>
@@ -84,20 +78,14 @@
     <nut-cell-group title="checkboxGroup禁用">
       <nut-cell>
         <nut-checkboxgroup v-model="checkboxgroup1" disabled>
-          <nut-checkbox
-            v-model="checkbox9"
-            label="1"
-            style="margin: 2px 20px 0 0"
+          <nut-checkbox label="1" style="margin: 2px 20px 0 0"
             >组合复选框</nut-checkbox
           >
-          <nut-checkbox v-model="checkbox10" label="2">组合复选框</nut-checkbox>
-          <nut-checkbox
-            v-model="checkbox11"
-            label="3"
-            style="margin: 2px 20px 0 0"
+          <nut-checkbox label="2">组合复选框</nut-checkbox>
+          <nut-checkbox label="3" style="margin: 2px 20px 0 0"
             >组合复选框</nut-checkbox
           >
-          <nut-checkbox v-model="checkbox12" label="4">组合复选框</nut-checkbox>
+          <nut-checkbox label="4">组合复选框</nut-checkbox>
         </nut-checkboxgroup>
       </nut-cell>
     </nut-cell-group>
@@ -108,13 +96,10 @@
           ref="group"
           @change="changeBox4"
         >
-          <nut-checkbox
-            v-model="checkbox15"
-            label="1"
-            style="margin: 0 20px 0 0"
+          <nut-checkbox label="1" style="margin: 0 20px 0 0"
             >组合复选框</nut-checkbox
           >
-          <nut-checkbox v-model="checkbox16" label="2">组合复选框</nut-checkbox>
+          <nut-checkbox label="2">组合复选框</nut-checkbox>
         </nut-checkboxgroup>
       </nut-cell>
       <nut-cell>
@@ -146,14 +131,6 @@ export default createDemo({
       checkbox6: false,
       checkbox7: false,
       checkbox8: false,
-      checkbox9: false,
-      checkbox10: false,
-      checkbox11: false,
-      checkbox12: false,
-      checkbox13: false,
-      checkbox14: false,
-      checkbox15: false,
-      checkbox16: false,
       checkboxgroup1: ['2', '3'],
       checkboxgroup2: ['2'],
       checkboxgroup3: ['2']

+ 7 - 15
src/packages/__VUE/checkbox/doc.md

@@ -89,7 +89,7 @@ setup() {
 值发生变化时,将触发change事件
 
 ```html
-<nut-checkbox v-model="checkbox8" @change="changeBox3">change复选框</nut-checkbox>
+<nut-checkbox v-model="checkbox" @change="changeBox3">change复选框</nut-checkbox>
 ```
 
 ```ts
@@ -109,20 +109,16 @@ setup() {
 
 ```html
 <nut-checkboxgroup v-model="checkboxgroup1">
-  <nut-checkbox v-model="checkbox9" label="1">组合复选框</nut-checkbox>
-  <nut-checkbox v-model="checkbox10" label="2">组合复选框</nut-checkbox>
-  <nut-checkbox v-model="checkbox11" label="3">组合复选框</nut-checkbox>
-  <nut-checkbox v-model="checkbox12" label="4">组合复选框</nut-checkbox>
+  <nut-checkbox label="1">组合复选框</nut-checkbox>
+  <nut-checkbox label="2">组合复选框</nut-checkbox>
+  <nut-checkbox label="3">组合复选框</nut-checkbox>
+  <nut-checkbox label="4">组合复选框</nut-checkbox>
 </nut-checkboxgroup>
 ```
 
 ```ts
 setup() {
   return {
-    checkbox9: false,
-    checkbox10: false,
-    checkbox11: false,
-    checkbox12: false,
     checkboxgroup1: ['2', '3'],
   };
 }
@@ -132,8 +128,8 @@ setup() {
 
 ```html
 <nut-checkboxgroup v-model="checkboxgroup3" ref="group" @change="changeBox4">
-  <nut-checkbox v-model="checkbox15" label="1">组合复选框</nut-checkbox>
-  <nut-checkbox v-model="checkbox16" label="2">组合复选框</nut-checkbox>
+  <nut-checkbox label="1">组合复选框</nut-checkbox>
+  <nut-checkbox label="2">组合复选框</nut-checkbox>
 </nut-checkboxgroup>
 <span class="btn">
   <nut-button type="primary" @click="toggleAll(true)">全选</nut-button>
@@ -152,10 +148,6 @@ setup() {
     (group.value as any).toggleAll(f);
   };
   return {
-    checkbox15: false,
-    checkbox16: false,
-    changeBox4: false,
-    checkbox12: false,
     checkboxgroup3: ['2'],
     group,
     changeBox4,

+ 0 - 4
src/packages/__VUE/checkbox/index.taro.vue

@@ -126,7 +126,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/checkbox/index.vue

@@ -127,7 +127,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss" scoped>
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/circleprogress/index.taro.vue

@@ -207,7 +207,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/circleprogress/index.vue

@@ -103,7 +103,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 2
src/packages/__VUE/col/index.scss

@@ -1,5 +1,3 @@
-@use 'sass:math';
-
 .nut-col {
   float: left;
   box-sizing: border-box;

+ 0 - 4
src/packages/__VUE/col/index.vue

@@ -43,7 +43,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/collapse/index.taro.vue

@@ -124,7 +124,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/collapse/index.vue

@@ -93,7 +93,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/collapseitem/index.taro.vue

@@ -318,7 +318,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import './index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/collapseitem/index.vue

@@ -266,7 +266,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import './index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/countdown/index.taro.vue

@@ -237,7 +237,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/countdown/index.vue

@@ -237,7 +237,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/countup/index.taro.vue

@@ -699,7 +699,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/countup/index.vue

@@ -692,7 +692,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 2
src/packages/__VUE/datepicker/index.taro.vue

@@ -51,5 +51,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss"></style>

+ 0 - 4
src/packages/__VUE/datepicker/index.vue

@@ -317,7 +317,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/dialog/index.taro.vue

@@ -192,7 +192,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/dialog/index.vue

@@ -192,7 +192,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 5
src/packages/__VUE/divider/demo.vue

@@ -39,8 +39,3 @@ export default createDemo({
   }
 });
 </script>
-
-<style lang="scss" scoped>
-.demo {
-}
-</style>

+ 4 - 4
src/packages/__VUE/divider/index.scss

@@ -1,9 +1,9 @@
 .nut-divider {
   display: flex;
   align-items: center;
-  font-size: 28px;
+  font-size: 14px;
   color: #909ca4;
-  margin: 16px 0;
+  margin: 8px 0;
   width: 100%;
 
   &::before,
@@ -18,11 +18,11 @@
   &.nut-divider-left,
   &.nut-divider-right {
     &::before {
-      margin-right: 16px;
+      margin-right: 8px;
     }
 
     &::after {
-      margin-left: 16px;
+      margin-left: 8px;
     }
   }
 

+ 0 - 4
src/packages/__VUE/divider/index.taro.vue

@@ -43,7 +43,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/divider/index.vue

@@ -43,7 +43,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/drag/index.taro.vue

@@ -254,7 +254,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/drag/index.vue

@@ -209,7 +209,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/elevator/index.taro.vue

@@ -210,7 +210,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/elevator/index.vue

@@ -193,7 +193,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss" scoped>
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/fixednav/index.taro.vue

@@ -99,7 +99,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/fixednav/index.vue

@@ -100,7 +100,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/icon/index.taro.vue

@@ -47,7 +47,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/icon/index.vue

@@ -47,7 +47,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/infiniteloading/index.taro.vue

@@ -231,7 +231,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import './index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/infiniteloading/index.vue

@@ -300,7 +300,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 3 - 2
src/packages/__VUE/input/doc.md

@@ -9,12 +9,13 @@
 ``` javascript
 import { createApp } from 'vue';
 // vue
-import { Input } from '@nutui/nutui';
+import { Input,Icon } from '@nutui/nutui';
 // taro
-import { Input } from '@nutui/nutui-taro';
+import { Input,Icon } from '@nutui/nutui-taro';
 
 const app = createApp();
 app.use(Input);
+app.use(Icon);
 
 ```
 ## 代码演示

+ 7 - 1
src/packages/__VUE/input/index.scss

@@ -7,18 +7,24 @@
   border-bottom: 1px solid $input-border-bottom;
   font-size: 14px;
   box-sizing: border-box;
-  input {
+
+  .input-text {
     width: 230px;
     flex: 1;
     padding: 0 10px;
     padding-right: 35px;
+    outline: 0 none;
+    border: 0;
+    text-decoration: none;
   }
+
   &-label {
     width: 80px;
     overflow: hidden;
     display: inline-block;
     text-align: left;
     display: flex;
+
     .label-string {
       overflow: hidden;
       white-space: nowrap;

+ 0 - 4
src/packages/__VUE/input/index.taro.vue

@@ -185,7 +185,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/input/index.vue

@@ -154,7 +154,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/inputnumber/index.taro.vue

@@ -166,7 +166,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/inputnumber/index.vue

@@ -172,7 +172,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 0
src/packages/__VUE/layout/index.scss


+ 0 - 2
src/packages/__VUE/layout/index.taro.vue

@@ -3,5 +3,3 @@ import { createComponent } from '../../utils/create';
 const { create } = createComponent('layout');
 export default create({});
 </script>
-
-<style lang="scss"></style>

+ 0 - 2
src/packages/__VUE/layout/index.vue

@@ -3,5 +3,3 @@ import { createComponent } from '../../utils/create';
 const { create } = createComponent('layout');
 export default create({});
 </script>
-
-<style lang="scss"></style>

+ 0 - 4
src/packages/__VUE/menu/index.vue

@@ -40,7 +40,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/menuitem/index.vue

@@ -157,7 +157,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss" scoped>
-@import './index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/navbar/index.taro.vue

@@ -158,7 +158,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/navbar/index.vue

@@ -156,7 +156,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/noticebar/index.taro.vue

@@ -419,7 +419,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/noticebar/index.vue

@@ -404,7 +404,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/notify/index.taro.vue

@@ -88,7 +88,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/notify/index.vue

@@ -102,7 +102,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/numberkeyboard/index.taro.vue

@@ -251,7 +251,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/numberkeyboard/index.vue

@@ -251,7 +251,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 3
src/packages/__VUE/overlay/index.taro.vue

@@ -82,6 +82,3 @@ export default create({
   }
 });
 </script>
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 3
src/packages/__VUE/overlay/index.vue

@@ -113,6 +113,3 @@ export default create({
   }
 });
 </script>
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/picker/Column.vue

@@ -258,7 +258,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 2
src/packages/__VUE/picker/index.taro.vue

@@ -82,5 +82,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss" scoped></style>

+ 0 - 3
src/packages/__VUE/picker/index.vue

@@ -264,6 +264,3 @@ export default create({
   }
 });
 </script>
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/popup/index.taro.vue

@@ -247,7 +247,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/popup/index.vue

@@ -276,7 +276,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/price/index.taro.vue

@@ -115,7 +115,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/price/index.vue

@@ -104,7 +104,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/progress/index.taro.vue

@@ -146,7 +146,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/progress/index.vue

@@ -139,7 +139,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/pullrefresh/index.vue

@@ -415,7 +415,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/radio/index.taro.vue

@@ -87,7 +87,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/radio/index.vue

@@ -87,7 +87,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/range/index.taro.vue

@@ -319,7 +319,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/range/index.vue

@@ -317,7 +317,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/rate/index.taro.vue

@@ -120,7 +120,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/rate/index.vue

@@ -121,7 +121,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 3
src/packages/__VUE/row/index.vue

@@ -57,6 +57,3 @@ export default create({
   }
 });
 </script>
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/shortpassword/index.taro.vue

@@ -195,7 +195,3 @@ export default create({
   }
 });
 </script>
-
-<style lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 4
src/packages/__VUE/shortpassword/index.vue

@@ -166,7 +166,3 @@ export default create({
   }
 });
 </script>
-
-<style scoped lang="scss">
-@import 'index.scss';
-</style>

+ 0 - 0
src/packages/__VUE/signature/index.taro.vue


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません