fixed: 更换插件名

2019-11-07 22:03:03 +08:00 · 2019-11-07 22:03:03 +08:00 · cfa24c7ffa
parent 49a572d3c7
commit cfa24c7ffa
11 changed files with 38 additions and 519 deletions
--- a/data/navs.json
+++ b/data/navs.json
@ -390,11 +390,11 @@
        "icon": "&#xe674;",
        "children": [
            {
-                "title": "jquery.qrcode.js",
+                "title": "jquery.okQrcode.js",
                "href": "pages/tripartite/qrcode.html"
            },
            {
-                "title": "jquery.countup.js",
+                "title": "jquery.okCountup.js",
                "href": "pages/tripartite/countup.html"
            },
            {
--- a/js/console.js
+++ b/js/console.js
@ -1,6 +1,6 @@
 "use strict";
-layui.use(["okUtils", "table", "countUp", "okMock"], function () {
-    var countUp = layui.countUp;
+layui.use(["okUtils", "table", "okCountUp", "okMock"], function () {
+    var countUp = layui.okCountUp;
    var table = layui.table;
    var okUtils = layui.okUtils;
    var okMock = layui.okMock;
--- a/js/console1.js
+++ b/js/console1.js
@ -1,6 +1,6 @@
 "use strict";
-layui.use(["okUtils", "countUp"], function () {
-    var countUp = layui.countUp;
+layui.use(["okUtils", "okCountUp"], function () {
+    var countUp = layui.okCountUp;
    var okUtils = layui.okUtils;
    var $ = layui.jquery;

--- a/js/okadmin.js
+++ b/js/okadmin.js
@ -1,7 +1,7 @@
 /^http(s*):\/\//.test(location.href) || alert('请先部署到 localhost 下再访问');

 var objOkTab = "";
-layui.use(["element", "layer", "okUtils", "okTab", "okLayer", "jQContextMenu"], function () {
+layui.use(["element", "layer", "okUtils", "okTab", "okLayer", "okContextMenu"], function () {
  var okUtils = layui.okUtils;
  var $ = layui.jquery;
  var layer = layui.layer;
@ -24,7 +24,7 @@ layui.use(["element", "layer", "okUtils", "okTab", "okLayer", "jQContextMenu"],
   */
  okTab.render(function () {
    /**tab栏的鼠标右键事件**/
-    $("body .ok-tab").contextMenu({
+    $("body .ok-tab").okContextMenu({
      width: 'auto',
      itemHeight: 30,
      menu: [
--- a/lib/layui/lay/okmodules/countUp.js
+++ b/lib/layui/lay/okmodules/countUp.js
@ -1,274 +0,0 @@
-/**
- *  这是一个数字步进器的工具
- **/
-layui.define(['jquery'], function (exports) {
-    var $ = layui.jquery;
-
-    var CountUp = function (argums, startNum, endNum) {
-        /**
-         *  用法1.当argums是JSON对象
-         *  方法的startNum,endNum这两个参数无效
-         *  eg: var Count = new CountUp({target:$(".box")});
-         *          Count.start();
-         *   argums{
-                 target ： 目标元素
-                 startVal ： 你想要开始的值，默认值为0
-                 endVal ： 你想要到达的值，默认值为元素的值
-                 decimals ： 小数位数，默认值为0
-                 duration ： 动画持续时间为秒，默认值为2
-                 options ：选项的可选对象
-         *  }
-         *  用法2.当argums为字符串或者为jq元素（推荐是JQ元素哦,也可以是dom元素）
-         *  eg: var box = new CountUp(".box");
-         *      box.start();//开始执行
-         *  为字符串一定是个元素的JQ选择器
-         *  startNum：默认值0
-         *  endNum：默认值为元素的值
-         */
-        if ((typeof argums == "string") || (argums instanceof $) || (argums instanceof HTMLElement)) {
-            var temp = argums;
-            startNum = startNum || 0;
-            endNum = endNum || $($(argums.target)[0]).text();
-            argums = {
-                target: $(argums)[0],
-                startVal: startNum,
-                endVal: endNum,
-            }
-        }
-        argums.startVal = argums.startVal || 0;
-        argums.target = $(argums.target)[0];
-        argums.endVal = argums.endVal || $($(argums.target)[0]).text();
-        /*var {
-            target,
-            startVal,
-            endVal,
-            decimals,
-            duration,
-            options
-        } = argums;// 这里是ES6语法*/
-        var target = argums.target,
-           startVal = argums.startVal,
-           endVal = argums.endVal,
-           decimals = argums.decimals,
-           duration = argums.duration,
-           options = argums.options;
-        var self = this;
-        self.version = function () {
-            return "1.9.2"
-        };
-        self.options = {
-            useEasing: true,
-            useGrouping: true,
-            separator: ",",
-            decimal: ".",
-            easingFn: easeOutExpo,
-            formattingFn: formatNumber,
-            prefix: "",
-            suffix: "",
-            numerals: []
-        };
-
-        if (options && typeof options === "object") {
-            for (var key in self.options) {
-                if (options.hasOwnProperty(key) && options[key] !== null) {
-                    self.options[key] = options[key]
-                }
-            }
-        }
-        if (self.options.separator === "") {
-            self.options.useGrouping = false
-        } else {
-            self.options.separator = "" + self.options.separator
-        }
-        var lastTime = 0;
-        var vendors = ["webkit", "moz", "ms", "o"];
-        for (var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
-            window.requestAnimationFrame = window[vendors[x] + "RequestAnimationFrame"];
-            window.cancelAnimationFrame = window[vendors[x] + "CancelAnimationFrame"] || window[vendors[x] +
-            "CancelRequestAnimationFrame"]
-        }
-        if (!window.requestAnimationFrame) {
-            window.requestAnimationFrame = function (callback, element) {
-                var currTime = new Date().getTime();
-                var timeToCall = Math.max(0, 16 - (currTime - lastTime));
-                var id = window.setTimeout(function () {
-                    callback(currTime + timeToCall)
-                }, timeToCall);
-                lastTime = currTime + timeToCall;
-                return id
-            }
-        }
-        if (!window.cancelAnimationFrame) {
-            window.cancelAnimationFrame = function (id) {
-                clearTimeout(id)
-            }
-        }
-
-        function formatNumber(num) {
-            num = num.toFixed(self.decimals);
-            num += "";
-            var x, x1, x2, x3, i, l;
-            x = num.split(".");
-            x1 = x[0];
-            x2 = x.length > 1 ? self.options.decimal + x[1] : "";
-            if (self.options.useGrouping) {
-                x3 = "";
-                for (i = 0, l = x1.length; i < l; ++i) {
-                    if (i !== 0 && ((i % 3) === 0)) {
-                        x3 = self.options.separator + x3
-                    }
-                    x3 = x1[l - i - 1] + x3
-                }
-                x1 = x3
-            }
-            if (self.options.numerals.length) {
-                x1 = x1.replace(/[0-9]/g, function (w) {
-                    return self.options.numerals[+w]
-                });
-                x2 = x2.replace(/[0-9]/g, function (w) {
-                    return self.options.numerals[+w]
-                })
-            }
-            return self.options.prefix + x1 + x2 + self.options.suffix
-        }
-
-        function easeOutExpo(t, b, c, d) {
-            return c * (-Math.pow(2, -10 * t / d) + 1) * 1024 / 1023 + b
-        }
-
-        function ensureNumber(n) {
-            return (typeof n === "number" && !isNaN(n))
-        }
-
-        self.initialize = function () {
-            if (self.initialized) {
-                return true
-            }
-            self.error = "";
-            // self.d = (typeof target === "string") ? document.getElementById(target) : target;
-            self.d = target;
-            if (!self.d) {
-                self.error = "[CountUp] target is null or undefined";
-                return false
-            }
-            self.startVal = Number(startVal);
-            self.endVal = Number(endVal);
-            if (ensureNumber(self.startVal) && ensureNumber(self.endVal)) {
-                self.decimals = Math.max(0, decimals || 0);
-                self.dec = Math.pow(10, self.decimals);
-                self.duration = Number(duration) * 1000 || 2000;
-                self.countDown = (self.startVal > self.endVal);
-                self.frameVal = self.startVal;
-                self.initialized = true;
-                return true
-            } else {
-                self.error = "[CountUp] startVal (" + startVal + ") or endVal (" + endVal + ") is not a number";
-                return false
-            }
-        };
-        self.printValue = function (value) {
-            var result = self.options.formattingFn(value);
-            if (self.d.tagName === "INPUT") {
-                this.d.value = result
-            } else {
-                if (self.d.tagName === "text" || self.d.tagName === "tspan") {
-                    this.d.textContent = result
-                } else {
-                    this.d.innerHTML = result
-                }
-            }
-        };
-        self.count = function (timestamp) {
-            if (!self.startTime) {
-                self.startTime = timestamp
-            }
-            self.timestamp = timestamp;
-            var progress = timestamp - self.startTime;
-            self.remaining = self.duration - progress;
-            if (self.options.useEasing) {
-                if (self.countDown) {
-                    self.frameVal = self.startVal - self.options.easingFn(progress, 0, self.startVal - self.endVal,
-                        self.duration)
-                } else {
-                    self.frameVal = self.options.easingFn(progress, self.startVal, self.endVal - self.startVal,
-                        self.duration)
-                }
-            } else {
-                if (self.countDown) {
-                    self.frameVal = self.startVal - ((self.startVal - self.endVal) * (progress / self.duration))
-                } else {
-                    self.frameVal = self.startVal + (self.endVal - self.startVal) * (progress / self.duration)
-                }
-            }
-            if (self.countDown) {
-                self.frameVal = (self.frameVal < self.endVal) ? self.endVal : self.frameVal
-            } else {
-                self.frameVal = (self.frameVal > self.endVal) ? self.endVal : self.frameVal
-            }
-            self.frameVal = Math.round(self.frameVal * self.dec) / self.dec;
-            self.printValue(self.frameVal);
-            if (progress < self.duration) {
-                self.rAF = requestAnimationFrame(self.count)
-            } else {
-                if (self.callback) {
-                    self.callback()
-                }
-            }
-        };
-        self.start = function (callback) {
-            if (!self.initialize()) {
-                return
-            }
-            self.callback = callback;
-            self.rAF = requestAnimationFrame(self.count)
-        };
-        self.pauseResume = function () {
-            if (!self.paused) {
-                self.paused = true;
-                cancelAnimationFrame(self.rAF)
-            } else {
-                self.paused = false;
-                delete self.startTime;
-                self.duration = self.remaining;
-                self.startVal = self.frameVal;
-                requestAnimationFrame(self.count)
-            }
-        };
-        self.reset = function () {
-            self.paused = false;
-            delete self.startTime;
-            self.initialized = false;
-            if (self.initialize()) {
-                cancelAnimationFrame(self.rAF);
-                self.printValue(self.startVal)
-            }
-        };
-        self.update = function (newEndVal) {
-            if (!self.initialize()) {
-                return
-            }
-            newEndVal = Number(newEndVal);
-            if (!ensureNumber(newEndVal)) {
-                self.error = "[CountUp] update() - new endVal is not a number: " + newEndVal;
-                return
-            }
-            self.error = "";
-            if (newEndVal === self.frameVal) {
-                return
-            }
-            cancelAnimationFrame(self.rAF);
-            self.paused = false;
-            delete self.startTime;
-            self.startVal = self.frameVal;
-            self.endVal = newEndVal;
-            self.countDown = (self.startVal > self.endVal);
-            self.rAF = requestAnimationFrame(self.count)
-        };
-        if (self.initialize()) {
-            self.printValue(self.startVal)
-        }
-    };
-
-    exports('countUp', CountUp);
-});
-
--- a/lib/layui/lay/okmodules/jQContextMenu.js
+++ b/lib/layui/lay/okmodules/jQContextMenu.js
@ -1,64 +0,0 @@
-layui.define(['jquery'], function (exports) {
-  var jQuery = layui.jquery;
-  !function (t, n, e, i) {
-    var o = function (t, n) {
-      this.init(t, n)
-    };
-    o.prototype = {
-      init: function (t, n) {
-        this.ele = t, this.defaults = {
-          menu: [{
-            text: "菜单一", callback: function () {
-            }
-          }, {
-            text: "菜单二", callback: function () {
-            }
-          }], target: function (t) {
-          }, width: 100, itemHeight: 28, bgColor: "#fff", color: "#333", fontSize: 14, hoverBgColor: "#f5f5f5"
-        }, this.opts = e.extend(!0, {}, this.defaults, n), this.random = (new Date).getTime() + parseInt(1e3 * Math.random()), this.eventBind()
-      }, renderMenu: function () {
-        var t = this, n = "#uiContextMenu_" + this.random;
-        if (!(e(n).length > 0)) {
-          var t = this, i = '<ul class="ul-context-menu" id="uiContextMenu_' + this.random + '">';
-          e.each(this.opts.menu, function (t, n) {
-            n.icon ? i += '<li class="ui-context-menu-item"><a href="javascript:void(0);">' +
-              '<icon class="icon ' + n.icon + '" ></icon>' +
-              '<span>' + n.text + "</span></a></li>" : i += '<li class="ui-context-menu-item"><a href="javascript:void(0);"><span>' + n.text + "</span></a></li>"
-          }), i += "</ul>", e("body").append(i).find(".ul-context-menu").hide(), this.initStyle(n), e(n).on("click", ".ui-context-menu-item", function (n) {
-            t.menuItemClick(e(this)), n.stopPropagation()
-          })
-        }
-      }, initStyle: function (t) {
-        var n = this.opts;
-        e(t).css({width: n.width, backgroundColor: n.bgColor}).find(".ui-context-menu-item a").css({
-          color: n.color,
-          fontSize: n.fontSize,
-          height: n.itemHeight,
-          lineHeight: n.itemHeight + "px"
-        }).hover(function () {
-          e(this).css({backgroundColor: n.hoverBgColor})
-        }, function () {
-          e(this).css({backgroundColor: n.bgColor})
-        })
-      }, menuItemClick: function (t) {
-        var n = this, e = t.index();
-        t.parent(".ul-context-menu").hide(), n.opts.menu[e].callback && "function" == typeof n.opts.menu[e].callback && n.opts.menu[e].callback()
-      }, setPosition: function (t) {
-        e("#uiContextMenu_" + this.random).css({left: t.clientX + 2, top: t.clientY + 2}).show()
-      }, eventBind: function () {
-        var t = this;
-        this.ele.on("contextmenu", function (n) {
-          n.preventDefault(), t.renderMenu(), t.setPosition(n), t.opts.target && "function" == typeof t.opts.target && t.opts.target(e(this))
-        }), e(n).on("click", function () {
-          e(".ul-context-menu").hide()
-        })
-      }
-    }, e.fn.contextMenu = function (t) {
-      return new o(this, t), this
-    }
-  }(window, document, jQuery);
-  exports('jQContextMenu', function (obj) {
-
-  });
-});
-
--- a/lib/layui/lay/okmodules/jQqrcode.js
+++ b/lib/layui/lay/okmodules/jQqrcode.js
--- a/lib/layui/layui.js
+++ b/lib/layui/layui.js
@ -27,15 +27,15 @@ if (!Object.assign) {
    "use strict";
    var okmodules = {
        "okTab": "okmodules/okTab",
-        "countUp": "okmodules/countUp",
+        "okCountUp": "okmodules/okCountUp",
        "okUtils": "okmodules/okUtils",
        "okGVerify": "okmodules/okGVerify",
        "qrcode": "okmodules/qrcode",
-        "jQqrcode": "okmodules/jQqrcode",
+        "okQrcode": "okmodules/okQrcode",
        "okAddlink": "okmodules/okAddlink",
        "okLayer": "okmodules/okLayer",
        "okMock": "okmodules/okMock",
-        "jQContextMenu": "okmodules/jQContextMenu",
+        "okContextMenu": "okmodules/okContextMenu",
        "okCookie": "okmodules/okCookie",
        "okMd5": "okmodules/okMd5",
        "okToastr": "okmodules/okToastr",
--- a/pages/help/plug_directory.html
+++ b/pages/help/plug_directory.html
@ -1,30 +1,31 @@
 <!DOCTYPE html>
 <html>
 <head>
-   <meta charset="UTF-8">
-   <title>插件目录</title>
-   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-   <link rel="stylesheet" href="../../lib/layui/css/layui.css">
-   <style>
-      .ok-body {
-         padding: 20px;
-      }
-   </style>
+  <meta charset="UTF-8">
+  <title>插件目录</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+  <link rel="stylesheet" href="../../lib/layui/css/layui.css">
+  <style>
+    .ok-body {
+      padding: 20px;
+    }
+  </style>
 </head>
 <body>
 <div class="ok-body">
-   <blockquote class="layui-elem-quote">
-      <p>主要描述插件的目录和插件的引入。</p>
-   </blockquote>
-   <blockquote class="layui-elem-quote layui-quote-nm">
-      <p>1.如果你想使用countUp数字步进器，那么你需要引入一个countUp插件</p>
-   </blockquote>
-   <pre lay-title="导航参数">
+  <blockquote class="layui-elem-quote">
+    <p>主要描述插件的目录和插件的引入。</p>
+  </blockquote>
+  <blockquote class="layui-elem-quote layui-quote-nm">
+    <p>1.如果你想使用okCountUp数字步进器，那么你需要引入一个okCountUp插件</p>
+  </blockquote>
+  <pre lay-title="导航参数">
 引入插件并加载一个插件
-layui.use(['countUp'], function () {
-   var countUp = layui.countUp;
-   var page = '&lt;div lay-id="add-1" data-url="/pages/user/user.html"&gt;个人中心&lt;/div&gt;';
-   okTab.tabAdd(page);
+layui.use(['okCountUp'], function () {
+	var countUp = layui.okCountUp;
+	var okTab = parent.objOkTab;//获取父级的okTab;layui.okTab()不推荐这样获取
+	var page = '&lt;div lay-id="add-1" data-url="/pages/user/user.html"&gt;个人中心&lt;/div&gt;';
+	okTab.tabAdd(page);
 });
   </pre>
 </div>
--- a/pages/tripartite/countup.html
+++ b/pages/tripartite/countup.html
@ -28,13 +28,13 @@
 <body class="ok-body-scroll">
 <div class="ok-body">
   <blockquote class="layui-elem-quote">
-      <p>让数字动起来 countUp</p>
+      <p>让数字动起来 okCountUp</p>
      <p>1. 创建对象</p>
      <p>2. 调用对象的start方法执行</p>
   </blockquote>
   <pre lay-title="JavaScript">
-layui.use('countUp', function () {
-   var countUp = layui.countUp;
+layui.use('okCountUp', function () {
+   var countUp = layui.okCountUp;
   var count_up = new countUp({
      target: $('#countUp1'),
      startVal:5, //目标开始的值，默认值为0
@ -84,9 +84,9 @@ layui.use('countUp', function () {
 </html>
 <script src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
-   layui.use(['code', 'jquery', 'countUp'], function () {
+   layui.use(['code', 'jquery', 'okCountUp'], function () {
      var $ = layui.jquery,
-         countUp = layui.countUp,
+         countUp = layui.okCountUp,
         code = layui.code;
      code({
         elem: 'pre'
--- a/pages/tripartite/qrcode.html
+++ b/pages/tripartite/qrcode.html
@ -53,7 +53,7 @@ var q2 = $("#qrcodeCanvas3").qrcode({
 </html>
 <script src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
-  layui.use(['code', 'jquery', 'jQqrcode', 'qrcode'], function () {
+  layui.use(['code', 'jquery', 'okQrcode', 'qrcode'], function () {
    var code = layui.code,
      qrcode = layui.qrcode,
      $ = layui.jquery;