Browse Source

Merge branch 'leng_dev' of https://gitee.wang/pigx/pigx-ui into leng_dev

冷冷 6 years ago
parent
commit
7037505df2

+ 2 - 0
src/const/crud/admin/role.js

@@ -24,6 +24,7 @@ export const tableOption = {
   delBtn: false,
   align: 'center',
   addBtn: false,
+  viewBtn:true,
   column: [{
     label: '角色名称',
     prop: 'roleName',
@@ -91,6 +92,7 @@ export const tableOption = {
     label:'',
     prop: 'dsScope',
     formsolt: true,
+    showClomnu:false,
     hide: true
   }, {
     label: '创建时间',

+ 0 - 17
src/page/logs/error.vue

@@ -1,17 +0,0 @@
-<template>
-  <basic-container>
-    <p>请打开浏览器控制台,然后点击下面的按钮</p>
-    <el-button type="danger"
-               @click="handleNewError">触发一个错误</el-button>
-  </basic-container>
-</template>
-
-<script>
-export default {
-  methods: {
-    handleNewError () {
-      console.log(a) // eslint-disable-line
-    }
-  }
-}
-</script>

+ 0 - 70
src/page/logs/page.vue

@@ -1,70 +0,0 @@
-<template>
-    <div>
-        <basic-container>
-            <div slot="header"
-                 class="clearfix">
-                <span>404错误页面</span>
-            </div>
-            <div class="error-box">
-                <errorPage404 class="error-page"></errorPage404>
-                <span class="error-text">/404当访问的页面不存在时会跳转到404页面,您可以在浏览器地址栏中修改url为一个不存在的路径,体验一下效果</span>
-            </div>
-        </basic-container>
-        <basic-container>
-            <div slot="header"
-                 class="clearfix">
-                <span>403错误页面</span>
-            </div>
-            <div class="error-box">
-                <errorPage403 class="error-page"></errorPage403>
-                <span class="error-text">/403在当前登录用户不具有执行当前操作的权限时跳转到该页面,您可以在ajax请求方法中判断返回的状态码为403时跳转到该页面</span>
-            </div>
-        </basic-container>
-        <basic-container>
-            <div slot="header"
-                 class="clearfix">
-                <span>500错误页面</span>
-            </div>
-            <div class="error-box">
-                <errorPage500 class="error-page"></errorPage500>
-                <span class="error-text">/500当请求之后出现服务端错误时跳转到该页面,您可以在ajax请求方法中判断返回的状态码为500时跳转到该页面</span>
-            </div>
-        </basic-container>
-    </div>
-</template>
-
-<script>
-import errorPage404 from "@/components/error-page/404.vue";
-import errorPage403 from "@/components/error-page/403.vue";
-import errorPage500 from "@/components/error-page/500.vue";
-export default {
-    name: "errPage",
-    data () {
-        return {};
-    },
-    created () { },
-    mounted () { },
-    computed: {},
-    props: [],
-    methods: {},
-    components: { errorPage404, errorPage403, errorPage500 }
-};
-</script>
-
-<style lang="scss" scoped>
-.error-page {
-  position: absolute;
-  top: 90px;
-  left: 150px;
-  transform: scale(0.4);
-}
-.error-text {
-  position: absolute;
-  top: 20px;
-  left: 340px;
-}
-.error-box {
-  position: relative;
-  height: 200px;
-}
-</style>

+ 0 - 179
src/vendor/Blob.js

@@ -1,179 +0,0 @@
-/* eslint-disable */
-/* Blob.js
- * A Blob implementation.
- * 2014-05-27
- *
- * By Eli Grey, http://eligrey.com
- * By Devin Samarin, https://github.com/eboyjr
- * License: X11/MIT
- *   See LICENSE.md
- */
-
-/*global self, unescape */
-/*jslint bitwise: true, regexp: true, confusion: true, es5: true, vars: true, white: true,
- plusplus: true */
-
-/*! @source http://purl.eligrey.com/github/Blob.js/blob/master/Blob.js */
-
-(function (view) {
-    "use strict";
-
-    view.URL = view.URL || view.webkitURL;
-
-    if (view.Blob && view.URL) {
-        try {
-            new Blob;
-            return;
-        } catch (e) { }
-    }
-
-    // Internally we use a BlobBuilder implementation to base Blob off of
-    // in order to support older browsers that only have BlobBuilder
-    var BlobBuilder = view.BlobBuilder || view.WebKitBlobBuilder || view.MozBlobBuilder || (function (view) {
-        var
-            get_class = function (object) {
-                return Object.prototype.toString.call(object).match(/^\[object\s(.*)\]$/)[1];
-            }
-            , FakeBlobBuilder = function BlobBuilder() {
-                this.data = [];
-            }
-            , FakeBlob = function Blob(data, type, encoding) {
-                this.data = data;
-                this.size = data.length;
-                this.type = type;
-                this.encoding = encoding;
-            }
-            , FBB_proto = FakeBlobBuilder.prototype
-            , FB_proto = FakeBlob.prototype
-            , FileReaderSync = view.FileReaderSync
-            , FileException = function (type) {
-                this.code = this[this.name = type];
-            }
-            , file_ex_codes = (
-                "NOT_FOUND_ERR SECURITY_ERR ABORT_ERR NOT_READABLE_ERR ENCODING_ERR "
-                + "NO_MODIFICATION_ALLOWED_ERR INVALID_STATE_ERR SYNTAX_ERR"
-            ).split(" ")
-            , file_ex_code = file_ex_codes.length
-            , real_URL = view.URL || view.webkitURL || view
-            , real_create_object_URL = real_URL.createObjectURL
-            , real_revoke_object_URL = real_URL.revokeObjectURL
-            , URL = real_URL
-            , btoa = view.btoa
-            , atob = view.atob
-
-            , ArrayBuffer = view.ArrayBuffer
-            , Uint8Array = view.Uint8Array
-            ;
-        FakeBlob.fake = FB_proto.fake = true;
-        while (file_ex_code--) {
-            FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1;
-        }
-        if (!real_URL.createObjectURL) {
-            URL = view.URL = {};
-        }
-        URL.createObjectURL = function (blob) {
-            var
-                type = blob.type
-                , data_URI_header
-                ;
-            if (type === null) {
-                type = "application/octet-stream";
-            }
-            if (blob instanceof FakeBlob) {
-                data_URI_header = "data:" + type;
-                if (blob.encoding === "base64") {
-                    return data_URI_header + ";base64," + blob.data;
-                } else if (blob.encoding === "URI") {
-                    return data_URI_header + "," + decodeURIComponent(blob.data);
-                } if (btoa) {
-                    return data_URI_header + ";base64," + btoa(blob.data);
-                } else {
-                    return data_URI_header + "," + encodeURIComponent(blob.data);
-                }
-            } else if (real_create_object_URL) {
-                return real_create_object_URL.call(real_URL, blob);
-            }
-        };
-        URL.revokeObjectURL = function (object_URL) {
-            if (object_URL.substring(0, 5) !== "data:" && real_revoke_object_URL) {
-                real_revoke_object_URL.call(real_URL, object_URL);
-            }
-        };
-        FBB_proto.append = function (data/*, endings*/) {
-            var bb = this.data;
-            // decode data to a binary string
-            if (Uint8Array && (data instanceof ArrayBuffer || data instanceof Uint8Array)) {
-                var
-                    str = ""
-                    , buf = new Uint8Array(data)
-                    , i = 0
-                    , buf_len = buf.length
-                    ;
-                for (; i < buf_len; i++) {
-                    str += String.fromCharCode(buf[i]);
-                }
-                bb.push(str);
-            } else if (get_class(data) === "Blob" || get_class(data) === "File") {
-                if (FileReaderSync) {
-                    var fr = new FileReaderSync;
-                    bb.push(fr.readAsBinaryString(data));
-                } else {
-                    // async FileReader won't work as BlobBuilder is sync
-                    throw new FileException("NOT_READABLE_ERR");
-                }
-            } else if (data instanceof FakeBlob) {
-                if (data.encoding === "base64" && atob) {
-                    bb.push(atob(data.data));
-                } else if (data.encoding === "URI") {
-                    bb.push(decodeURIComponent(data.data));
-                } else if (data.encoding === "raw") {
-                    bb.push(data.data);
-                }
-            } else {
-                if (typeof data !== "string") {
-                    data += ""; // convert unsupported types to strings
-                }
-                // decode UTF-16 to binary string
-                bb.push(unescape(encodeURIComponent(data)));
-            }
-        };
-        FBB_proto.getBlob = function (type) {
-            if (!arguments.length) {
-                type = null;
-            }
-            return new FakeBlob(this.data.join(""), type, "raw");
-        };
-        FBB_proto.toString = function () {
-            return "[object BlobBuilder]";
-        };
-        FB_proto.slice = function (start, end, type) {
-            var args = arguments.length;
-            if (args < 3) {
-                type = null;
-            }
-            return new FakeBlob(
-                this.data.slice(start, args > 1 ? end : this.data.length)
-                , type
-                , this.encoding
-            );
-        };
-        FB_proto.toString = function () {
-            return "[object Blob]";
-        };
-        FB_proto.close = function () {
-            this.size = this.data.length = 0;
-        };
-        return FakeBlobBuilder;
-    }(view));
-
-    view.Blob = function Blob(blobParts, options) {
-        var type = options ? (options.type || "") : "";
-        var builder = new BlobBuilder();
-        if (blobParts) {
-            for (var i = 0, len = blobParts.length; i < len; i++) {
-                builder.append(blobParts[i]);
-            }
-        }
-        return builder.getBlob(type);
-    };
-}(typeof self !== "undefined" && self || typeof window !== "undefined" && window || this.content || this));

+ 0 - 160
src/vendor/Export2Excel.js

@@ -1,160 +0,0 @@
-/* eslint-disable */
-require('script-loader!file-saver');
-require('script-loader!@/vendor/Blob');
-import XLSX from 'xlsx'
-
-function generateArray(table) {
-    var out = [];
-    var rows = table.querySelectorAll('tr');
-    var ranges = [];
-    for (var R = 0; R < rows.length; ++R) {
-        var outRow = [];
-        var row = rows[R];
-        var columns = row.querySelectorAll('td');
-        for (var C = 0; C < columns.length; ++C) {
-            var cell = columns[C];
-            var colspan = cell.getAttribute('colspan');
-            var rowspan = cell.getAttribute('rowspan');
-            var cellValue = cell.innerText;
-            if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
-
-            //Skip ranges
-            ranges.forEach(function (range) {
-                if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) {
-                    for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null);
-                }
-            });
-
-            //Handle Row Span
-            if (rowspan || colspan) {
-                rowspan = rowspan || 1;
-                colspan = colspan || 1;
-                ranges.push({ s: { r: R, c: outRow.length }, e: { r: R + rowspan - 1, c: outRow.length + colspan - 1 } });
-            }
-            ;
-
-            //Handle Value
-            outRow.push(cellValue !== "" ? cellValue : null);
-
-            //Handle Colspan
-            if (colspan) for (var k = 0; k < colspan - 1; ++k) outRow.push(null);
-        }
-        out.push(outRow);
-    }
-    return [out, ranges];
-};
-
-function datenum(v, date1904) {
-    if (date1904) v += 1462;
-    var epoch = Date.parse(v);
-    return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
-}
-
-function sheet_from_array_of_arrays(data, opts) {
-    var ws = {};
-    var range = { s: { c: 10000000, r: 10000000 }, e: { c: 0, r: 0 } };
-    for (var R = 0; R != data.length; ++R) {
-        for (var C = 0; C != data[R].length; ++C) {
-            if (range.s.r > R) range.s.r = R;
-            if (range.s.c > C) range.s.c = C;
-            if (range.e.r < R) range.e.r = R;
-            if (range.e.c < C) range.e.c = C;
-            var cell = { v: data[R][C] };
-            if (cell.v == null) continue;
-            var cell_ref = XLSX.utils.encode_cell({ c: C, r: R });
-
-            if (typeof cell.v === 'number') cell.t = 'n';
-            else if (typeof cell.v === 'boolean') cell.t = 'b';
-            else if (cell.v instanceof Date) {
-                cell.t = 'n';
-                cell.z = XLSX.SSF._table[14];
-                cell.v = datenum(cell.v);
-            }
-            else cell.t = 's';
-
-            ws[cell_ref] = cell;
-        }
-    }
-    if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range);
-    return ws;
-}
-
-function Workbook() {
-    if (!(this instanceof Workbook)) return new Workbook();
-    this.SheetNames = [];
-    this.Sheets = {};
-}
-
-function s2ab(s) {
-    var buf = new ArrayBuffer(s.length);
-    var view = new Uint8Array(buf);
-    for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
-    return buf;
-}
-
-export function export_table_to_excel(id) {
-    var theTable = document.getElementById(id);
-    var oo = generateArray(theTable);
-    var ranges = oo[1];
-
-    /* original data */
-    var data = oo[0];
-    var ws_name = "SheetJS";
-
-    var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
-
-    /* add ranges to worksheet */
-    // ws['!cols'] = ['apple', 'banan'];
-    ws['!merges'] = ranges;
-
-    /* add worksheet to workbook */
-    wb.SheetNames.push(ws_name);
-    wb.Sheets[ws_name] = ws;
-
-    var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
-
-    saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), "test.xlsx")
-}
-
-export function export_json_to_excel(th, jsonData, defaultTitle) {
-
-    /* original data */
-
-    var data = jsonData;
-    data.unshift(th);
-    var ws_name = "SheetJS";
-
-    var wb = new Workbook(), ws = sheet_from_array_of_arrays(data);
-
-    /*设置worksheet每列的最大宽度*/
-    const colWidth = data.map(row => row.map(val => {
-        /*先判断是否为null/undefined*/
-        if (val == null) {
-            return { 'wch': 10 };
-        }
-        /*再判断是否为中文*/
-        else if (val.toString().charCodeAt(0) > 255) {
-            return { 'wch': val.toString().length * 2 };
-        } else {
-            return { 'wch': val.toString().length };
-        }
-    }))
-    /*以第一行为初始值*/
-    let result = colWidth[0];
-    for (let i = 1; i < colWidth.length; i++) {
-        for (let j = 0; j < colWidth[i].length; j++) {
-            if (result[j]['wch'] < colWidth[i][j]['wch']) {
-                result[j]['wch'] = colWidth[i][j]['wch'];
-            }
-        }
-    }
-    ws['!cols'] = result;
-
-    /* add worksheet to workbook */
-    wb.SheetNames.push(ws_name);
-    wb.Sheets[ws_name] = ws;
-
-    var wbout = XLSX.write(wb, { bookType: 'xlsx', bookSST: false, type: 'binary' });
-    var title = defaultTitle || 'excel-list'
-    saveAs(new Blob([s2ab(wbout)], { type: "application/octet-stream" }), title + ".xlsx")
-}

+ 0 - 53
src/views/dashboard/index.vue

@@ -1,53 +0,0 @@
-<!--
-  -    Copyright (c) 2018-2025, lengleng All rights reserved.
-  -
-  - Redistribution and use in source and binary forms, with or without
-  - modification, are permitted provided that the following conditions are met:
-  -
-  - Redistributions of source code must retain the above copyright notice,
-  - this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-  - notice, this list of conditions and the following disclaimer in the
-  - documentation and/or other materials provided with the distribution.
-  - Neither the name of the pig4cloud.com developer nor the names of its
-  - contributors may be used to endorse or promote products derived from
-  - this software without specific prior written permission.
-  - Author: lengleng (wangiegie@gmail.com)
-  -->
-
-<template>
-  <div class="dashboard-container">
-    <basic-container>
-      <div class="dashboard-text">欢迎登录</div>
-      <div class="dashboard-text">用户名:{{name}}</div>
-      <div class="dashboard-text">角色名:
-        <span v-for='role in roles'
-              :key='role'>{{role}}</span>
-      </div>
-    </basic-container>
-  </div>
-</template>
-
-<script>
-  import {mapGetters} from "vuex";
-
-  export default {
-    name: "dashboard",
-    computed: {
-      ...mapGetters(["name", "roles"])
-    }
-  };
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  .dashboard {
-    &-container {
-      margin: 30px;
-    }
-
-    &-text {
-      font-size: 30px;
-      line-height: 46px;
-    }
-  }
-</style>