Merge branch 'v2-dev' of https://github.com/jdf2e/nutui into v2-dev

xf2021 · Jul 20, 2020 · 6418075 · 6418075
2 parents 3105e17 + 443baa4
commit 6418075
Show file tree

Hide file tree

Showing 26 changed files with 526 additions and 306 deletions.
diff --git a/eslint-config.js b/eslint-config.js
diff --git a/package.json b/package.json
@@ -19,15 +19,17 @@
     "add": "nutui-cli add",
     "test": "cross-env NODE_ENV=test nyc mocha-webpack --webpack-config node_modules/@nutui/cli/dist_cli/webpack/test.config.js  --require node_modules/@nutui/cli/dist_cli/test/setup.js src/packages/*/__test__/**.spec.js",
     "coveralls": "cat ./coverage/lcov.info | coveralls",
-    "test:watch": "npm run test --watch",
-    "prettier:fix": "prettier --write src/**/*.{ts,js,vue,scss}"
+    "test:watch": "npm run test --watch"
   },
   "husky": {
     "hooks": {
-      "pre-commit": "node ./scripts/verifymail.js",
+      "pre-commit": "node ./scripts/verifymail.js && lint-staged",
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
+  "lint-staged": {
+    "*.{ts,js,vue,scss}": "prettier --write"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/jdf2e/nutui.git"
@@ -62,14 +64,15 @@
     "vue": "^2.6.10"
   },
   "devDependencies": {
-    "@nutui/cli": "^0.3.3",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
+    "@nutui/cli": "^0.3.5",
     "@typescript-eslint/eslint-plugin": "^2.16.0",
     "@typescript-eslint/parser": "^2.16.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "eslint-plugin-import": "^2.20.0",
     "eslint-plugin-vue": "^6.1.2",
+    "lint-staged": "^10.2.11",
     "stylelint-config-standard": "^19.0.0"
   },
   "nyc": {

diff --git a/src/config.json b/src/config.json
@@ -509,8 +509,8 @@
     {
       "version": "1.0.0",
       "name": "TabSelect",
-      "chnName": "分类选择",
-      "desc": "两级分类选择",
+      "chnName": "配送时间",
+      "desc": "两级配送时间",
       "type": "component",
       "sort": "6",
       "showDemo": true,

diff --git a/src/packages/actionsheet/actionsheet.vue b/src/packages/actionsheet/actionsheet.vue
@@ -82,19 +82,19 @@ export default {
         if (value) {
           document.body.classList.add('nut-overflow-hidden');
         } else {
-          this.remolveLockScrool();
+          this.removeLockScrool();
         }
       }
     }
   },
   deactivated() {
-    this.remolveLockScroll();
+    this.removeLockScroll();
   },
   destroyed() {
-    this.remolveLockScroll();
+    this.removeLockScroll();
   },
   methods: {
-    remolveLockScroll() {
+    removeLockScroll() {
       document.body.classList.remove('nut-overflow-hidden');
     },
     isHighlight(item) {

diff --git a/src/packages/address/address.vue b/src/packages/address/address.vue
@@ -241,6 +241,7 @@ export default {
         calBack.next = this.tabName[this.tabIndex];
         calBack.value = item;
         this.$emit('onChange', calBack);
+        this.$emit('on-change', calBack);
       } else {
         this.handClose();
       }
@@ -308,6 +309,7 @@ export default {
         this.$emit('close', res);
       } else {
         this.$emit('closeMask', { closeWay: this.closeWay });
+        this.$emit('close-mask', { closeWay: this.closeWay });
       }
 
       setTimeout(() => {
@@ -345,6 +347,7 @@ export default {
       this.initAddress();
 
       this.$emit('switchModule', { type: this.showModule });
+      this.$emit('switch-module', { type: this.showModule });
     }
   }
 };

diff --git a/src/packages/countup/countup.scss b/src/packages/countup/countup.scss
@@ -1,50 +1,59 @@
-.nut-countup{
-    display:inline-block;
-    width: 100%;
-    padding:5px;
-    color: #000;
-	font-weight:bold;
-	// text-align:center;
-    .run-number{
-        margin: 0 auto;
-        padding: 0;
-        overflow: hidden;
-        height: 50px;
-        line-height: 50px;
-        text-align: center;
-        font-weight: bold;
-        position: relative;
-        li {
-            position: absolute;
-            transition: none;
-            // transition: all linear .1s;
-            // animation: myMove 1s linear infinite;
-            // animation-fill-mode: forwards;
-            // @keyframes myMove {
-            //     0% {
-            //       transform: translateY(0);
-            //     }
-            //     100% {
-            //       transform: translateY(-50px);
-            //     }
-            // }
-            span {
-                display: block;
-            }
-        }
-    }
-    .pointstyl {
-        position: absolute;
+.nut-countup {
+  display: inline-block;
+  width: 100%;
+  padding: 5px;
+  color: #000;
+  font-weight: bold;
+  // text-align:center;
+  .run-number {
+    margin: 0 auto;
+    padding: 0;
+    overflow: hidden;
+    height: 50px;
+    line-height: 50px;
+    text-align: center;
+    font-weight: bold;
+    position: relative;
+    li {
+      position: absolute;
+      transition: none;
+      // transition: all linear .1s;
+      // animation: myMove 1s linear infinite;
+      // animation-fill-mode: forwards;
+      // @keyframes myMove {
+      //     0% {
+      //       transform: translateY(0);
+      //     }
+      //     100% {
+      //       transform: translateY(-50px);
+      //     }
+      // }
+      span {
         display: block;
+      }
+    }
+  }
+  .pointstyl {
+    position: absolute;
+    display: block;
+  }
+  .run-number-machine-img {
+    overflow: hidden;
+    li {
+      float: left;
+      background-position: center 0;
+      background-repeat: repeat-y;
+      background-attachment: scroll;
     }
-    .run-number-img {
-        position: relative;
-        li {
-            position: absolute;
-            transition: none;
-            display: inline-block;
-            background-position: 0 0;
-            background-repeat: no-repeat;
-        }
+  }
+  .run-number-img {
+    position: relative;
+    li {
+      position: absolute;
+      transition: none;
+      display: inline-block;
+      background-position: 0 0;
+      background-repeat: no-repeat;
     }
-}
+  }
+}