oipage 1.6.0 → 1.7.0-alpha.1

package/web/animation/index.js

@@ -1,109 +1,109 @@
 /*!
-* animation of OIPage v1.6.0
+* animation of OIPage v1.7.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-//当前正在运动的动画的tick函数堆栈
-var $timers = [];
-//唯一定时器的定时间隔
-var $interval = 13;
-//定时器ID
-var $timerId;
-
-/**
- * 动画轮播
- * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
- * @param {number} duration 动画时长，可选
- * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
- *
- * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
- */
-export function animation(doback, duration, callback) {
-    if (arguments.length < 2) duration = 400;
-    if (arguments.length < 3) callback = function () { };
-
-    var clock = {
-        //把tick函数推入堆栈
-        "timer": function (tick, duration, callback) {
-            if (!tick) {
-                throw new Error('Tick is required!');
-            }
-            var id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0);
-            $timers.push({
-                "id": id,
-                "createTime": new Date(),
-                "tick": tick,
-                "duration": duration,
-                "callback": callback
-            });
-            clock.start();
-            return id;
-        },
-
-        //开启唯一的定时器timerId
-        "start": function () {
-            if (!$timerId) {
-                $timerId = setInterval(clock.tick, $interval);
-            }
-        },
-
-        //被定时器调用，遍历timers堆栈
-        "tick": function () {
-            var createTime, flag, tick, callback, timer, duration, passTime, timers = $timers;
-
-            $timers = [];
-            $timers.length = 0;
-
-            for (flag = 0; flag < timers.length; flag++) {
-                //初始化数据
-                timer = timers[flag];
-                createTime = timer.createTime;
-                tick = timer.tick;
-                duration = timer.duration;
-                callback = timer.callback;
-
-                //执行
-                passTime = (+new Date().valueOf() - createTime.valueOf()) / duration;
-                passTime = passTime > 1 ? 1 : passTime;
-                tick(passTime);
-                if (passTime < 1 && timer.id) {
-                    //动画没有结束再添加
-                    $timers.push(timer);
-                } else {
-                    callback(passTime);
-                }
-            }
-            if ($timers.length <= 0) {
-                clock.stop();
-            }
-        },
-
-        //停止定时器，重置timerId=null
-        "stop": function () {
-            if ($timerId) {
-                clearInterval($timerId);
-                $timerId = null;
-            }
-        }
-    };
-
-    var id = clock.timer(function (deep) {
-        //其中deep为0-1，表示改变的程度
-        doback(deep);
-    }, duration, callback);
-
-    return {
-        // 一个函数
-        // 用于在动画结束前结束动画
-        stop: function () {
-            var i;
-            for (i in $timers) {
-                if ($timers[i].id == id) {
-                    $timers[i].id = void 0;
-                    return;
-                }
-            }
-        }
-    };
-
+//当前正在运动的动画的tick函数堆栈
+var $timers = [];
+//唯一定时器的定时间隔
+var $interval = 13;
+//定时器ID
+var $timerId;
+
+/**
+ * 动画轮播
+ * @param {function} doback 轮询函数，有一个形参deep，0-1，表示执行进度
+ * @param {number} duration 动画时长，可选
+ * @param {function} callback 动画结束回调，可选，有一个形参deep，0-1，表示执行进度
+ *
+ * @returns {function} 返回一个函数，调用该函数，可以提前结束动画
+ */
+export function animation(doback, duration, callback) {
+    if (arguments.length < 2) duration = 400;
+    if (arguments.length < 3) callback = function () { };
+
+    var clock = {
+        //把tick函数推入堆栈
+        "timer": function (tick, duration, callback) {
+            if (!tick) {
+                throw new Error('Tick is required!');
+            }
+            var id = new Date().valueOf() + "_" + (Math.random() * 1000).toFixed(0);
+            $timers.push({
+                "id": id,
+                "createTime": new Date(),
+                "tick": tick,
+                "duration": duration,
+                "callback": callback
+            });
+            clock.start();
+            return id;
+        },
+
+        //开启唯一的定时器timerId
+        "start": function () {
+            if (!$timerId) {
+                $timerId = setInterval(clock.tick, $interval);
+            }
+        },
+
+        //被定时器调用，遍历timers堆栈
+        "tick": function () {
+            var createTime, flag, tick, callback, timer, duration, passTime, timers = $timers;
+
+            $timers = [];
+            $timers.length = 0;
+
+            for (flag = 0; flag < timers.length; flag++) {
+                //初始化数据
+                timer = timers[flag];
+                createTime = timer.createTime;
+                tick = timer.tick;
+                duration = timer.duration;
+                callback = timer.callback;
+
+                //执行
+                passTime = (+new Date().valueOf() - createTime.valueOf()) / duration;
+                passTime = passTime > 1 ? 1 : passTime;
+                tick(passTime);
+                if (passTime < 1 && timer.id) {
+                    //动画没有结束再添加
+                    $timers.push(timer);
+                } else {
+                    callback(passTime);
+                }
+            }
+            if ($timers.length <= 0) {
+                clock.stop();
+            }
+        },
+
+        //停止定时器，重置timerId=null
+        "stop": function () {
+            if ($timerId) {
+                clearInterval($timerId);
+                $timerId = null;
+            }
+        }
+    };
+
+    var id = clock.timer(function (deep) {
+        //其中deep为0-1，表示改变的程度
+        doback(deep);
+    }, duration, callback);
+
+    return {
+        // 一个函数
+        // 用于在动画结束前结束动画
+        stop: function () {
+            var i;
+            for (i in $timers) {
+                if ($timers[i].id == id) {
+                    $timers[i].id = void 0;
+                    return;
+                }
+            }
+        }
+    };
+
 }

package/web/format/index.d.ts

@@ -1,29 +1,29 @@
-/**
- * 数字格式化
- */
-export interface numberFormatType {
-    (input: number | string): string
-}
-
-export let numberFormat: numberFormatType
-
-/**
- * 日期格式化
- */
-export interface dateFormatType {
-    (input?: string | Date, option?: {
-
-        /**
-         * 输入格式
-         */
-        inputFormat?: string
-
-        /**
-         * 输出格式
-         */
-        format?: string
-    }): string
-}
-
-export let dateFormat: dateFormatType
-
+/**
+ * 数字格式化
+ */
+export interface numberFormatType {
+    (input: number | string): string
+}
+
+export let numberFormat: numberFormatType
+
+/**
+ * 日期格式化
+ */
+export interface dateFormatType {
+    (input?: string | Date, option?: {
+
+        /**
+         * 输入格式
+         */
+        inputFormat?: string
+
+        /**
+         * 输出格式
+         */
+        format?: string
+    }): string
+}
+
+export let dateFormat: dateFormatType
+

package/web/format/index.js

@@ -1,112 +1,112 @@
 /*!
-* format of OIPage v1.6.0
+* format of OIPage v1.7.0-alpha.1
 * git+https://github.com/oi-contrib/OIPage.git
 */
 
-export function numberFormat(input) {
-    if (!input && input !== 0) {
-        return '';
-    } else {
-        input = input + "";
-
-        var decimalValue, integerValue;
-
-        var dotIndex = input.indexOf('.');
-        if (dotIndex == -1) {
-            decimalValue = ".00";
-            integerValue = input;
-        } else {
-            var temp = input.split(".");
-            decimalValue = "." + (temp[1] + "0").substring(0, 2);
-            integerValue = temp[0];
-        }
-
-        var integerArray = []
-        for (var index = integerValue.length; index > 0; index -= 3) {
-            integerArray.unshift(integerValue.substring(index > 2 ? index - 3 : 0, index));
-        }
-
-        return integerArray.join(",").replace(/^\-,/, "-") + decimalValue;
-    }
-}
-
-export function dateFormat(input, option) {
-    option = option || {};
-    var dateObj;
-
-    // 如果无值，就用当前日期
-    if (!input) {
-        dateObj = new Date();
-    }
-
-    // 日期对象
-    else if (typeof input == 'object' && input.constructor === Date) {
-        dateObj = input;
-    }
-
-    // 否则就尝试创建日期对象
-    else if (!option.inputFormat) {
-        dateObj = new Date(input);
-        if (dateObj + "" == "Invalid Date") {
-            console.error("非法的日期格式：" + input, dateObj);
-            return "";
-        }
-    }
-
-    // 年、月、日、时、分、秒
-    var single = {
-        yyyy: 0, MM: 0, dd: 0, HH: 0, mm: 0, ss: 0
-    };
-
-    // 如果获取了日期实例
-    if (dateObj) {
-
-        single.yyyy = dateObj.getFullYear();
-        single.MM = dateObj.getMonth() + 1;
-        single.dd = dateObj.getDate();
-
-        single.HH = dateObj.getHours();
-        single.mm = dateObj.getMinutes();
-        single.ss = dateObj.getSeconds();
-    }
-
-    // 否则只能借助 inputFormat 来解析
-    else {
-        var inputFormat = option.inputFormat + "", valIndex = 0;
-        for (var index = 0; index < inputFormat.length; index++) {
-
-            // 年
-            if (inputFormat.substring(index, index + 4) == "yyyy") {
-                single.yyyy = +input.substring(valIndex, valIndex + 4);
-
-                valIndex += 4;
-                index += 3;
-            } else {
-                var curFlag = inputFormat.substring(index, index + 2);
-                if (["MM", "dd", "HH", "mm", "ss"].indexOf(curFlag) > -1) {
-                    var valContent = input[valIndex];
-                    if (/\d/.test(input[valIndex + 1])) {
-                        valContent += input[valIndex + 1];
-                        valIndex += 2;
-                    } else {
-                        valIndex += 1;
-                    }
-
-                    (single)[curFlag] = +valContent;
-                    index += 1;
-                } else {
-                    valIndex += 1;
-                }
-            }
-        }
-    }
-
-    if (single.MM < 10) single.MM = "0" + single.MM;
-    if (single.dd < 10) single.dd = "0" + single.dd;
-    if (single.HH < 10) single.HH = "0" + single.HH;
-    if (single.mm < 10) single.mm = "0" + single.mm;
-    if (single.ss < 10) single.ss = "0" + single.ss;
-
-    var format = option.format || "yyyy/MM/dd";
-    return format.replace("yyyy", single.yyyy).replace("MM", single.MM).replace("dd", single.dd).replace("HH", single.HH).replace("mm", single.mm).replace("ss", single.ss);
+export function numberFormat(input) {
+    if (!input && input !== 0) {
+        return '';
+    } else {
+        input = input + "";
+
+        var decimalValue, integerValue;
+
+        var dotIndex = input.indexOf('.');
+        if (dotIndex == -1) {
+            decimalValue = ".00";
+            integerValue = input;
+        } else {
+            var temp = input.split(".");
+            decimalValue = "." + (temp[1] + "0").substring(0, 2);
+            integerValue = temp[0];
+        }
+
+        var integerArray = []
+        for (var index = integerValue.length; index > 0; index -= 3) {
+            integerArray.unshift(integerValue.substring(index > 2 ? index - 3 : 0, index));
+        }
+
+        return integerArray.join(",").replace(/^\-,/, "-") + decimalValue;
+    }
+}
+
+export function dateFormat(input, option) {
+    option = option || {};
+    var dateObj;
+
+    // 如果无值，就用当前日期
+    if (!input) {
+        dateObj = new Date();
+    }
+
+    // 日期对象
+    else if (typeof input == 'object' && input.constructor === Date) {
+        dateObj = input;
+    }
+
+    // 否则就尝试创建日期对象
+    else if (!option.inputFormat) {
+        dateObj = new Date(input);
+        if (dateObj + "" == "Invalid Date") {
+            console.error("非法的日期格式：" + input, dateObj);
+            return "";
+        }
+    }
+
+    // 年、月、日、时、分、秒
+    var single = {
+        yyyy: 0, MM: 0, dd: 0, HH: 0, mm: 0, ss: 0
+    };
+
+    // 如果获取了日期实例
+    if (dateObj) {
+
+        single.yyyy = dateObj.getFullYear();
+        single.MM = dateObj.getMonth() + 1;
+        single.dd = dateObj.getDate();
+
+        single.HH = dateObj.getHours();
+        single.mm = dateObj.getMinutes();
+        single.ss = dateObj.getSeconds();
+    }
+
+    // 否则只能借助 inputFormat 来解析
+    else {
+        var inputFormat = option.inputFormat + "", valIndex = 0;
+        for (var index = 0; index < inputFormat.length; index++) {
+
+            // 年
+            if (inputFormat.substring(index, index + 4) == "yyyy") {
+                single.yyyy = +input.substring(valIndex, valIndex + 4);
+
+                valIndex += 4;
+                index += 3;
+            } else {
+                var curFlag = inputFormat.substring(index, index + 2);
+                if (["MM", "dd", "HH", "mm", "ss"].indexOf(curFlag) > -1) {
+                    var valContent = input[valIndex];
+                    if (/\d/.test(input[valIndex + 1])) {
+                        valContent += input[valIndex + 1];
+                        valIndex += 2;
+                    } else {
+                        valIndex += 1;
+                    }
+
+                    (single)[curFlag] = +valContent;
+                    index += 1;
+                } else {
+                    valIndex += 1;
+                }
+            }
+        }
+    }
+
+    if (single.MM < 10) single.MM = "0" + single.MM;
+    if (single.dd < 10) single.dd = "0" + single.dd;
+    if (single.HH < 10) single.HH = "0" + single.HH;
+    if (single.mm < 10) single.mm = "0" + single.mm;
+    if (single.ss < 10) single.ss = "0" + single.ss;
+
+    var format = option.format || "yyyy/MM/dd";
+    return format.replace("yyyy", single.yyyy).replace("MM", single.MM).replace("dd", single.dd).replace("HH", single.HH).replace("mm", single.mm).replace("ss", single.ss);
 };

package/web/json/index.d.ts

@@ -1,10 +1,10 @@
-/**
- * 把一段字符串变成json返回
- * @param express 非严格json字符串
- * @returns 返回一个JSON对象
- */
-export interface strToJsonType {
-    (express:string): object
-}
-
+/**
+ * 把一段字符串变成json返回
+ * @param express 非严格json字符串
+ * @returns 返回一个JSON对象
+ */
+export interface strToJsonType {
+    (express:string): object
+}
+
 export let strToJson: strToJsonType