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

commitlint.config.js

@@ -5,11 +5,30 @@ module.exports = {
     'footer-leading-blank': [1, 'always'],
     'header-max-length': [2, 'always', 72],
     'scope-case': [2, 'always', 'lower-case'],
-    'subject-case': [2, 'never', ['sentence-case', 'start-case', 'pascal-case', 'upper-case']],
+    'subject-case': [
+      2,
+      'never',
+      ['sentence-case', 'start-case', 'pascal-case', 'upper-case']
+    ],
     'subject-empty': [2, 'never'],
     'subject-full-stop': [2, 'never', '.'],
     'type-case': [2, 'always', 'lower-case'],
     'type-empty': [2, 'never'],
-    'type-enum': [2, 'always', ['upd', 'chore', 'docs', 'feat', 'fix', 'test', 'refactor', 'revert', 'style']]
+    'type-enum': [
+      2,
+      'always',
+      [
+        'upd',
+        'chore',
+        'docs',
+        'feat',
+        'fix',
+        'test',
+        'refactor',
+        'revert',
+        'style',
+        'releases'
+      ]
+    ]
   }
 };

jd/generate-themes.js

@@ -1,37 +1,39 @@
 const config = require('../src/config.json');
 const path = require('path');
 const fs = require('fs-extra');
-let fileStr = `@import './styles/variables.scss';\n`;
-
+let fileStr = `@import '../variables.scss';\n`;
+let tasks = [];
 config.nav.map(item => {
   item.packages.forEach(element => {
     let folderName = element.name.toLowerCase();
-    fileStr += `@import './packages/${folderName}/index.scss';\n`;
-    fs.copy(
-      path.resolve(__dirname, `../src/packages/${folderName}/index.scss`),
-      path.resolve(__dirname, `../dist/packages/${folderName}/index.scss`)
+    tasks.push(
+      fs
+        .copy(
+          path.resolve(__dirname, `../src/packages/${folderName}/index.scss`),
+          path.resolve(__dirname, `../dist/packages/${folderName}/index.scss`)
+        )
+        .then(success => {
+          fileStr += `@import '../../packages/${folderName}/index.scss';\n`;
+        })
+        .catch(error => {})
     );
   });
 });
-const filterFunc = (src, dest) => {
-  // your logic here
-  // it will be copied if return true
-  return !src.includes('font');
-};
-fs.copy(
-  path.resolve(__dirname, '../src/styles'),
-  path.resolve(__dirname, '../dist/styles'),
-  { filter: filterFunc },
-  err => {
-    if (err) return console.error(err);
-    // console.log('success!')
-  }
-);
-fs.outputFile(
-  path.resolve(__dirname, '../dist/themes.scss'),
-  fileStr,
-  'utf8',
-  error => {
-    // logger.success(`文件写入成功`);
-  }
+
+tasks.push(
+  fs.copy(
+    path.resolve(__dirname, '../src/styles'),
+    path.resolve(__dirname, '../dist/styles')
+  )
 );
+
+Promise.all(tasks).then(res => {
+  fs.outputFile(
+    path.resolve(__dirname, '../dist/styles/themes/default.scss'),
+    fileStr,
+    'utf8',
+    error => {
+      // logger.success(`文件写入成功`);
+    }
+  );
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "3.0.0-beta.7",
+  "version": "3.0.0-beta.8",
   "npm": {
     "tag": "beta"
   },

src/config.json

@@ -257,7 +257,16 @@
           "type": "component",
           "show": true,
           "desc": "轮播",
-          "author": "ailululu"
+          "author": "suzigang"
+        },
+        {
+          "name": "SwiperItem",
+          "sort": 6,
+          "cName": "轮播图子组件",
+          "type": "component",
+          "show": false,
+          "desc": "轮播图子组件",
+          "author": "suzigang"
         },
         {
           "name": "Avatar",
@@ -416,6 +425,15 @@
           "author": "Drjingfubo"
         },
         {
+          "name": "Tabbaritem",
+          "sort": 2,
+          "cName": "标签栏子组件",
+          "type": "component",
+          "show": false,
+          "desc": "标签栏子组件",
+          "author": "Drjingfubo"
+        },
+        {
           "version": "3.0.0",
           "name": "NoticeBar",
           "type": "component",
@@ -476,7 +494,17 @@
           "desc": "日历组件",
           "sort": 5,
           "show": true,
-          "author": ""
+          "author": "songchenglin1"
+        },
+        {
+          "version": "3.0.0",
+          "name": "CalendarItem",
+          "type": "component",
+          "cName": "日历子组件",
+          "desc": "日历子组件",
+          "sort": 5,
+          "show": false,
+          "author": "songchenglin1"
         },
         {
           "version": "3.0.0",