From 2e884b055302afe36562bf7bc2cf8af6273f20bd Mon Sep 17 00:00:00 2001
From: bobi <bobi1234@foxmail.com>
Date: Sun, 19 May 2019 00:50:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=B7=A5=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/okPlugins/okTab.js           |  2 +-
 lib/okPlugins/okUtils.js         | 57 ++++++++++++++++++--------------
 pages/system/system-setting.html | 16 ++++-----
 3 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/lib/okPlugins/okTab.js b/lib/okPlugins/okTab.js
index f132e5e..6ff0e27 100644
--- a/lib/okPlugins/okTab.js
+++ b/lib/okPlugins/okTab.js
@@ -11,7 +11,7 @@ layui.define(["element", "okUtils"], function (exports) {
                 return false;
             }
             // 根据path自动生成tabId值
-            var tabId = okUtils.str.hash(path)
+            var tabId = okUtils.string.hash(path)
             // 去重复选项卡
             var okFrame = $(".ok-frame", window.top.document);
             for (var i = 0; i < okFrame.length; i++) {
diff --git a/lib/okPlugins/okUtils.js b/lib/okPlugins/okUtils.js
index f6bcf71..fe31d21 100644
--- a/lib/okPlugins/okUtils.js
+++ b/lib/okPlugins/okUtils.js
@@ -73,30 +73,6 @@ layui.define("layer", function (exports) {
                 });
             }
         },
-        /**
-         * 判断是否为一个正常的数字
-         * @param num
-         */
-        isNum: function (num) {
-            if (num && !isNaN(num)) {
-                return true;
-            }
-            return false;
-        },
-        /**
-         * 判断一个数字是否包括在某个范围
-         * @param num
-         * @param begin
-         * @param end
-         */
-        isNumWith: function (num, begin, end) {
-            if (this.isNum(num)) {
-                if (num >= begin && num <= end) {
-                    return true;
-                }
-                return false;
-            }
-        },
         date: {
             /**
              * 格式化日期时间
@@ -122,7 +98,12 @@ layui.define("layer", function (exports) {
                 return fmt;
             }
         },
-        str: {
+        string: {
+            /**
+             * 为字符串生成hash值
+             * @param value
+             * @returns {number}
+             */
             hash: function (value) {
                 var hash = 1315423911, i, ch;
                 for (i = value.length - 1; i >= 0; i--) {
@@ -131,6 +112,32 @@ layui.define("layer", function (exports) {
                 }
                 return (hash & 0x7FFFFFFF);
             }
+        },
+        number: {
+            /**
+             * 判断是否为一个正常的数字
+             * @param num
+             */
+            isNumber: function (num) {
+                if (num && !isNaN(num)) {
+                    return true;
+                }
+                return false;
+            },
+            /**
+             * 判断一个数字是否包括在某个范围
+             * @param num
+             * @param begin
+             * @param end
+             */
+            isNumberWith: function (num, begin, end) {
+                if (this.isNumber(num)) {
+                    if (num >= begin && num <= end) {
+                        return true;
+                    }
+                    return false;
+                }
+            },
         }
     }
 
diff --git a/pages/system/system-setting.html b/pages/system/system-setting.html
index ce6dab7..1ca5c0d 100644
--- a/pages/system/system-setting.html
+++ b/pages/system/system-setting.html
@@ -46,7 +46,7 @@
 								<th>类别</th>
 								<th>说明</th>
 								<th>参数值</th>
-							</tr> 
+							</tr>
 						</thead>
 						<tbody>
 							<tr>
@@ -101,7 +101,7 @@
 								<th>参数说明</th>
 								<th>变量名</th>
 								<th>参数值</th>
-							</tr> 
+							</tr>
 						</thead>
 						<tbody>
 							<tr>
@@ -175,7 +175,7 @@
 			<div class="layui-tab-item">待开发1</div>
 			<div class="layui-tab-item">待开发2</div>
 		</div>
-	</div>   
+	</div>
 </div>
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
@@ -190,22 +190,22 @@
 		var form = layui.form;
         var okLayer = layui.okLayer;
         var okUtils = layui.okUtils;
-		
+
 		// select控件默认选中
 		var storage = window.localStorage;
 		var skin = storage.getItem("skin");
 		var anim = storage.getItem("anim");
-		$("#skin").val(okUtils.isNumWith(skin, 1, 4) ? skin : 1);
-		$("#anim").val(okUtils.isNumWith(anim, 0, 7) ? anim : 0);
+		$("#skin").val(okUtils.number.isNumberWith(skin, 1, 4) ? skin : 1);
+		$("#anim").val(okUtils.number.isNumberWith(anim, 0, 7) ? anim : 0);
 		form.render()
-		
+
 		form.on("submit(skinAnimSubmit)", function (data) {
 			storage.skin = data.field.skin;
 			storage.anim = data.field.anim;
 			okLayer.msg.greenTick("设置成功")
 		    return false;
 		});
-		
+
 		form.on("submit(basicParamSubmit)", function (data) {
 		    alert("basicParamSubmit");
 		    return false;