Merge remote-tracking branch 'origin/v2'

Author: richard1015

.postcssrc.js

@@ -2,6 +2,8 @@ module.exports = {
   plugins: {
     'postcss-import': {},
     'postcss-url': {},
-    autoprefixer: {}
+    autoprefixer: {
+      overrideBrowserslist: ['last 20 versions'] 
+    }
   }
 };

CHANGELOG.md

@@ -1,3 +1,21 @@
+## 2.2.7
+
+`2020-07-09`
+
+* :sparkles: feat(FixedNav)：新增悬浮导航组件 @richard1015
+* :sparkles: feat(Notify)：新增通知组件 @shenqistart
+* :sparkles: feat(CountUp)：新增数字滚动组件 @Ymm0008
+* :sparkles: upd(Elevator)：优化电梯组件 @zhenyulei
+* :sparkles: upd(NoticeBar)：重构优化内部代码 @shenqistart
+* :bug: fix(Rate)：修复props 数据监听问题 @yushuang
+* :bug: fix(TextBox)： 修复文本域初始化字数展示问题 @guoxiao158
+* :bug: fix(Dialog)：滚动模式bug修复、新增close关闭事件 @guoxiao158
+* :bug: fix(Stepper)：判断max小于min的情况 @yangxiaolu1993
+* :bug: fix(Address): 地址组件点击左上角返回问题,支持自定义图标 @yangxiaolu1993
+* :bug: fix(Drag)：优化拖拽组件demo显示问题 @zy19940510 @richard1015
+* :bug: fix(Switch)：修复内嵌文字居中 @zjyau
+* :bug: fix(Datepicker)修复设置起止范围，如月份是个位数(1-9月)，天数的开始条件无效问题 @zjyau
+
 ## 2.2.6
 
 `2020-06-19`

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "description": "一套轻量级移动端Vue组件库",
   "typings": "dist/types/index.d.ts",
   "main": "dist/nutui.js",
@@ -20,7 +20,7 @@
     "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/**/*.{js,vue,scss}"
+    "prettier:fix": "prettier --write src/**/*.{ts,js,vue,scss}"
   },
   "husky": {
     "hooks": {
@@ -38,7 +38,8 @@
     "webpack",
     "vue component",
     "jdc",
-    "jdcfe"
+    "jdcfe",
+    "jdl"
   ],
   "author": "jdcfe",
   "license": "MIT",
@@ -48,9 +49,10 @@
     "@babel/plugin-transform-runtime": "^7.9.6",
     "@commitlint/cli": "^8.0.0",
     "@commitlint/config-conventional": "^8.0.0",
-    "@nutui/cli": "^0.2.2",
+    "autoprefixer": "^9.8.4",
     "babel-plugin-istanbul": "^6.0.0",
     "gsap": "^3.2.6",
+    "hammerjs": "^2.0.8",
     "husky": "^3.0.0",
     "vue-lazyload": "^1.3.3",
     "vue-qr": "^2.2.1"
@@ -59,6 +61,7 @@
     "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",
     "@typescript-eslint/eslint-plugin": "^2.16.0",

src/assets/svg/back.svg

@@ -1,13 +1,5 @@
 {
-  "sorts": [
-    "数据展示",
-    "数据录入",
-    "操作反馈",
-    "导航组件",
-    "布局组件",
-    "基础组件",
-    "业务组件"
-  ],
+  "sorts": ["数据展示", "数据录入", "操作反馈", "导航组件", "布局组件", "基础组件", "业务组件"],
   "packages": [
     {
       "name": "Cell",
@@ -635,13 +627,31 @@
     },
     {
       "version": "1.0.0",
+      "name": "Notify",
+      "type": "method",
+      "chnName": "展示消息提示",
+      "desc": "在页面顶部展示消息提示，支持函数调用和组件调用两种方式",
+      "sort": "2",
+      "showDemo": true,
+      "author": "wangyue217"
+    },
+    {
       "name": "CountUp",
       "type": "component",
       "chnName": "数字滚动",
       "desc": "用于数据展示",
       "sort": "0",
       "showDemo": true,
       "author": "yumingming"
+    },
+    {
+      "name": "FixedNav",
+      "type": "component",
+      "chnName": "悬浮导航",
+      "desc": "拖拽导航",
+      "sort": "3",
+      "showDemo": true,
+      "author": "richard1015"
     }
   ]
-}
+}

src/assets/svg/close.svg

@@ -4,7 +4,7 @@ import znCH from './lang/zn-CH';
 let defaultMessages = {};
 
 let merged = false;
-const vueI18nHandler = function () {
+const vueI18nHandler = function() {
   const vuei18n = Object.getPrototypeOf(this || Vue).$t;
   if (typeof vuei18n === 'function' && !!Vue.locale) {
     if (!merged) {
@@ -57,7 +57,7 @@ function getArgType(arg) {
 function simpleTemplate(templ, conf) {
   let pars = templ && templ.match(/{.+?}/g);
   if (pars && conf) {
-    pars = pars.map((p) => p.replace(/\{\s*(\w+|\d+).*?\}/, '$1'));
+    pars = pars.map(p => p.replace(/\{\s*(\w+|\d+).*?\}/, '$1'));
     pars.forEach((c, i) => {
       let reg = new RegExp('{\\s*' + c + '\\s*(?:=\\s*(\\S*?))?\\s*?}', 'g');
       templ = templ.replace(reg, (a, b) => {

src/assets/svg/notice.svg

@@ -41,7 +41,7 @@ const TouchMixin = Vue.extend({
       this.deltaY = 0;
       this.offsetX = 0;
       this.offsetY = 0;
-    },
-  },
+    }
+  }
 });
 export default TouchMixin;

src/config.json

@@ -119,13 +119,20 @@ import './packages/subsidenavbar/subsidenavbar.scss';
 import SideNavBarItem from './packages/sidenavbaritem/index.js';
 import './packages/sidenavbaritem/sidenavbaritem.scss';
 import Drag from './packages/drag/index.js';
-import './packages/drag/drag.scss'; // import VueQr from "./packages/qart/index.js";
+import './packages/drag/drag.scss'; 
+// import VueQr from "./packages/qart/index.js";
 // import "./packages/qart/qart.scss";
 
 import Address from './packages/address/index.js';
 import './packages/address/address.scss';
-import CountUp from "./packages/countup/index.js";
-import "./packages/countup/countup.scss";
+import Notify from './packages/notify/index.js';
+import './packages/notify/notify.scss';
+import CountUp from './packages/countup/index.js';
+import './packages/countup/countup.scss';
+import FixedNav from './packages/fixednav/index.js';
+import './packages/fixednav/fixednav.scss';
+// import Gesture from './packages/gesture/index.js';
+// import './packages/gesture/gesture.scss';
 
 const packages = {
   Cell,
@@ -176,19 +183,22 @@ const packages = {
   Elevator,
   Popup,
   LeftSlip,
-  TabSelect: TabSelect,
-  LuckDraw: LuckDraw,
-  Video: Video,
-  Signature: Signature,
-  CircleProgress: CircleProgress,
-  TimeLine: TimeLine,
-  TimeLineItem: TimeLineItem,
-  SideNavBar: SideNavBar,
-  SubSideNavBar: SubSideNavBar,
-  SideNavBarItem: SideNavBarItem,
-  Drag: Drag,
-  Address: Address,
-  CountUp: CountUp
+  TabSelect,
+  LuckDraw,
+  Video,
+  Signature,
+  CircleProgress,
+  TimeLine,
+  TimeLineItem,
+  SideNavBar,
+  SubSideNavBar,
+  SideNavBarItem,
+  Drag,
+  Address,
+  Notify,
+  CountUp,
+  FixedNav,
+  // Gesture: Gesture
 };
 
 const components = {};
@@ -216,7 +226,7 @@ pkgList.map(item => {
   }
 });
 
-const install = function (Vue, opts = {}) {
+const install = function(Vue, opts = {}) {
   if (install.installed) return;
 
   if (opts.locale) {
@@ -272,4 +282,4 @@ export default {
   ...filters,
   ...directives,
   ...methods
-};
+};

src/locales/index.js

@@ -33,44 +33,44 @@ export default {
   props: {
     isAnimation: {
       type: Boolean,
-      default: true,
+      default: true
     },
     isLockBgScroll: {
       type: Boolean,
-      default: false,
+      default: false
     },
     isVisible: {
       type: Boolean,
-      default: false,
+      default: false
     },
     isShowMask: {
       type: Boolean,
-      default: true,
+      default: true
     },
     isClickChooseClose: {
       type: Boolean,
-      default: true,
+      default: true
     },
     isClickCloseMask: {
       type: Boolean,
-      default: true,
+      default: true
     },
     cancelTxt: {
       type: String,
-      default: '',
+      default: ''
     },
     optionTag: {
       type: String,
-      default: 'name',
+      default: 'name'
     },
     chooseTagValue: {
       type: String,
-      default: '',
+      default: ''
     },
     menuItems: {
       type: Array,
-      default: () => [],
-    },
+      default: () => []
+    }
   },
   data() {
     return {};
@@ -82,12 +82,21 @@ export default {
         if (value) {
           document.body.classList.add('nut-overflow-hidden');
         } else {
-          document.body.classList.remove('nut-overflow-hidden');
+          this.remolveLockScrool();
         }
       }
-    },
+    }
+  },
+  deactivated() {
+    this.remolveLockScroll();
+  },
+  destroyed() {
+    this.remolveLockScroll();
   },
   methods: {
+    remolveLockScroll() {
+      document.body.classList.remove('nut-overflow-hidden');
+    },
     isHighlight(item) {
       return (this.chooseTagValue && this.chooseTagValue == item[this.optionTag]) || this.chooseTagValue === 0;
     },
@@ -112,7 +121,7 @@ export default {
         }
         this.$emit('choose', item, index);
       }
-    },
-  },
+    }
+  }
 };
 </script>