Просмотр исходного кода

音频视频上传,复制,图表优化

zhaoqingfu 7 лет назад
Родитель
Сommit
6efb523ea8

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/css/build/common.css


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/css/build/common.css.map


+ 29 - 1
src/main/webapp/css/build/common.scss

@@ -705,4 +705,32 @@
       padding: 0 5px;
     }
   }
-}
+}
+
+
+// 编辑器
+.layui-layedit-tool .iconfont{
+  position: relative;
+  width: 32px;
+  height: 30px;
+  line-height: 30px;
+  margin: 3px 5px;
+  color: #777;
+  cursor: pointer;
+  border-radius: 2px;
+  display: inline-block;
+  vertical-align: middle;
+  text-align: center;
+  font-size: 18px;
+}
+.layui-layedit-tool .iconfont input {
+  position: absolute;
+  font-size: 0;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  opacity: .01;
+  filter: Alpha(opacity=1);
+  cursor: pointer;
+}

+ 36 - 0
src/main/webapp/font/demo_fontclass.html

@@ -265,6 +265,12 @@
                 </li>
             
                 <li>
+                <i class="icon iconfont icon-zidian"></i>
+                    <div class="name">字典</div>
+                    <div class="fontclass">.icon-zidian</div>
+                </li>
+            
+                <li>
                 <i class="icon iconfont icon-gengduo"></i>
                     <div class="name">更多</div>
                     <div class="fontclass">.icon-gengduo</div>
@@ -343,12 +349,36 @@
                 </li>
             
                 <li>
+                <i class="icon iconfont icon-jiaoseguanli"></i>
+                    <div class="name">角色管理</div>
+                    <div class="fontclass">.icon-jiaoseguanli</div>
+                </li>
+            
+                <li>
                 <i class="icon iconfont icon-wenjian"></i>
                     <div class="name">文件</div>
                     <div class="fontclass">.icon-wenjian</div>
                 </li>
             
                 <li>
+                <i class="icon iconfont icon-fuzhi"></i>
+                    <div class="name">复制</div>
+                    <div class="fontclass">.icon-fuzhi</div>
+                </li>
+            
+                <li>
+                <i class="icon iconfont icon-institute"></i>
+                    <div class="name">机构</div>
+                    <div class="fontclass">.icon-institute</div>
+                </li>
+            
+                <li>
+                <i class="icon iconfont icon-ziyuanguanli"></i>
+                    <div class="name">资源管理</div>
+                    <div class="fontclass">.icon-ziyuanguanli</div>
+                </li>
+            
+                <li>
                 <i class="icon iconfont icon-tongji"></i>
                     <div class="name">统计</div>
                     <div class="fontclass">.icon-tongji</div>
@@ -391,6 +421,12 @@
                 </li>
             
                 <li>
+                <i class="icon iconfont icon-gaiicon-"></i>
+                    <div class="name">工作台</div>
+                    <div class="fontclass">.icon-gaiicon-</div>
+                </li>
+            
+                <li>
                 <i class="icon iconfont icon-camera"></i>
                     <div class="name">camera</div>
                     <div class="fontclass">.icon-camera</div>

+ 48 - 0
src/main/webapp/font/demo_symbol.html

@@ -365,6 +365,14 @@
             
                 <li>
                     <svg class="icon" aria-hidden="true">
+                        <use xlink:href="#icon-zidian"></use>
+                    </svg>
+                    <div class="name">字典</div>
+                    <div class="fontclass">#icon-zidian</div>
+                </li>
+            
+                <li>
+                    <svg class="icon" aria-hidden="true">
                         <use xlink:href="#icon-gengduo"></use>
                     </svg>
                     <div class="name">更多</div>
@@ -469,6 +477,14 @@
             
                 <li>
                     <svg class="icon" aria-hidden="true">
+                        <use xlink:href="#icon-jiaoseguanli"></use>
+                    </svg>
+                    <div class="name">角色管理</div>
+                    <div class="fontclass">#icon-jiaoseguanli</div>
+                </li>
+            
+                <li>
+                    <svg class="icon" aria-hidden="true">
                         <use xlink:href="#icon-wenjian"></use>
                     </svg>
                     <div class="name">文件</div>
@@ -477,6 +493,30 @@
             
                 <li>
                     <svg class="icon" aria-hidden="true">
+                        <use xlink:href="#icon-fuzhi"></use>
+                    </svg>
+                    <div class="name">复制</div>
+                    <div class="fontclass">#icon-fuzhi</div>
+                </li>
+            
+                <li>
+                    <svg class="icon" aria-hidden="true">
+                        <use xlink:href="#icon-institute"></use>
+                    </svg>
+                    <div class="name">机构</div>
+                    <div class="fontclass">#icon-institute</div>
+                </li>
+            
+                <li>
+                    <svg class="icon" aria-hidden="true">
+                        <use xlink:href="#icon-ziyuanguanli"></use>
+                    </svg>
+                    <div class="name">资源管理</div>
+                    <div class="fontclass">#icon-ziyuanguanli</div>
+                </li>
+            
+                <li>
+                    <svg class="icon" aria-hidden="true">
                         <use xlink:href="#icon-tongji"></use>
                     </svg>
                     <div class="name">统计</div>
@@ -533,6 +573,14 @@
             
                 <li>
                     <svg class="icon" aria-hidden="true">
+                        <use xlink:href="#icon-gaiicon-"></use>
+                    </svg>
+                    <div class="name">工作台</div>
+                    <div class="fontclass">#icon-gaiicon-</div>
+                </li>
+            
+                <li>
+                    <svg class="icon" aria-hidden="true">
                         <use xlink:href="#icon-camera"></use>
                     </svg>
                     <div class="name">camera</div>

+ 36 - 0
src/main/webapp/font/demo_unicode.html

@@ -285,6 +285,12 @@
                 </li>
             
                 <li>
+                <i class="icon iconfont">&#xe679;</i>
+                    <div class="name">字典</div>
+                    <div class="code">&amp;#xe679;</div>
+                </li>
+            
+                <li>
                 <i class="icon iconfont">&#xe617;</i>
                     <div class="name">更多</div>
                     <div class="code">&amp;#xe617;</div>
@@ -363,12 +369,36 @@
                 </li>
             
                 <li>
+                <i class="icon iconfont">&#xe66d;</i>
+                    <div class="name">角色管理</div>
+                    <div class="code">&amp;#xe66d;</div>
+                </li>
+            
+                <li>
                 <i class="icon iconfont">&#xe64e;</i>
                     <div class="name">文件</div>
                     <div class="code">&amp;#xe64e;</div>
                 </li>
             
                 <li>
+                <i class="icon iconfont">&#xe61b;</i>
+                    <div class="name">复制</div>
+                    <div class="code">&amp;#xe61b;</div>
+                </li>
+            
+                <li>
+                <i class="icon iconfont">&#xe660;</i>
+                    <div class="name">机构</div>
+                    <div class="code">&amp;#xe660;</div>
+                </li>
+            
+                <li>
+                <i class="icon iconfont">&#xe635;</i>
+                    <div class="name">资源管理</div>
+                    <div class="code">&amp;#xe635;</div>
+                </li>
+            
+                <li>
                 <i class="icon iconfont">&#xe62d;</i>
                     <div class="name">统计</div>
                     <div class="code">&amp;#xe62d;</div>
@@ -411,6 +441,12 @@
                 </li>
             
                 <li>
+                <i class="icon iconfont">&#xe6d0;</i>
+                    <div class="name">工作台</div>
+                    <div class="code">&amp;#xe6d0;</div>
+                </li>
+            
+                <li>
                 <i class="icon iconfont">&#xe86e;</i>
                     <div class="name">camera</div>
                     <div class="code">&amp;#xe86e;</div>

Разница между файлами не показана из-за своего большого размера
+ 17 - 5
src/main/webapp/font/iconfont.css


BIN
src/main/webapp/font/iconfont.eot


Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/font/iconfont.js


Разница между файлами не показана из-за своего большого размера
+ 18 - 0
src/main/webapp/font/iconfont.svg


BIN
src/main/webapp/font/iconfont.ttf


BIN
src/main/webapp/font/iconfont.woff


+ 938 - 0
src/main/webapp/js/plugin/clipboard/clipboard.js

@@ -0,0 +1,938 @@
+/*!
+ * clipboard.js v2.0.0
+ * https://zenorocha.github.io/clipboard.js
+ * 
+ * Licensed MIT © Zeno Rocha
+ */
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["ClipboardJS"] = factory();
+	else
+		root["ClipboardJS"] = factory();
+})(this, function() {
+return /******/ (function(modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if(installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+/******/ 		}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+/******/ 		};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+/******/ 	}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function(value) { return value; };
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function(exports, name, getter) {
+/******/ 		if(!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+/******/ 			});
+/******/ 		}
+/******/ 	};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function(module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+/******/ 	};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function(object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+/******/
+/******/ 	// Load entry module and return exports
+/******/ 	return __webpack_require__(__webpack_require__.s = 3);
+/******/ })
+/************************************************************************/
+/******/ ([
+/* 0 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;(function (global, factory) {
+    if (true) {
+        !(__WEBPACK_AMD_DEFINE_ARRAY__ = [module, __webpack_require__(7)], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
+				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
+				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+    } else if (typeof exports !== "undefined") {
+        factory(module, require('select'));
+    } else {
+        var mod = {
+            exports: {}
+        };
+        factory(mod, global.select);
+        global.clipboardAction = mod.exports;
+    }
+})(this, function (module, _select) {
+    'use strict';
+
+    var _select2 = _interopRequireDefault(_select);
+
+    function _interopRequireDefault(obj) {
+        return obj && obj.__esModule ? obj : {
+            default: obj
+        };
+    }
+
+    var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+        return typeof obj;
+    } : function (obj) {
+        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    };
+
+    function _classCallCheck(instance, Constructor) {
+        if (!(instance instanceof Constructor)) {
+            throw new TypeError("Cannot call a class as a function");
+        }
+    }
+
+    var _createClass = function () {
+        function defineProperties(target, props) {
+            for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+            }
+        }
+
+        return function (Constructor, protoProps, staticProps) {
+            if (protoProps) defineProperties(Constructor.prototype, protoProps);
+            if (staticProps) defineProperties(Constructor, staticProps);
+            return Constructor;
+        };
+    }();
+
+    var ClipboardAction = function () {
+        /**
+         * @param {Object} options
+         */
+        function ClipboardAction(options) {
+            _classCallCheck(this, ClipboardAction);
+
+            this.resolveOptions(options);
+            this.initSelection();
+        }
+
+        /**
+         * Defines base properties passed from constructor.
+         * @param {Object} options
+         */
+
+
+        _createClass(ClipboardAction, [{
+            key: 'resolveOptions',
+            value: function resolveOptions() {
+                var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+                this.action = options.action;
+                this.container = options.container;
+                this.emitter = options.emitter;
+                this.target = options.target;
+                this.text = options.text;
+                this.trigger = options.trigger;
+
+                this.selectedText = '';
+            }
+        }, {
+            key: 'initSelection',
+            value: function initSelection() {
+                if (this.text) {
+                    this.selectFake();
+                } else if (this.target) {
+                    this.selectTarget();
+                }
+            }
+        }, {
+            key: 'selectFake',
+            value: function selectFake() {
+                var _this = this;
+
+                var isRTL = document.documentElement.getAttribute('dir') == 'rtl';
+
+                this.removeFake();
+
+                this.fakeHandlerCallback = function () {
+                    return _this.removeFake();
+                };
+                this.fakeHandler = this.container.addEventListener('click', this.fakeHandlerCallback) || true;
+
+                this.fakeElem = document.createElement('textarea');
+                // Prevent zooming on iOS
+                this.fakeElem.style.fontSize = '12pt';
+                // Reset box model
+                this.fakeElem.style.border = '0';
+                this.fakeElem.style.padding = '0';
+                this.fakeElem.style.margin = '0';
+                // Move element out of screen horizontally
+                this.fakeElem.style.position = 'absolute';
+                this.fakeElem.style[isRTL ? 'right' : 'left'] = '-9999px';
+                // Move element to the same position vertically
+                var yPosition = window.pageYOffset || document.documentElement.scrollTop;
+                this.fakeElem.style.top = yPosition + 'px';
+
+                this.fakeElem.setAttribute('readonly', '');
+                this.fakeElem.value = this.text;
+
+                this.container.appendChild(this.fakeElem);
+
+                this.selectedText = (0, _select2.default)(this.fakeElem);
+                this.copyText();
+            }
+        }, {
+            key: 'removeFake',
+            value: function removeFake() {
+                if (this.fakeHandler) {
+                    this.container.removeEventListener('click', this.fakeHandlerCallback);
+                    this.fakeHandler = null;
+                    this.fakeHandlerCallback = null;
+                }
+
+                if (this.fakeElem) {
+                    this.container.removeChild(this.fakeElem);
+                    this.fakeElem = null;
+                }
+            }
+        }, {
+            key: 'selectTarget',
+            value: function selectTarget() {
+                this.selectedText = (0, _select2.default)(this.target);
+                this.copyText();
+            }
+        }, {
+            key: 'copyText',
+            value: function copyText() {
+                var succeeded = void 0;
+
+                try {
+                    succeeded = document.execCommand(this.action);
+                } catch (err) {
+                    succeeded = false;
+                }
+
+                this.handleResult(succeeded);
+            }
+        }, {
+            key: 'handleResult',
+            value: function handleResult(succeeded) {
+                this.emitter.emit(succeeded ? 'success' : 'error', {
+                    action: this.action,
+                    text: this.selectedText,
+                    trigger: this.trigger,
+                    clearSelection: this.clearSelection.bind(this)
+                });
+            }
+        }, {
+            key: 'clearSelection',
+            value: function clearSelection() {
+                if (this.trigger) {
+                    this.trigger.focus();
+                }
+
+                window.getSelection().removeAllRanges();
+            }
+        }, {
+            key: 'destroy',
+            value: function destroy() {
+                this.removeFake();
+            }
+        }, {
+            key: 'action',
+            set: function set() {
+                var action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'copy';
+
+                this._action = action;
+
+                if (this._action !== 'copy' && this._action !== 'cut') {
+                    throw new Error('Invalid "action" value, use either "copy" or "cut"');
+                }
+            },
+            get: function get() {
+                return this._action;
+            }
+        }, {
+            key: 'target',
+            set: function set(target) {
+                if (target !== undefined) {
+                    if (target && (typeof target === 'undefined' ? 'undefined' : _typeof(target)) === 'object' && target.nodeType === 1) {
+                        if (this.action === 'copy' && target.hasAttribute('disabled')) {
+                            throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');
+                        }
+
+                        if (this.action === 'cut' && (target.hasAttribute('readonly') || target.hasAttribute('disabled'))) {
+                            throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');
+                        }
+
+                        this._target = target;
+                    } else {
+                        throw new Error('Invalid "target" value, use a valid Element');
+                    }
+                }
+            },
+            get: function get() {
+                return this._target;
+            }
+        }]);
+
+        return ClipboardAction;
+    }();
+
+    module.exports = ClipboardAction;
+});
+
+/***/ }),
+/* 1 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var is = __webpack_require__(6);
+var delegate = __webpack_require__(5);
+
+/**
+ * Validates all params and calls the right
+ * listener function based on its target type.
+ *
+ * @param {String|HTMLElement|HTMLCollection|NodeList} target
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Object}
+ */
+function listen(target, type, callback) {
+    if (!target && !type && !callback) {
+        throw new Error('Missing required arguments');
+    }
+
+    if (!is.string(type)) {
+        throw new TypeError('Second argument must be a String');
+    }
+
+    if (!is.fn(callback)) {
+        throw new TypeError('Third argument must be a Function');
+    }
+
+    if (is.node(target)) {
+        return listenNode(target, type, callback);
+    }
+    else if (is.nodeList(target)) {
+        return listenNodeList(target, type, callback);
+    }
+    else if (is.string(target)) {
+        return listenSelector(target, type, callback);
+    }
+    else {
+        throw new TypeError('First argument must be a String, HTMLElement, HTMLCollection, or NodeList');
+    }
+}
+
+/**
+ * Adds an event listener to a HTML element
+ * and returns a remove listener function.
+ *
+ * @param {HTMLElement} node
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Object}
+ */
+function listenNode(node, type, callback) {
+    node.addEventListener(type, callback);
+
+    return {
+        destroy: function() {
+            node.removeEventListener(type, callback);
+        }
+    }
+}
+
+/**
+ * Add an event listener to a list of HTML elements
+ * and returns a remove listener function.
+ *
+ * @param {NodeList|HTMLCollection} nodeList
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Object}
+ */
+function listenNodeList(nodeList, type, callback) {
+    Array.prototype.forEach.call(nodeList, function(node) {
+        node.addEventListener(type, callback);
+    });
+
+    return {
+        destroy: function() {
+            Array.prototype.forEach.call(nodeList, function(node) {
+                node.removeEventListener(type, callback);
+            });
+        }
+    }
+}
+
+/**
+ * Add an event listener to a selector
+ * and returns a remove listener function.
+ *
+ * @param {String} selector
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Object}
+ */
+function listenSelector(selector, type, callback) {
+    return delegate(document.body, selector, type, callback);
+}
+
+module.exports = listen;
+
+
+/***/ }),
+/* 2 */
+/***/ (function(module, exports) {
+
+function E () {
+  // Keep this empty so it's easier to inherit from
+  // (via https://github.com/lipsmack from https://github.com/scottcorgan/tiny-emitter/issues/3)
+}
+
+E.prototype = {
+  on: function (name, callback, ctx) {
+    var e = this.e || (this.e = {});
+
+    (e[name] || (e[name] = [])).push({
+      fn: callback,
+      ctx: ctx
+    });
+
+    return this;
+  },
+
+  once: function (name, callback, ctx) {
+    var self = this;
+    function listener () {
+      self.off(name, listener);
+      callback.apply(ctx, arguments);
+    }
+      listener._ = callback;
+      return this.on(name, listener, ctx);
+  },
+
+  emit: function (name) {
+    var data = [].slice.call(arguments, 1);
+    var evtArr = ((this.e || (this.e = {}))[name] || []).slice();
+    var i = 0;
+    var len = evtArr.length;
+
+    for (i; i < len; i++) {
+      evtArr[i].fn.apply(evtArr[i].ctx, data);
+    }
+
+    return this;
+  },
+
+  off: function (name, callback) {
+    var e = this.e || (this.e = {});
+    var evts = e[name];
+    var liveEvents = [];
+
+    if (evts && callback) {
+      for (var i = 0, len = evts.length; i < len; i++) {
+        if (evts[i].fn !== callback && evts[i].fn._ !== callback)
+          liveEvents.push(evts[i]);
+      }
+    }
+
+    // Remove event from queue to prevent memory leak
+    // Suggested by https://github.com/lazd
+    // Ref: https://github.com/scottcorgan/tiny-emitter/commit/c6ebfaa9bc973b33d110a84a307742b7cf94c953#commitcomment-5024910
+
+    (liveEvents.length)
+      ? e[name] = liveEvents
+      : delete e[name];
+
+    return this;
+  }
+};
+
+module.exports = E;
+
+
+/***/ }),
+/* 3 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;(function (global, factory) {
+    if (true) {
+        !(__WEBPACK_AMD_DEFINE_ARRAY__ = [module, __webpack_require__(0), __webpack_require__(2), __webpack_require__(1)], __WEBPACK_AMD_DEFINE_FACTORY__ = (factory),
+				__WEBPACK_AMD_DEFINE_RESULT__ = (typeof __WEBPACK_AMD_DEFINE_FACTORY__ === 'function' ?
+				(__WEBPACK_AMD_DEFINE_FACTORY__.apply(exports, __WEBPACK_AMD_DEFINE_ARRAY__)) : __WEBPACK_AMD_DEFINE_FACTORY__),
+				__WEBPACK_AMD_DEFINE_RESULT__ !== undefined && (module.exports = __WEBPACK_AMD_DEFINE_RESULT__));
+    } else if (typeof exports !== "undefined") {
+        factory(module, require('./clipboard-action'), require('tiny-emitter'), require('good-listener'));
+    } else {
+        var mod = {
+            exports: {}
+        };
+        factory(mod, global.clipboardAction, global.tinyEmitter, global.goodListener);
+        global.clipboard = mod.exports;
+    }
+})(this, function (module, _clipboardAction, _tinyEmitter, _goodListener) {
+    'use strict';
+
+    var _clipboardAction2 = _interopRequireDefault(_clipboardAction);
+
+    var _tinyEmitter2 = _interopRequireDefault(_tinyEmitter);
+
+    var _goodListener2 = _interopRequireDefault(_goodListener);
+
+    function _interopRequireDefault(obj) {
+        return obj && obj.__esModule ? obj : {
+            default: obj
+        };
+    }
+
+    var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
+        return typeof obj;
+    } : function (obj) {
+        return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    };
+
+    function _classCallCheck(instance, Constructor) {
+        if (!(instance instanceof Constructor)) {
+            throw new TypeError("Cannot call a class as a function");
+        }
+    }
+
+    var _createClass = function () {
+        function defineProperties(target, props) {
+            for (var i = 0; i < props.length; i++) {
+                var descriptor = props[i];
+                descriptor.enumerable = descriptor.enumerable || false;
+                descriptor.configurable = true;
+                if ("value" in descriptor) descriptor.writable = true;
+                Object.defineProperty(target, descriptor.key, descriptor);
+            }
+        }
+
+        return function (Constructor, protoProps, staticProps) {
+            if (protoProps) defineProperties(Constructor.prototype, protoProps);
+            if (staticProps) defineProperties(Constructor, staticProps);
+            return Constructor;
+        };
+    }();
+
+    function _possibleConstructorReturn(self, call) {
+        if (!self) {
+            throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+        }
+
+        return call && (typeof call === "object" || typeof call === "function") ? call : self;
+    }
+
+    function _inherits(subClass, superClass) {
+        if (typeof superClass !== "function" && superClass !== null) {
+            throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+        }
+
+        subClass.prototype = Object.create(superClass && superClass.prototype, {
+            constructor: {
+                value: subClass,
+                enumerable: false,
+                writable: true,
+                configurable: true
+            }
+        });
+        if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+    }
+
+    var Clipboard = function (_Emitter) {
+        _inherits(Clipboard, _Emitter);
+
+        /**
+         * @param {String|HTMLElement|HTMLCollection|NodeList} trigger
+         * @param {Object} options
+         */
+        function Clipboard(trigger, options) {
+            _classCallCheck(this, Clipboard);
+
+            var _this = _possibleConstructorReturn(this, (Clipboard.__proto__ || Object.getPrototypeOf(Clipboard)).call(this));
+
+            _this.resolveOptions(options);
+            _this.listenClick(trigger);
+            return _this;
+        }
+
+        /**
+         * Defines if attributes would be resolved using internal setter functions
+         * or custom functions that were passed in the constructor.
+         * @param {Object} options
+         */
+
+
+        _createClass(Clipboard, [{
+            key: 'resolveOptions',
+            value: function resolveOptions() {
+                var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+                this.action = typeof options.action === 'function' ? options.action : this.defaultAction;
+                this.target = typeof options.target === 'function' ? options.target : this.defaultTarget;
+                this.text = typeof options.text === 'function' ? options.text : this.defaultText;
+                this.container = _typeof(options.container) === 'object' ? options.container : document.body;
+            }
+        }, {
+            key: 'listenClick',
+            value: function listenClick(trigger) {
+                var _this2 = this;
+
+                this.listener = (0, _goodListener2.default)(trigger, 'click', function (e) {
+                    return _this2.onClick(e);
+                });
+            }
+        }, {
+            key: 'onClick',
+            value: function onClick(e) {
+                var trigger = e.delegateTarget || e.currentTarget;
+
+                if (this.clipboardAction) {
+                    this.clipboardAction = null;
+                }
+
+                this.clipboardAction = new _clipboardAction2.default({
+                    action: this.action(trigger),
+                    target: this.target(trigger),
+                    text: this.text(trigger),
+                    container: this.container,
+                    trigger: trigger,
+                    emitter: this
+                });
+            }
+        }, {
+            key: 'defaultAction',
+            value: function defaultAction(trigger) {
+                return getAttributeValue('action', trigger);
+            }
+        }, {
+            key: 'defaultTarget',
+            value: function defaultTarget(trigger) {
+                var selector = getAttributeValue('target', trigger);
+
+                if (selector) {
+                    return document.querySelector(selector);
+                }
+            }
+        }, {
+            key: 'defaultText',
+            value: function defaultText(trigger) {
+                return getAttributeValue('text', trigger);
+            }
+        }, {
+            key: 'destroy',
+            value: function destroy() {
+                this.listener.destroy();
+
+                if (this.clipboardAction) {
+                    this.clipboardAction.destroy();
+                    this.clipboardAction = null;
+                }
+            }
+        }], [{
+            key: 'isSupported',
+            value: function isSupported() {
+                var action = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : ['copy', 'cut'];
+
+                var actions = typeof action === 'string' ? [action] : action;
+                var support = !!document.queryCommandSupported;
+
+                actions.forEach(function (action) {
+                    support = support && !!document.queryCommandSupported(action);
+                });
+
+                return support;
+            }
+        }]);
+
+        return Clipboard;
+    }(_tinyEmitter2.default);
+
+    /**
+     * Helper function to retrieve attribute value.
+     * @param {String} suffix
+     * @param {Element} element
+     */
+    function getAttributeValue(suffix, element) {
+        var attribute = 'data-clipboard-' + suffix;
+
+        if (!element.hasAttribute(attribute)) {
+            return;
+        }
+
+        return element.getAttribute(attribute);
+    }
+
+    module.exports = Clipboard;
+});
+
+/***/ }),
+/* 4 */
+/***/ (function(module, exports) {
+
+var DOCUMENT_NODE_TYPE = 9;
+
+/**
+ * A polyfill for Element.matches()
+ */
+if (typeof Element !== 'undefined' && !Element.prototype.matches) {
+    var proto = Element.prototype;
+
+    proto.matches = proto.matchesSelector ||
+                    proto.mozMatchesSelector ||
+                    proto.msMatchesSelector ||
+                    proto.oMatchesSelector ||
+                    proto.webkitMatchesSelector;
+}
+
+/**
+ * Finds the closest parent that matches a selector.
+ *
+ * @param {Element} element
+ * @param {String} selector
+ * @return {Function}
+ */
+function closest (element, selector) {
+    while (element && element.nodeType !== DOCUMENT_NODE_TYPE) {
+        if (typeof element.matches === 'function' &&
+            element.matches(selector)) {
+          return element;
+        }
+        element = element.parentNode;
+    }
+}
+
+module.exports = closest;
+
+
+/***/ }),
+/* 5 */
+/***/ (function(module, exports, __webpack_require__) {
+
+var closest = __webpack_require__(4);
+
+/**
+ * Delegates event to a selector.
+ *
+ * @param {Element} element
+ * @param {String} selector
+ * @param {String} type
+ * @param {Function} callback
+ * @param {Boolean} useCapture
+ * @return {Object}
+ */
+function _delegate(element, selector, type, callback, useCapture) {
+    var listenerFn = listener.apply(this, arguments);
+
+    element.addEventListener(type, listenerFn, useCapture);
+
+    return {
+        destroy: function() {
+            element.removeEventListener(type, listenerFn, useCapture);
+        }
+    }
+}
+
+/**
+ * Delegates event to a selector.
+ *
+ * @param {Element|String|Array} [elements]
+ * @param {String} selector
+ * @param {String} type
+ * @param {Function} callback
+ * @param {Boolean} useCapture
+ * @return {Object}
+ */
+function delegate(elements, selector, type, callback, useCapture) {
+    // Handle the regular Element usage
+    if (typeof elements.addEventListener === 'function') {
+        return _delegate.apply(null, arguments);
+    }
+
+    // Handle Element-less usage, it defaults to global delegation
+    if (typeof type === 'function') {
+        // Use `document` as the first parameter, then apply arguments
+        // This is a short way to .unshift `arguments` without running into deoptimizations
+        return _delegate.bind(null, document).apply(null, arguments);
+    }
+
+    // Handle Selector-based usage
+    if (typeof elements === 'string') {
+        elements = document.querySelectorAll(elements);
+    }
+
+    // Handle Array-like based usage
+    return Array.prototype.map.call(elements, function (element) {
+        return _delegate(element, selector, type, callback, useCapture);
+    });
+}
+
+/**
+ * Finds closest match and invokes callback.
+ *
+ * @param {Element} element
+ * @param {String} selector
+ * @param {String} type
+ * @param {Function} callback
+ * @return {Function}
+ */
+function listener(element, selector, type, callback) {
+    return function(e) {
+        e.delegateTarget = closest(e.target, selector);
+
+        if (e.delegateTarget) {
+            callback.call(element, e);
+        }
+    }
+}
+
+module.exports = delegate;
+
+
+/***/ }),
+/* 6 */
+/***/ (function(module, exports) {
+
+/**
+ * Check if argument is a HTML element.
+ *
+ * @param {Object} value
+ * @return {Boolean}
+ */
+exports.node = function(value) {
+    return value !== undefined
+        && value instanceof HTMLElement
+        && value.nodeType === 1;
+};
+
+/**
+ * Check if argument is a list of HTML elements.
+ *
+ * @param {Object} value
+ * @return {Boolean}
+ */
+exports.nodeList = function(value) {
+    var type = Object.prototype.toString.call(value);
+
+    return value !== undefined
+        && (type === '[object NodeList]' || type === '[object HTMLCollection]')
+        && ('length' in value)
+        && (value.length === 0 || exports.node(value[0]));
+};
+
+/**
+ * Check if argument is a string.
+ *
+ * @param {Object} value
+ * @return {Boolean}
+ */
+exports.string = function(value) {
+    return typeof value === 'string'
+        || value instanceof String;
+};
+
+/**
+ * Check if argument is a function.
+ *
+ * @param {Object} value
+ * @return {Boolean}
+ */
+exports.fn = function(value) {
+    var type = Object.prototype.toString.call(value);
+
+    return type === '[object Function]';
+};
+
+
+/***/ }),
+/* 7 */
+/***/ (function(module, exports) {
+
+function select(element) {
+    var selectedText;
+
+    if (element.nodeName === 'SELECT') {
+        element.focus();
+
+        selectedText = element.value;
+    }
+    else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
+        var isReadOnly = element.hasAttribute('readonly');
+
+        if (!isReadOnly) {
+            element.setAttribute('readonly', '');
+        }
+
+        element.select();
+        element.setSelectionRange(0, element.value.length);
+
+        if (!isReadOnly) {
+            element.removeAttribute('readonly');
+        }
+
+        selectedText = element.value;
+    }
+    else {
+        if (element.hasAttribute('contenteditable')) {
+            element.focus();
+        }
+
+        var selection = window.getSelection();
+        var range = document.createRange();
+
+        range.selectNodeContents(element);
+        selection.removeAllRanges();
+        selection.addRange(range);
+
+        selectedText = selection.toString();
+    }
+
+    return selectedText;
+}
+
+module.exports = select;
+
+
+/***/ })
+/******/ ]);
+});

Разница между файлами не показана из-за своего большого размера
+ 7 - 0
src/main/webapp/js/plugin/clipboard/clipboard.min.js


+ 77 - 17
src/main/webapp/js/plugin/layui/src/lay/modules/layedit.js

@@ -25,11 +25,13 @@ layui.define(['layer', 'form'], function(exports){
     that.config = {
       //默认工具bar
       tool: [
-        'strong', 'italic', 'underline', 'del'
+        'html','strong', 'italic', 'underline', 'del'
         ,'|'
         ,'left', 'center', 'right'
         ,'|'
-        ,'link', 'unlink', 'face', 'image'
+        ,'link', 'unlink', 'face',"code",
+          '|',
+          'image','audio','video'
       ]
       ,hideTool: []
       ,height: 280 //默认高
@@ -79,7 +81,7 @@ layui.define(['layer', 'form'], function(exports){
       ,'<div class="layui-layedit-iframe">'
         ,'<iframe id="'+ name +'" name="'+ name +'" textarea="'+ id +'" frameborder="0"></iframe>'
       ,'</div>'
-    ,'</div>'].join(''))
+    ,'</div>'].join(''));;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     
     //编辑器不兼容ie8以下
     if(device.ie && device.ie < 8){
@@ -88,7 +90,7 @@ layui.define(['layer', 'form'], function(exports){
 
     haveBuild[0] && (haveBuild.remove());
 
-    setIframe.call(that, editor, textArea[0], set)
+    setIframe.call(that, editor, textArea[0], set);;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     textArea.addClass('layui-hide').after(editor);
 
     return that.index;
@@ -120,8 +122,8 @@ layui.define(['layer', 'form'], function(exports){
       $(iframeWin[0].document.body).append(content)
     }else{
       $(iframeWin[0].document.body).html(content)
-    };
-    layedit.sync(index)
+    }
+      layedit.sync(index)
   };
   //将编辑器内容同步到textarea(一般用于异步提交时)
   Edit.prototype.sync = function(index){
@@ -199,7 +201,7 @@ layui.define(['layer', 'form'], function(exports){
         ,parentNode = container.parentNode;
         
         if(parentNode.tagName.toLowerCase() === 'pre'){
-          if(e.shiftKey) return
+          if(e.shiftKey) return;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
           layer.msg('请暂时用shift+enter');
           return false;
         }
@@ -265,7 +267,7 @@ layui.define(['layer', 'form'], function(exports){
   //在选区插入内联元素
   ,insertInline = function(tagName, attr, range){
     var iframeDOM = this.document
-    ,elem = document.createElement(tagName)
+    ,elem = document.createElement(tagName);;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     for(var key in attr){
       elem.setAttribute(key, attr[key]);
     }
@@ -297,7 +299,7 @@ layui.define(['layer', 'form'], function(exports){
     ,container = getContainer(Range(iframeDOM))
     ,item = function(type){
       return tools.find('.layedit-tool-'+type)
-    }
+    };;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
     if(othis){
       othis[othis.hasClass(CHECK) ? 'removeClass' : 'addClass'](CHECK);
@@ -405,6 +407,54 @@ layui.define(['layer', 'form'], function(exports){
           });
         });
       }
+      //视频
+      ,video: function(range){
+        var that = this;
+        layui.use('upload', function(upload){
+          var uploadVideo = set.uploadVideo || {};
+          upload.render({
+            url: uploadVideo.url
+            ,method: uploadVideo.type
+            ,accept:"video"
+            ,elem: $(that).find('input')[0]
+            ,done: function(res){
+              if(res.code == 0){
+                res.data = res.data || {};
+                insertInline.call(iframeWin, 'video', {
+                  src: res.data.src
+                  ,alt: res.data.title
+                }, range);
+              } else {
+                layer.msg(res.msg||'上传失败');
+              }
+            }
+          });
+        });
+      }
+      //音频
+      ,audio: function(range){
+        var that = this;
+        layui.use('upload', function(upload){
+          var uploadAudio = set.uploadAudio || {};
+          upload.render({
+            url: uploadAudio.url
+            ,method: uploadAudio.type
+            ,accept:"audio"
+            ,elem: $(that).find('input')[0]
+            ,done: function(res){
+              if(res.code == 0){
+                res.data = res.data || {};
+                insertInline.call(iframeWin, 'audio', {
+                  src: res.data.src
+                  ,alt: res.data.title
+                }, range);
+              } else {
+                layer.msg(res.msg||'上传失败');
+              }
+            }
+          });
+        });
+      }
       //插入代码
       ,code: function(range){
         code.call(body, function(pre){
@@ -429,7 +479,7 @@ layui.define(['layer', 'form'], function(exports){
     }
     ,tools = editor.find('.layui-layedit-tool')
     
-    ,click = function(){
+    ,click = function(e){
       var othis = $(this)
       ,events = othis.attr('layedit-event')
       ,command = othis.attr('lay-command');
@@ -439,7 +489,12 @@ layui.define(['layer', 'form'], function(exports){
       body.focus();
       
       var range = Range(iframeDOM)
-      ,container = range.commonAncestorContainer
+      ,container = range.commonAncestorContainer;
+      if((events=="audio" || events=="video") && range.commonAncestorContainer.tagName=="BODY"){
+            layer.msg("根节点下不可添加");
+            e.preventDefault();
+            return;
+        }
       
       if(command){
         iframeDOM.execCommand(command);
@@ -455,18 +510,18 @@ layui.define(['layer', 'form'], function(exports){
       toolCheck.call(iframeWin, tools, othis);
     }
     
-    ,isClick = /image/
+    ,isClick = /image|video|audio/;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-    tools.find('>i').on('mousedown', function(){
+    tools.find('>i').on('mousedown', function(e){
       var othis = $(this)
       ,events = othis.attr('layedit-event');
       if(isClick.test(events)) return;
-      click.call(this)
-    }).on('click', function(){
+      click.call(this,e)
+    }).on('click', function(e){
       var othis = $(this)
       ,events = othis.attr('layedit-event');
       if(!isClick.test(events)) return;
-      click.call(this)
+      click.call(this,e)
     });
     
     //触发内容区域
@@ -538,7 +593,7 @@ layui.define(['layer', 'form'], function(exports){
       if($(e.target).attr('layedit-event') !== 'face'){
         layer.close(face.index);
       }
-    }
+    };;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
     return face.index = layer.tips(function(){
       var content = [];
       layui.each(faces, function(key, item){
@@ -641,9 +696,14 @@ layui.define(['layer', 'form'], function(exports){
     ,code: '<i class="layui-icon layedit-tool-code" title="插入代码" layedit-event="code">&#xe64e;</i>'
     
     ,help: '<i class="layui-icon layedit-tool-help" title="帮助" layedit-event="help">&#xe607;</i>'
+    ,audio: '<i class="iconfont icon-fileaudio" title="音频" layedit-event="audio"><input type="file" name="file"></i>'
+    ,video: '<i class="iconfont icon-shipin" title="视频" layedit-event="video"><input type="file" name="file"></i>'
+
   }
   
   ,edit = new Edit();
 
   exports(MOD_NAME, edit);
 });
+
+

+ 27 - 12
src/main/webapp/views/index/workbench.html

@@ -105,6 +105,7 @@
             var end = $("#end").val();
             var start = $("#start").val();
             dataCube(data.index + 1, tp, start, end);
+            $(window).trigger("resize");
         });
         //日期选择
         laydate.render({
@@ -125,6 +126,14 @@
         var chart2 = echarts.init($("#chart2")[0], 'macarons');
         var chart3 = echarts.init($("#chart3")[0], 'macarons');
         var chart4 = echarts.init($("#chart4")[0], 'macarons');
+
+        $(window).resize(function () {
+            chart1.resize();
+            chart2.resize();
+            chart3.resize();
+            chart4.resize();
+        });
+
         //增加初始化数据
         dataCube(1, "getusersummary", moment().add(-7, 'day').format("YYYY-MM-DD"), moment().add(-1, 'day').format("YYYY-MM-DD"));
         dataCube(2, "getusercumulate", moment().add(-7, 'day').format("YYYY-MM-DD"), moment().add(-1, 'day').format("YYYY-MM-DD"));
@@ -137,7 +146,6 @@
          end:结束时间
          **/
         function dataCube(index, type, start, end) {
-
             if (index && type && start && end) {
                 var load = layer.load();
                 $.ajax({
@@ -149,7 +157,7 @@
                     },
                     success: function (result) {
                         layer.close(load);
-                        console.log(result)
+                        console.log(result);;;;;;;;;;;;;;;;
                         if (result.success) {
                             if (index == 1) {
                                 var xAxisData = Array();//x轴数据
@@ -161,7 +169,7 @@
                                         xAxisData.push(el.ref_date);
                                         seriesData1.push(el.new_user);
                                         seriesData2.push(el.cancel_user);
-                                        var jz = (el.new_user - el.cancel_user) >= 0 ? (el.new_user - el.cancel_user) : 0
+                                        var jz = (el.new_user - el.cancel_user) >= 0 ? (el.new_user - el.cancel_user) : 0;;;;;;;;;;;;;;;;
                                         seriesData3.push(jz);
                                     });
                                 }
@@ -177,10 +185,10 @@
                                         }
                                     },
                                     grid: {
-                                        left: '3%',
-                                        right: '3%',
-                                        bottom: '1%',
-                                        top: '3%',
+                                        left: 30,
+                                        right: 50,
+                                        bottom: 20,
+                                        top: 30,
                                         containLabel: true
                                     },
                                     tooltip: {
@@ -248,6 +256,13 @@
                                             show: false
                                         }
                                     },
+                                    grid: {
+                                        left: 30,
+                                        right: 50,
+                                        bottom: 20,
+                                        top: 30,
+                                        containLabel: true
+                                    },
                                     legend: {
                                         data: ['累计人数']
                                     },
@@ -287,8 +302,8 @@
                                         }
                                     },
                                     grid: {
-                                        left: 10,
-                                        right: 10,
+                                        left: 30,
+                                        right: 50,
                                         bottom: 20,
                                         top: 30,
                                         containLabel: true
@@ -362,8 +377,8 @@
                                         }
                                     },
                                     grid: {
-                                        left: 10,
-                                        right: 10,
+                                        left: 30,
+                                        right: 50,
                                         bottom: 20,
                                         top: 30,
                                         containLabel: true
@@ -406,7 +421,7 @@
                     }
                 })
             } else {
-                layer.msg("时间区间数据为空!!!");
+                //layer.msg("时间区间数据为空!!!");
             }
 
         }

+ 10 - 2
src/main/webapp/views/material/document/addmultiple.html

@@ -93,7 +93,15 @@
             uploadImage: {
                 url: '/managerImg/uploadFile',
                 type: 'post'
-            }
+            },
+            uploadVideo: {
+                url: '/views/test/upvideo.json',
+                type: 'post'
+            },
+            uploadAudio: {
+                url: '/views/test/upaudio.json',
+                type: 'post'
+            },
         });
         var layeditIndex = layedit.build('content'); //建立编辑器
         window.listData = [{t: 1}];
@@ -278,7 +286,7 @@
                     form.render();
                     layeditIndex = layedit.build('content');
 
-                    $(".wxmp-doclist div[data-t=" + t + "]").addClass("active").siblings(".active").removeClass("active")
+                    $(".wxmp-doclist div[data-t=" + t + "]").addClass("active").siblings(".active").removeClass("active");;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
                     $("#add_form").attr("data-t", t);
                     return false;
                 }

+ 9 - 1
src/main/webapp/views/material/document/addsingle.html

@@ -94,7 +94,15 @@
             uploadImage: {
                 url: '/managerImg/uploadFile',
                 type: 'post'
-            }
+            },
+            uploadVideo: {
+                url: '/views/test/upvideo.json',
+                type: 'post'
+            },
+            uploadAudio: {
+                url: '/views/test/upaudio.json',
+                type: 'post'
+            },
         });
         var layeditIndex = layedit.build('content');
 

+ 10 - 3
src/main/webapp/views/material/document/editmultiple.html

@@ -83,12 +83,19 @@
     layui.use('layedit', function () {
         var layedit = layui.layedit;
         var form = layui.form;
-        // 设置富文本上传接口
         layedit.set({
             uploadImage: {
                 url: '/managerImg/uploadFile',
                 type: 'post'
-            }
+            },
+            uploadVideo: {
+                url: '/views/test/upvideo.json',
+                type: 'post'
+            },
+            uploadAudio: {
+                url: '/views/test/upaudio.json',
+                type: 'post'
+            },
         });
         var layeditIndex=layedit.build('content'); //建立编辑器
         var upload = layui.upload;
@@ -316,7 +323,7 @@
                     form.render();
                     layeditIndex = layedit.build('content');
 
-                    $(".wxmp-doclist div[data-t=" + t + "]").addClass("active").siblings(".active").removeClass("active")
+                    $(".wxmp-doclist div[data-t=" + t + "]").addClass("active").siblings(".active").removeClass("active");;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
                     $("#add_form").attr("data-t", t);
                     return false;
                 }

+ 11 - 1
src/main/webapp/views/material/document/editsingle.html

@@ -81,6 +81,8 @@
         </div>
     </div>
 </div>
+<video src="/views/test/upvideo.json"></video>
+<audio src="/views/test/upaudio.json"></audio>
 <script>
     layui.use(['layedit', "upload", "form"], function () {
         var layedit = layui.layedit;
@@ -92,7 +94,15 @@
             uploadImage: {
                 url: '/managerImg/uploadFile',
                 type: 'post'
-            }
+            },
+            uploadVideo: {
+                url: '/views/test/upvideo.json',
+                type: 'post'
+            },
+            uploadAudio: {
+                url: '/views/test/upaudio.json',
+                type: 'post'
+            },
         });
         var layeditIndex = layedit.build('content');
         var id=getHashParam().id;

+ 21 - 5
src/main/webapp/views/system/url/template/form.html

@@ -12,6 +12,7 @@
     <div class="layui-input-block">
         <input type="text" name="name" lay-verify="required" placeholder="公众号名称" class="layui-input" value="<%=data.account.name%>">
     </div>
+
 </div>
 <div class="layui-form-item">
     <label class="layui-form-label"><i>*</i>公众号原始ID</label>
@@ -21,14 +22,16 @@
 </div>
 <div class="layui-form-item">
     <label class="layui-form-label">URL</label>
-    <div class="layui-input-block">
-        <input type="text" name="url" readonly placeholder="请输入url" class="layui-input" value="<%=data.account.url%>">
+    <button class="layui-btn btn-copy" style="float: right" data-clipboard-action="copy" data-clipboard-target="#copy_url"><i class="icon-fuzhi iconfont"></i>复制</button>
+    <div class="layui-input-block" style="margin-right: 80px;">
+        <input id="copy_url" type="text" name="url" readonly placeholder="请输入url" class="layui-input" value="<%=data.account.url%>">
     </div>
 </div>
 <div class="layui-form-item">
     <label class="layui-form-label">Token</label>
-    <div class="layui-input-block">
-        <input type="text" name="token" readonly placeholder="Token" class="layui-input" value="<%=data.account.token%>">
+    <button class="layui-btn btn-copy" style="float: right" data-clipboard-action="copy" data-clipboard-target="#copy_token"><i class="icon-fuzhi iconfont"></i>复制</button>
+    <div class="layui-input-block" style="margin-right: 80px;">
+        <input id="copy_token" type="text" name="token" readonly placeholder="Token" class="layui-input" value="<%=data.account.token%>">
     </div>
 </div>
 <div class="layui-form-item">
@@ -54,6 +57,19 @@
     </div>
     <span class="tips">(回复图文消息条数)</span>
 </div>
+<script src="/js/plugin/clipboard/clipboard.min.js"></script>
 <script>
-    layui.form.render();
+    $(function () {
+        layui.form.render();
+        util.loadJs("/js/plugin/clipboard/clipboard.min.js",function () {
+            var clipboard = new ClipboardJS('.btn-copy');
+            clipboard.on('success', function(e) {
+                layer.msg("复制成功!");
+            });
+
+            clipboard.on('error', function(e) {
+                layer.msg("复制失败!");
+            });
+        });
+    });
 </script>