网页文本切换样式

2020-10-01 15:54:41 +08:00
parent 6db93e0123
commit 7b38b9eb59
9 changed files with 476 additions and 244 deletions
--- a/ruoyi-ui/.eslintrc.js
+++ b/ruoyi-ui/.eslintrc.js
@ -6,7 +6,7 @@ module.exports = {
    sourceType: 'module'
  },
  env: {
-    browser: true,
+    browser: true,autoprefixer
    node: true,
    es6: true,
  },
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@ -84,6 +84,8 @@
    "html-webpack-plugin": "3.2.0",
    "http-proxy-middleware": "^0.19.1",
    "husky": "1.3.1",
+    "less": "^3.12.2",
+    "less-loader": "^7.0.1",
    "lint-staged": "8.1.5",
    "mockjs": "1.0.1-beta3",
    "node-sass": "^4.9.0",
--- a/ruoyi-ui/src/assets/styles/base.css
+++ b/ruoyi-ui/src/assets/styles/base.css
@ -3,6 +3,9 @@
    .sousouleft-switch{
      display: none;
    }
+  .dropdownList{
+    font-size: 22px!important;
+  }
 }


@ -26,9 +29,20 @@

 /* >>> md*/
@media screen and (max-width: 992px) {
+  .el-dropdown-link span{
+    display: none;
+  }


 }
+
+/* >>> md*/
+@media screen and (max-width: 850px) {
+
+
+
+}
+
 /* ipad >>> xs*/
@media screen and (max-width: 768px) {
  .sousou-leftico{
--- a/ruoyi-ui/src/components/TagsInput/index.vue
+++ b/ruoyi-ui/src/components/TagsInput/index.vue
@ -0,0 +1,71 @@
+<template>
+  <div class="tags_input">
+
+    <div style="border: 1px solid red;height: 50px"
+      type="text"
+      :placeholder="placeholder"
+      v-model="value"
+      @keyup.enter.native="add" contenteditable="true">
+      <el-tag style="float: left;margin-top: 10px;margin-left: 10px"
+        v-for="(tag,index) in list"
+        :key="index"
+        closable
+        :disable-transitions="false"
+        @close="handleClose(tag)">
+        {{tag}}
+      </el-tag>
+
+
+
+    </div>
+  </div>
+</template>
+<script>
+  export default {
+    name:'TagsInput',
+    props: {
+      listFilter: Boolean, // 是否去重
+      defaulList: null,    // 默认值
+      placeholder: null // 占位文字
+    },
+    data() {
+      return {
+        value: '',
+        list: [],
+      }
+    },
+    watch:{
+      defaulList: {
+        handler(newVal) {
+          this.list = newVal
+        },
+        deep: true
+      }
+    },
+    mounted() {
+      this.list = this.defaulList
+      this.$emit('input', this.list)  // 发送给父级的tagslist
+    },
+    methods: {
+      add() {
+        let self = this
+        if (self.value != '' || self.value != ' ') {
+          self.list.push(self.value)
+          if (self.listFilter) {
+            let arr = self.list
+            let set = new Set(arr)
+            self.list = Array.from(set)
+          }
+        }
+        self.value = ''
+        self.$emit('input', self.list)
+      },
+      handleClose(tag) {
+        let self = this
+        self.$emit('tagClose', tag)
+        self.list.splice(self.list.indexOf(tag), 1);
+      },
+
+    }
+  }
+</script>
--- a/ruoyi-ui/src/router/index.js
+++ b/ruoyi-ui/src/router/index.js
@ -166,6 +166,13 @@ export const constantRoutes = [
        meta:{
          requireAuth: true,//加该字段,表示进入这个路由是需要登录的true
        },
+      },{
+        path: '/ceshi',
+        name: 'ceshi',
+        component: resolve => require(['../views/bookmark/ceshi/index.vue'], resolve),
+        meta:{
+          requireAuth: true,//加该字段,表示进入这个路由是需要登录的true
+        },
      }
    ],

--- a/ruoyi-ui/src/views/bookmark/bookmark/index.vue
+++ b/ruoyi-ui/src/views/bookmark/bookmark/index.vue
@ -3,12 +3,19 @@
 <template >
    <div >

-      <div class="filter" >
-        <div class="filter-sort" >
-          <el-dropdown trigger="click" size="small">
-              <span class="el-dropdown-link">
-            <span>按时间排序(正)</span> <i class="el-icon-caret-bottom"></i>
-              </span>
+      <div class="filter-tbar" >
+        <div class="filter-classification" >
+          <div class="classification " @click="showopen(0)"><span>全部</span></div>
+          <div class="classification"  @click="showopen(1)"><span>网页</span></div>
+          <div class="classification"  @click="showopen(2)"><span>文本</span></div>
+          <div class="classification"  @click="showopen(3)"><span>其他</span></div>
+        </div>
+        <div class="setUpThe">
+          <div class="filter-content">
+            <el-dropdown trigger="hover" size="small">
+              <div class="el-dropdown-link dropdownList">
+                <i class="el-icon-document-checked " ></i>  <span>排序模式</span>
+              </div>
              <el-dropdown-menu slot="dropdown" class="filter-sort-dropdown">
                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(正)</el-dropdown-item>
                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(反)</el-dropdown-item>
@ -17,35 +24,40 @@
                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按网站A-Z排序</el-dropdown-item>
              </el-dropdown-menu>
            </el-dropdown>
+
          </div>
-        <div >
-          <el-divider direction="vertical"></el-divider>
+          <div class="filter-content">
+            <el-dropdown trigger="hover" size="small">
+              <div class="el-dropdown-link dropdownList">
+                <i class="el-icon-tickets " ></i>  <span>卡片模式</span>
              </div>
-        <div class="filler-tag">
-          <el-tag size="small">我的最爱</el-tag>
-        </div>
-        <div class="filler-tag">
-          <el-tag size="small" >小型标签</el-tag>
-        </div>
-        <div class="filler-tag">
-          <el-tag size="small" >小型标签</el-tag>
-        </div>
-        <div class="filler-tag">
-          <el-tag size="small" >小型标签</el-tag>
-        </div>
-        <div class="filler-tag">
-          <el-tag size="small" >小型标签</el-tag>
-        </div>
-        <div class="filler-tag">
-          <el-tag size="small" >小型标签</el-tag>
-        </div>
-        <div class="filler-tag">
-          <el-tag size="small" >...</el-tag>
+              <el-dropdown-menu slot="dropdown" class="filter-sort-dropdown">
+                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(正)</el-dropdown-item>
+                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按时间排序(反)</el-dropdown-item>
+                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按字母A-Z排序</el-dropdown-item>
+                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按字母A-Z排序</el-dropdown-item>
+                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按网站A-Z排序</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+
          </div>
+          <div class="filter-content">
+            <el-dropdown trigger="hover" size="small">
+              <div class="el-dropdown-link dropdownList">
+                <i class="el-icon-setting " ></i>  <span>批量设置</span>
              </div>
+              <el-dropdown-menu slot="dropdown" class="filter-sort-dropdown">
+                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>编辑</el-dropdown-item>
+                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>批量处理</el-dropdown-item>
+                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>排序</el-dropdown-item>
+                <el-dropdown-item class="filter-item"><i class="el-icon-bottom"></i>按网站A-Z排序</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>


-
+          </div>
+        </div>
+      </div>

      <div class="nullbookmark" v-if="showimg">
          <div class="nullbookmark-img">
@ -84,6 +96,12 @@
                    <img :ng-src="'https://favicon.lucq.fun/?url=http://'+bm.urls" :src="'https://favicon.lucq.fun/?url=http://'+bm.urls" onerror="this.src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQEAYAAABPYyMiAAAABGdBTUEAALGPC/xhBQAAAAFzUkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAASAAAAEgARslrPgAAAmVJREFUSMftlG1IU2EUx8+5jRHzg+5OiD64WTBBjSY5ZybUJMaMiIUICUKFIGmoIIogYWKFBmtDxN1tBKIWvlS6SR+iLFDBXqSMgmzbvQ7fkAjcINmQ5u7pQwyCiOvWx/p/fPj9/5znnPM8AP+VolRTjjHhTlmZipzEk9GYao4sVaMYxXp62NgIdpLBCuLP05mZZHOYZA3p5KgMjBcUwCmw4PfVVYiBGmbW1zMzOU4QCgtTvdAeRESEyNZyJbx+dDTjVv/9YFSjSScnfabsbPYMF+AbxsYS3F5TfwPZAacpMNfUBEAljK24mMJwlLIUClTAdfwok9FXWBTtc3Phzqv7c/RWa8KnrHZM8VltbRjC92AxGkEPRpSJInjJQPpIBJoZC6nn50M19dM5J/v6/lhRxgXXDX9Qp1POcmHh2sTEQbfbvVmrUCTbr4RPaeMe8Q0eTyI36VkrW50mftjrPWCyDn9oSUuTdj4Y/1Qpl7NdzkNC98iIqsIxHdQVFaU8eWW1U1guLy1lr3Acr3O7pXi227EhDLpcCZ8UL/kK8LIYjxtDIRhEP8xGIlI8bcAKvY3FGB/zYvf81pYUL/0PvGTKoTUvjzbgCx5ZWlJq3a5lQa1Ge3yTWnp64ASYqVcUoXn3Jtja2/EpRtHj89FF8Tb25ufDOwCo8/lSL0BF/eDPzcVXeA7WDAa6J9rES1VVdJqx41JHBwCE8BgA3JU9B+3AACziMwjv7MAaPQb/wgIAnP2rDpCWtpkncjm+Ro34bWgo3FkX0O6bnARARCT6hSR6YzazXa7DfLyigo7TNtObxNb/s/oB7V8JFvW/8IQAAAAldEVYdGRhdGU6Y3JlYXRlADIwMjAtMDItMDJUMTg6MTE6NTgrMDg6MDCoc6tpAAAAJXRFWHRkYXRlOm1vZGlmeQAyMDIwLTAyLTAyVDE4OjExOjU4KzA4OjAw2S4T1QAAAGd0RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vaG9tZS9hZG1pbi9pY29uLWZvbnQvdG1wL2ljb25fNWhyOG55Nmo1bWMvamluZ2RpYW5hbmxpX2tvbmd3dWppYW94aW5nX3Nob3VjYW5nLnN2Z4/vilwAAAAASUVORK5CYII='" alt=""  ng-show="bm.urls">
                  </div>
                  <div class="bookmark-official">{{bm.urls}}&nbsp;·&nbsp;</div><div class="bookmark-time">{{bm.createTime|changeTime}}</div>
+                  <div class="bookmark-time" v-for="t in bm.sqTags">
+                    <el-tag class="bookmark-list-tag" style="background-color: #7a6df0;color: #ffffff" data-bookmarkId="t.bookmarkId" data-tagId="t.tagId}" size="mini">{{t.name}}</el-tag>
+
+                  </div>
+
+
                </div>
              </div>
            </div>
@ -278,11 +296,27 @@

      },
    mounted(){
-
+//初始化
+      this.newBookmark();
    },
    methods: {
+      /**初始化**/
+      newBookmark() {
+        //默认选中 全部
+        document.getElementsByClassName("classification")[0].classList.add("classification-click");
+      },


+      /**切换显示 全部 网页 文本 其他**/
+      showopen(e) {
+        document.getElementsByClassName("classification")[e].classList.add("classification-click");
+        for (var i = 0; i < 4; i++) {
+          if (i != e) {
+            document.getElementsByClassName("classification")[i].classList.remove('classification-click');
+          }
+        }
+      },
+

    /**书签编辑设置的 标签开始**/
      taghandleClose(tag) {
@ -509,7 +543,6 @@


  .filter-sort-dropdown{
-    top:65px!important;
    box-shadow: 0 2px 15px 0 rgba(0,0,0,.2)!important;
    font-weight: 600!important;
  }
@ -545,6 +578,7 @@
    position: absolute;
    background-color: #acd7ff;
    right: 0;
+    display: none;
  }
  .editlist{
    display: flex;
@ -564,6 +598,69 @@
    margin-right: 5px;
  }

+  .filter-tbar{
+    display: flex;
+    position: relative;
+    width: 100%;
+    height: 40px;
+    -webkit-box-pack: justify;
+    justify-content: space-between;
+    -webkit-box-align: center;
+    align-items: center;

+    box-sizing: border-box;
+  }
+
+  .filter-classification {
+    display: flex;
+    -webkit-box-align: center;
+    align-items: center;
+
+  }
+  .setUpThe{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+  .filter-content{
+    margin-left: 18px;
+
+  }
+
+.dropdownList{
+  display: flex;
+  justify-content: center;
+  font-size: 18px;
+}
+.dropdownList i{
+margin-right: 4px;
+  font-weight: 600;
+}
+.dropdownList span{
+  line-height: initial;
+  font-size: 17px;
+}
+
+
+
+  .classification{
+    width: 60px;
+    height: 27px;
+    margin-left: 10px;
+    text-align: center;
+    line-height: 26px;
+    color: #a4a4a4;
+  }
+  .classification-click{
+    border-radius: 19px;
+    background: #606c88;  /* fallback for old browsers */
+    background: -webkit-linear-gradient(to right, #3f4c6b, #606c88);  /* Chrome 10-25, Safari 5.1-6 */
+    background: linear-gradient(to right, #3f4c6b, #606c88); /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */
+    color: #FFFFFF;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.4)
+  }
+  .bookmark-list-tag{
+    margin-left: 4px;
+  }

 </style>
--- a/ruoyi-ui/src/views/bookmark/ceshi/index.vue
+++ b/ruoyi-ui/src/views/bookmark/ceshi/index.vue
@ -0,0 +1,37 @@
+<template>
+  <div>
+
+    <div style="width: 500px">
+      <tags-input
+        v-model="tagList"
+        :defaulList="defaulList"
+        :listFilter=true
+        placeholder="按enter键创建标签"
+        @tagClose="tagClose"></tags-input>
+    </div>
+  </div>
+</template>
+<script>
+  import TagsInput from '../../../components/TagsInput'
+  export default {
+    components: {
+      TagsInput
+    },
+    data() {
+      return {
+        // 子组件返回的list
+        tagList: null,
+        // 付默认值
+        defaulList:[],
+        // 是否去重
+        listFilter:false
+      }
+    },
+    methods: {
+      // 标签关闭方法
+      tagClose(tag){
+        console.log(tag)
+      }
+    }
+  }
+</script>
--- a/ruoyi-ui/src/views/bookmark/index/index.vue
+++ b/ruoyi-ui/src/views/bookmark/index/index.vue
@ -28,6 +28,7 @@
      <div class="aside-title" @click="gorecycle"><i class="el-icon-delete-solid"></i><span>回收站</span></div>
      <div class="aside-title" @click="importHtml"><i class="el-icon-s-platform"></i><span>导入书签</span></div>
      <div class="aside-title"><i class="el-icon-s-comment"></i><span>意见反馈</span></div>
+      <div class="aside-title" @click="ceshi"><i class="el-icon-s-comment"></i><span>测试页面</span></div>
      <div class="aside-title " style="margin-bottom: 100px"><i class="el-icon-s-grid"></i><span>其他设置</span></div>

      </div>
@ -706,6 +707,12 @@
          path: "/importHtml",
        })

+      },/**跳转测试页面**/
+      ceshi:function(){
+        this.$router.push({
+          path: "/ceshi",
+        })
+
      },


--- a/ruoyi-ui/src/views/bookmark/menu/index.vue
+++ b/ruoyi-ui/src/views/bookmark/menu/index.vue
@ -156,9 +156,6 @@

    },

-
-
-
  }
 </script>
 <style >