diff --git a/.eslintrc b/.eslintrc index 64dba327a..c4b23b207 100644 --- a/.eslintrc +++ b/.eslintrc @@ -3,21 +3,19 @@ "env": { "jest": true }, - "extends": ["plugin:vue-libs/recommended", "plugin:vue/strongly-recommended"], + "extends": ["plugin:vue-libs/recommended", "plugin:vue/recommended"], "rules": { "semi": ["error", "always"], "space-before-function-paren": ["error", "never"], + "vue/attributes-order": 0, "vue/require-v-for-key": 0, "vue/require-default-prop": 0, - "vue/name-property-casing": 0, - "vue/max-attributes-per-line": [ - 2, + "vue/name-property-casing": ["error", "kebab-case"], + "vue/html-closing-bracket-newline": [ + "error", { - "singleline": 5, - "multiline": { - "max": 5, - "allowFirstLine": false - } + "singleline": "never", + "multiline": "always" } ] } diff --git a/package.json b/package.json index 01291d23b..7734431f2 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "cross-env": "^5.2.0", "css-loader": "^1.0.1", "dependency-tree": "^6.2.1", - "eslint": "^5.8.0", + "eslint": "^5.9.0", "eslint-plugin-vue-libs": "^3.0.0", "fast-glob": "^2.2.3", "fast-vue-md-loader": "^1.0.3", diff --git a/packages/actionsheet/demo/index.vue b/packages/actionsheet/demo/index.vue index 834dc456e..2136a089f 100644 --- a/packages/actionsheet/demo/index.vue +++ b/packages/actionsheet/demo/index.vue @@ -2,7 +2,11 @@ {{ $t('button1') }} - + @@ -18,7 +22,10 @@ {{ $t('button3') }} - +

{{ $t('content') }}

diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue index 706d37a83..2791fb102 100644 --- a/packages/actionsheet/index.vue +++ b/packages/actionsheet/index.vue @@ -1,11 +1,25 @@