Browse Source

:bookmark: Releasing / Version tags. 2.6.0 鄙视某些人的盗窃、分享,持续开源

冷冷 6 năm trước cách đây
mục cha
commit
8ba5c9353f

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 1 - 1
public/cdn/avue/index.js


+ 8 - 0
public/cdn/iconfont/1.0.0/index.css

@@ -7,6 +7,14 @@
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
+.avue-crud-icon-select__item i {
+  font-family: "iconfont" !important;
+  /* 以下内容参照第三方图标库本身的规则 */
+  font-size: 24px !important;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
 .el-menu-item [class^=icon-] {
     margin-right: 5px;
     width: 24px;

+ 22 - 37
src/const/iconList.js

@@ -1,43 +1,28 @@
 export default [
-  {
-    label: "基本图标",
-    list: [
-      "el-icon-info",
-      "el-icon-error",
-      "el-icon-error",
-      "el-icon-success",
-      "el-icon-warning",
-      "el-icon-question"
-    ]
-  },
-  {
-    label: "方向图标",
-    list: [
-      "el-icon-info",
-      "el-icon-back",
-      "el-icon-arrow-left",
-      "el-icon-arrow-down",
-      "el-icon-arrow-right",
-      "el-icon-arrow-up"
-    ]
-  },
-  {
-    label: "符号图标",
-    list: [
-      "el-icon-plus",
-      "el-icon-minus",
-      "el-icon-close",
-      "el-icon-check"
-    ]
-  },
   {
     label: "阿里云图标",
     list: [
-      "iconfont icon-zhongyingwen",
-      "iconfont icon-rizhi1",
-      "iconfont icon-bug",
-      "iconfont icon-qq1",
-      "iconfont icon-weixin1"
+      "icon-quanxianguanli",
+      "icon-yonghuguanli",
+      "icon-jiaoseguanli",
+      "icon-web-icon-",
+      "icon-xitongguanli",
+      "icon-rizhiguanli",
+      "icon-navicon-zdgl",
+      "icon-weibiaoti46",
+      "icon-miyue",
+      "icon-shouji",
+      "icon-miyue",
+      "icon-denglvlingpai",
+      "icon-luyou",
+      "icon-msnui-supervise",
+      "icon-server",
+      "icon-wendang",
+      "icon-gtsquanjushiwufuwuGTS",
+      "icon-caidanguanli",
+      "icon-guanwang",
+      "icon-guanwangfangwen",
+      "icon-guiji"
     ]
   }
-]
+]

+ 0 - 2
src/page/index/index.vue

@@ -64,8 +64,6 @@
       this.refreshToken()
     },
     destroyed() {
-      console.log("销毁")
-      console.log(this.refreshTime)
       clearInterval(this.refreshTime)
       this.disconnect()
     },

+ 77 - 72
src/page/index/top/index.vue

@@ -79,90 +79,95 @@
           <el-dropdown-item>
             <router-link to="/info/index">个人信息</router-link>
           </el-dropdown-item>
+          <el-dropdown-item @click.native="$refs.seting.open()"
+                            divided>界面设置
+          </el-dropdown-item>
           <el-dropdown-item @click.native="logout"
-                            divided>退出系统</el-dropdown-item>
+                            divided>退出系统
+          </el-dropdown-item>
         </el-dropdown-menu>
       </el-dropdown>
-      <!-- <top-setting></top-setting> -->
+      <top-setting ref="seting"></top-setting>
     </div>
   </div>
 </template>
 <script>
-import { mapGetters, mapState } from "vuex";
-import { fullscreenToggel, listenfullscreen, handleImg } from "@/util/util";
-import topLock from "./top-lock";
-import topMenu from "./top-menu";
-import topSearch from "./top-search";
-import topTheme from "./top-theme";
-import topLogs from "./top-logs";
-import topColor from "./top-color";
-// import topSetting from "./top-setting";
-export default {
-  components: {
-    topLock,
-    topMenu,
-    topSearch,
-    topTheme,
-    topLogs,
-    topColor
-    // topSetting
-  },
-  name: "top",
-  data() {
-    return {};
-  },
-  filters: {},
-  created() {
-    handleImg(this.userInfo.avatar, "thumbnail");
-  },
-  mounted() {
-    listenfullscreen(this.setScreen);
-  },
-  computed: {
-    ...mapState({
-      showDebug: state => state.common.showDebug,
-      showTheme: state => state.common.showTheme,
-      showLock: state => state.common.showLock,
-      showFullScren: state => state.common.showFullScren,
-      showCollapse: state => state.common.showCollapse,
-      showSearch: state => state.common.showSearch,
-      showMenu: state => state.common.showMenu,
-      showColor: state => state.common.showColor
-    }),
-    ...mapGetters([
-      "userInfo",
-      "isFullScren",
-      "tagWel",
-      "tagList",
-      "isCollapse",
-      "tag",
-      "logsLen",
-      "logsFlag"
-    ])
-  },
-  methods: {
-    handleScreen() {
-      fullscreenToggel();
+  import {mapGetters, mapState} from "vuex";
+  import {fullscreenToggel, handleImg, listenfullscreen} from "@/util/util";
+  import topLock from "./top-lock";
+  import topMenu from "./top-menu";
+  import topSearch from "./top-search";
+  import topTheme from "./top-theme";
+  import topLogs from "./top-logs";
+  import topColor from "./top-color";
+  import topSetting from "./top-setting";
+
+  export default {
+    components: {
+      topLock,
+      topMenu,
+      topSearch,
+      topTheme,
+      topLogs,
+      topColor,
+      topSetting
+    },
+    name: "top",
+    data() {
+      return {};
+    },
+    filters: {},
+    created() {
+      handleImg(this.userInfo.avatar, "thumbnail");
     },
-    setCollapse() {
-      this.$store.commit("SET_COLLAPSE");
+    mounted() {
+      listenfullscreen(this.setScreen);
     },
-    setScreen() {
-      this.$store.commit("SET_FULLSCREN");
+    computed: {
+      ...mapState({
+        showDebug: state => state.common.showDebug,
+        showTheme: state => state.common.showTheme,
+        showLock: state => state.common.showLock,
+        showFullScren: state => state.common.showFullScren,
+        showCollapse: state => state.common.showCollapse,
+        showSearch: state => state.common.showSearch,
+        showMenu: state => state.common.showMenu,
+        showColor: state => state.common.showColor
+      }),
+      ...mapGetters([
+        "userInfo",
+        "isFullScren",
+        "tagWel",
+        "tagList",
+        "isCollapse",
+        "tag",
+        "logsLen",
+        "logsFlag"
+      ])
     },
-    logout() {
-      this.$confirm("是否退出系统, 是否继续?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        this.$store.dispatch("LogOut").then(() => {
-          this.$router.push({ path: "/login" });
+    methods: {
+      handleScreen() {
+        fullscreenToggel();
+      },
+      setCollapse() {
+        this.$store.commit("SET_COLLAPSE");
+      },
+      setScreen() {
+        this.$store.commit("SET_FULLSCREN");
+      },
+      logout() {
+        this.$confirm("是否退出系统, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.$store.dispatch("LogOut").then(() => {
+            this.$router.push({path: "/login"});
+          });
         });
-      });
+      }
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>

+ 3 - 3
src/page/index/top/top-setting.vue

@@ -3,8 +3,6 @@
     <div class="setting__shade"
          :class="{'setting__shade--show':isShade}"
          @click="close"></div>
-    <i class="el-icon-more setting__icon"
-       @click="open"></i>
     <div class="setting__content"
          :class="{'setting__content--show':box}">
       <div class="setting__header">版权信息</div>
@@ -53,7 +51,9 @@ export default {
     })
   },
   created () {
-    this.init();
+   setTimeout(()=>{
+     this.init();
+   },0)
   },
   methods: {
     close () {

+ 47 - 46
src/page/index/top/top-theme.vue

@@ -25,55 +25,56 @@
 </template>
 
 <script>
-import { setTheme } from "@/util/util";
-import { mapGetters } from "vuex";
-export default {
-  data() {
-    return {
-      box: false,
-      text: "",
-      list: [
-        {
-          name: "默认",
-          value: "default"
-        },
-        {
-          name: "白色",
-          value: "theme-white"
-        },
-        {
-          name: "炫彩",
-          value: "theme-star"
-        }
-      ]
-    };
-  },
-  watch: {
-    text: function(val) {
-      this.$store.commit("SET_THEME_NAME", val);
-      setTheme(val);
-    }
-  },
-  computed: {
-    ...mapGetters(["themeName"])
-  },
-  mounted() {
-    this.text = this.themeName;
-    if (!this.text) {
-      this.text = "";
-    }
-  },
-  methods: {
-    open() {
-      this.box = true;
+  import {setTheme} from "@/util/util";
+  import {mapGetters} from "vuex";
+
+  export default {
+    data() {
+      return {
+        box: false,
+        text: "",
+        list: [
+          {
+            name: "默认",
+            value: "default"
+          },
+          {
+            name: "白色",
+            value: "theme-white"
+          },
+          {
+            name: "炫彩",
+            value: "theme-star"
+          }
+        ]
+      };
+    },
+    watch: {
+      text: function (val) {
+        this.$store.commit("SET_THEME_NAME", val);
+        setTheme(val);
+      }
+    },
+    computed: {
+      ...mapGetters(["themeName"])
+    },
+    mounted() {
+      this.text = this.themeName;
+      if (!this.text) {
+        this.text = "";
+      }
+    },
+    methods: {
+      open() {
+        this.box = true;
+      }
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss" scoped>
-.list {
-  width: 100%;
-}
+  .list {
+    width: 100%;
+  }
 </style>