Browse Source

tab兼容

zhenyulei 5 years ago
parent
commit
b322687fbb
2 changed files with 6 additions and 3 deletions
  1. 1 1
      package.json
  2. 5 2
      src/packages/tab/tab.vue

+ 1 - 1
package.json

@@ -27,7 +27,7 @@
         "clear": "node scripts/clearCache.js",
         "clear": "node scripts/clearCache.js",
         "eslint": "eslint src/packages/**/*.{js,vue}",
         "eslint": "eslint src/packages/**/*.{js,vue}",
         "add": "node scripts/createCptTpl.js",
         "add": "node scripts/createCptTpl.js",
-        "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text  mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js src/packages/*/__test__/**.spec.js",
+        "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text  mocha-webpack --webpack-config build/webpack.test.conf.js --require test/setup.js src/packages/tabSelect/__test__/**.spec.js",
         "coveralls": "cat ./coverage/lcov.info | coveralls",
         "coveralls": "cat ./coverage/lcov.info | coveralls",
         "test:watch": "npm run test --watch"
         "test:watch": "npm run test --watch"
     },
     },

+ 5 - 2
src/packages/tab/tab.vue

@@ -201,10 +201,13 @@ export default {
             
             
         },
         },
         getStyle:function(obj,styleName){
         getStyle:function(obj,styleName){
+            if(!obj){
+                return ''
+            }
             if(obj.currentStyle){
             if(obj.currentStyle){
-            return obj.currentStyle[styleName];
+                return obj.currentStyle[styleName];
             }else{
             }else{
-            return getComputedStyle(obj,null)[styleName];
+                return getComputedStyle(obj,null)[styleName];
             }
             }
         },
         },
         getTabWidth:function(){
         getTabWidth:function(){