tweak

2019-03-17 17:21:46 +08:00
parent d38490d50d
commit 487078a119
31 changed files with 82 additions and 56 deletions
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -21,20 +21,8 @@ module.exports = {
        "allowFirstLine": false
      }
    }],
-    "vue/html-closing-bracket-newline": ["error", {
-      "singleline": "never",
-      "multiline": "never"
-    }],
-    "vue/singleline-html-element-content-newline": ["error", {
-      "ignoreWhenNoAttributes": true,
-      "ignoreWhenEmpty": true,
-      "ignores": ["a", "abbr", "audio", "b", "bdi", "bdo", "canvas", "cite", "code", "data", "del", "dfn", "em", "i", "iframe", "ins", "kbd", "label", "map", "mark", "noscript", "object", "output", "picture", "q", "ruby", "s", "samp", "small", "span", "strong", "sub", "sup", "svg", "time", "u", "var", "video", "div"]
-    }],
-    "vue/multiline-html-element-content-newline": ["error", {
-      "ignoreWhenEmpty": true,
-      "ignores": ["a", "abbr", "audio", "b", "bdi", "bdo", "canvas", "cite", "code", "data", "del", "dfn", "em", "i", "iframe", "ins", "kbd", "label", "map", "mark", "noscript", "object", "output", "picture", "q", "ruby", "s", "samp", "small", "span", "strong", "sub", "sup", "svg", "time", "u", "var", "video"],
-      "allowEmptyLines": true
-    }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline":"off",
    "vue/name-property-casing": ["error", "PascalCase"],
    'accessor-pairs': 2,
    'arrow-spacing': [2, {
--- a/package.json
+++ b/package.json
@@ -80,10 +80,10 @@
    "copy-webpack-plugin": "4.5.2",
    "cross-env": "5.2.0",
    "css-loader": "1.0.0",
-    "eslint": "^5.15.1",
-    "eslint-friendly-formatter": "^4.0.1",
-    "eslint-loader": "^2.1.2",
-    "eslint-plugin-vue": "^5.2.2",
+    "eslint": "5.15.2",
+    "eslint-friendly-formatter": "4.0.1",
+    "eslint-loader": "2.1.2",
+    "eslint-plugin-vue": "5.2.2",
    "file-loader": "1.1.11",
    "friendly-errors-webpack-plugin": "1.7.0",
    "hash-sum": "1.0.2",
--- a/src/components/GithubCorner/index.vue
+++ b/src/components/GithubCorner/index.vue
@@ -5,17 +5,20 @@
      height="80"
      viewBox="0 0 250 250"
      style="fill:#40c9c6; color:#fff;"
-      aria-hidden="true">
+      aria-hidden="true"
+    >
      <path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z" />
      <path
        d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2"
        fill="currentColor"
        style="transform-origin: 130px 106px;"
-        class="octo-arm" />
+        class="octo-arm"
+      />
      <path
        d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z"
        fill="currentColor"
-        class="octo-body" />
+        class="octo-body"
+      />
    </svg>
  </a>
 </template>
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -6,7 +6,8 @@
      viewBox="0 0 1024 1024"
      xmlns="http://www.w3.org/2000/svg"
      width="64"
-      height="64">
+      height="64"
+    >
      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
    </svg>
  </div>
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -10,7 +10,8 @@
      remote
      placeholder="Search"
      class="header-search-select"
-      @change="change">
+      @change="change"
+    >
      <el-option v-for="item in options" :key="item.path" :value="item" :label="item.title.join(' > ')" />
    </el-select>
  </div>
--- a/src/components/ImageCropper/index.vue
+++ b/src/components/ImageCropper/index.vue
@@ -48,7 +48,8 @@
                @mousedown="imgStartMove"
                @mousemove="imgMove"
                @mouseup="createImg"
-                @mouseout="createImg">
+                @mouseout="createImg"
+              >
              <div :style="sourceImgShadeStyle" class="vicp-img-shade vicp-img-shade-1" />
              <div :style="sourceImgShadeStyle" class="vicp-img-shade vicp-img-shade-2" />
            </div>
--- a/src/components/Kanban/index.vue
+++ b/src/components/Kanban/index.vue
@@ -6,7 +6,8 @@
    <draggable
      :list="list"
      :options="options"
-      class="board-column-content">
+      class="board-column-content"
+    >
      <div v-for="element in list" :key="element.id" class="board-item">
        {{ element.name }} {{ element.id }}
      </div>
--- a/src/components/MDinput/index.vue
+++ b/src/components/MDinput/index.vue
@@ -15,7 +15,8 @@
        class="material-input"
        @focus="handleMdFocus"
        @blur="handleMdBlur"
-        @input="handleModelInput">
+        @input="handleModelInput"
+      >
      <input
        v-if="type === 'url'"
        v-model="currentValue"
@@ -29,7 +30,8 @@
        class="material-input"
        @focus="handleMdFocus"
        @blur="handleMdBlur"
-        @input="handleModelInput">
+        @input="handleModelInput"
+      >
      <input
        v-if="type === 'number'"
        v-model="currentValue"
@@ -48,7 +50,8 @@
        class="material-input"
        @focus="handleMdFocus"
        @blur="handleMdBlur"
-        @input="handleModelInput">
+        @input="handleModelInput"
+      >
      <input
        v-if="type === 'password'"
        v-model="currentValue"
@@ -64,7 +67,8 @@
        class="material-input"
        @focus="handleMdFocus"
        @blur="handleMdBlur"
-        @input="handleModelInput">
+        @input="handleModelInput"
+      >
      <input
        v-if="type === 'tel'"
        v-model="currentValue"
@@ -78,7 +82,8 @@
        class="material-input"
        @focus="handleMdFocus"
        @blur="handleMdBlur"
-        @input="handleModelInput">
+        @input="handleModelInput"
+      >
      <input
        v-if="type === 'text'"
        v-model="currentValue"
@@ -94,7 +99,8 @@
        class="material-input"
        @focus="handleMdFocus"
        @blur="handleMdBlur"
-        @input="handleModelInput">
+        @input="handleModelInput"
+      >
      <span class="material-input-bar" />
      <label class="material-label">
        <slot />
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -9,7 +9,8 @@
      :total="total"
      v-bind="$attrs"
      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange" />
+      @current-change="handleCurrentChange"
+    />
  </div>
 </template>

--- a/src/components/ThemePicker/index.vue
+++ b/src/components/ThemePicker/index.vue
@@ -2,7 +2,8 @@
  <el-color-picker
    v-model="theme"
    class="theme-picker"
-    popper-class="theme-picker-dropdown" />
+    popper-class="theme-picker-dropdown"
+  />
 </template>

 <script>
--- a/src/components/Tinymce/components/editorImage.vue
+++ b/src/components/Tinymce/components/editorImage.vue
@@ -13,7 +13,8 @@
        :before-upload="beforeUpload"
        class="editor-slide-upload"
        action="https://httpbin.org/post"
-        list-type="picture-card">
+        list-type="picture-card"
+      >
        <el-button size="small" type="primary">点击上传</el-button>
      </el-upload>
      <el-button @click="dialogVisible = false">取 消</el-button>
--- a/src/components/Upload/singleImage.vue
+++ b/src/components/Upload/singleImage.vue
@@ -7,7 +7,8 @@
      :on-success="handleImageSuccess"
      class="image-uploader"
      drag
-      action="https://httpbin.org/post">
+      action="https://httpbin.org/post"
+    >
      <i class="el-icon-upload" />
      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
    </el-upload>
--- a/src/components/Upload/singleImage2.vue
+++ b/src/components/Upload/singleImage2.vue
@@ -7,7 +7,8 @@
      :on-success="handleImageSuccess"
      class="image-uploader"
      drag
-      action="https://httpbin.org/post">
+      action="https://httpbin.org/post"
+    >
      <i class="el-icon-upload" />
      <div class="el-upload__text">Drag或<em>点击上传</em></div>
    </el-upload>
--- a/src/components/Upload/singleImage3.vue
+++ b/src/components/Upload/singleImage3.vue
@@ -7,7 +7,8 @@
      :on-success="handleImageSuccess"
      class="image-uploader"
      drag
-      action="https://httpbin.org/post">
+      action="https://httpbin.org/post"
+    >
      <i class="el-icon-upload" />
      <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
    </el-upload>
--- a/src/views/components-demo/avatarUpload.vue
+++ b/src/views/components-demo/avatarUpload.vue
@@ -19,7 +19,8 @@
      url="https://httpbin.org/post"
      lang-type="en"
      @close="close"
-      @crop-upload-success="cropSuccess" />
+      @crop-upload-success="cropSuccess"
+    />
  </div>
 </template>

--- a/src/views/components-demo/countTo.vue
+++ b/src/views/components-demo/countTo.vue
@@ -13,7 +13,8 @@
      :prefix="_prefix"
      :suffix="_suffix"
      :autoplay="false"
-      class="example" />
+      class="example"
+    />
    <div style="margin-left: 25%;margin-top: 40px;">
      <label class="label" for="startValInput">startVal:
        <input v-model.number="setStartVal" type="number" name="startValInput">
--- a/src/views/components-demo/markdown.vue
+++ b/src/views/components-demo/markdown.vue
@@ -22,7 +22,8 @@
      <markdown-editor
        ref="markdownEditor"
        v-model="content"
-        :options="{ toolbarItems: ['heading','bold','italic']}" />
+        :options="{ toolbarItems: ['heading','bold','italic']}"
+      />
    </div>

    <div class="editor-container">
--- a/src/views/dashboard/admin/components/TodoList/Todo.vue
+++ b/src/views/dashboard/admin/components/TodoList/Todo.vue
@@ -5,7 +5,8 @@
        :checked="todo.done"
        class="toggle"
        type="checkbox"
-        @change="toggleTodo( todo)">
+        @change="toggleTodo( todo)"
+      >
      <label @dblclick="editing = true" v-text="todo.text" />
      <button class="destroy" @click="deleteTodo( todo )" />
    </div>
@@ -16,7 +17,8 @@
      class="edit"
      @keyup.enter="doneEdit"
      @keyup.esc="cancelEdit"
-      @blur="doneEdit">
+      @blur="doneEdit"
+    >
  </li>
 </template>

--- a/src/views/dashboard/admin/components/TodoList/index.vue
+++ b/src/views/dashboard/admin/components/TodoList/index.vue
@@ -15,7 +15,8 @@
          :todo="todo"
          @toggleTodo="toggleTodo"
          @editTodo="editTodo"
-          @deleteTodo="deleteTodo" />
+          @deleteTodo="deleteTodo"
+        />
      </ul>
    </section>
    <!-- footer -->
--- a/src/views/example/components/ArticleDetail.vue
+++ b/src/views/example/components/ArticleDetail.vue
@@ -48,7 +48,8 @@
                      :colors="['#99A9BF', '#F7BA2A', '#FF9900']"
                      :low-threshold="1"
                      :high-threshold="3"
-                      style="margin-top:8px;" />
+                      style="margin-top:8px;"
+                    />
                  </el-form-item>
                </el-col>
              </el-row>
--- a/src/views/example/components/Warning.vue
+++ b/src/views/example/components/Warning.vue
@@ -4,7 +4,8 @@
    的include，直接缓存所有页面。详情见
    <a
      href="https://panjiachen.github.io/vue-element-admin-site/guide/essentials/tags-view.html"
-      target="_blank">文档</a>
+      target="_blank"
+    >文档</a>
  </p>
 </template>

--- a/src/views/excel/components/BookTypeOption.vue
+++ b/src/views/excel/components/BookTypeOption.vue
@@ -6,7 +6,8 @@
        v-for="item in options"
        :key="item"
        :label="item"
-        :value="item" />
+        :value="item"
+      />
    </el-select>
  </div>
 </template>
--- a/src/views/excel/selectExcel.vue
+++ b/src/views/excel/selectExcel.vue
@@ -14,7 +14,8 @@
      border
      fit
      highlight-current-row
-      @selection-change="handleSelectionChange">
+      @selection-change="handleSelectionChange"
+    >
      <el-table-column type="selection" align="center" />
      <el-table-column align="center" label="Id" width="95">
        <template slot-scope="scope">
--- a/src/views/i18n-demo/index.vue
+++ b/src/views/i18n-demo/index.vue
@@ -26,7 +26,8 @@
              v-for="item in options"
              :key="item.value"
              :label="item.label"
-              :value="item.value" />
+              :value="item.value"
+            />
          </el-select>
        </div>
        <div class="block">
--- a/src/views/layout/components/Sidebar/SidebarItem.vue
+++ b/src/views/layout/components/Sidebar/SidebarItem.vue
@@ -19,7 +19,8 @@
        :is-nest="true"
        :item="child"
        :base-path="resolvePath(child.path)"
-        class="nest-menu" />
+        class="nest-menu"
+      />
    </el-submenu>

  </div>
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -6,7 +6,8 @@
      :background-color="variables.menuBg"
      :text-color="variables.menuText"
      :active-text-color="variables.menuActiveText"
-      mode="vertical">
+      mode="vertical"
+    >
      <sidebar-item v-for="route in permission_routers" :key="route.path" :item="route" :base-path="route.path" />
    </el-menu>
  </el-scrollbar>
--- a/src/views/layout/components/TagsView/index.vue
+++ b/src/views/layout/components/TagsView/index.vue
@@ -10,7 +10,8 @@
        tag="span"
        class="tags-view-item"
        @click.middle.native="closeSelectedTag(tag)"
-        @contextmenu.prevent.native="openMenu(tag,$event)">
+        @contextmenu.prevent.native="openMenu(tag,$event)"
+      >
        {{ generateTitle(tag.title) }}
        <span v-if="!tag.meta.affix" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
      </router-link>
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -17,7 +17,8 @@
          :placeholder="$t('login.username')"
          name="username"
          type="text"
-          auto-complete="on" />
+          auto-complete="on"
+        />
      </el-form-item>

      <el-form-item prop="password">
@@ -30,7 +31,8 @@
          :placeholder="$t('login.password')"
          name="password"
          auto-complete="on"
-          @keyup.enter.native="handleLogin" />
+          @keyup.enter.native="handleLogin"
+        />
        <span class="show-pwd" @click="showPwd">
          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
        </span>
--- a/src/views/tab/components/tabPane.vue
+++ b/src/views/tab/components/tabPane.vue
@@ -6,7 +6,8 @@
      align="center"
      label="ID"
      width="65"
-      element-loading-text="请给我点时间！">
+      element-loading-text="请给我点时间！"
+    >
      <template slot-scope="scope">
        <span>{{ scope.row.id }}</span>
      </template>
--- a/src/views/table/complexTable.vue
+++ b/src/views/table/complexTable.vue
@@ -25,7 +25,8 @@
      fit
      highlight-current-row
      style="width: 100%;"
-      @sort-change="sortChange">
+      @sort-change="sortChange"
+    >
      <el-table-column :label="$t('table.id')" prop="id" sortable="custom" align="center" width="65">
        <template slot-scope="scope">
          <span>{{ scope.row.id }}</span>
--- a/src/views/table/treeTable/customTreeTable.vue
+++ b/src/views/table/treeTable/customTreeTable.vue
@@ -20,7 +20,8 @@
                :style="{ width:scope.row._width * 500+'px',
                          background:scope.row._width>0.5?'rgba(233,0,0,.5)':'rgba(0,0,233,0.5)',
                          marginLeft:scope.row._marginLeft * 500+'px' }"
-                class="process">
+                class="process"
+              >
                <span style="display:inline-block" />
              </div>
            </div>