eoss-ui 0.6.33 → 0.6.35

package/lib/dialog.js

@@ -102,6 +102,10 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_5__);
 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; };
 
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -186,7 +190,8 @@ var ajax = function ajax(_ref) {
       publicKey = _ref.publicKey,
       secret = _ref.secret,
       encodes = _ref.encodes,
-      oldmode = _ref.oldmode;
+      oldmode = _ref.oldmode,
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -490,13 +495,13 @@ var ajax = function ajax(_ref) {
   if (oldmode && !header['api-response-mode']) {
     header['api-response-mode'] = true;
   }
-  return http({
+  return http(_extends({
     method: method,
     url: url,
     data: data,
     params: params,
     headers: header
-  });
+  }, configs));
 };
 
 /**
@@ -1204,31 +1209,43 @@ var extend = function extend() {
  * @param {String} [fmt] - 格式
  **/
 var formatDate = function formatDate(date, fmt) {
-  var obj = void 0;
-  if (date) {
-    obj = new Date(date);
-  } else {
-    obj = new Date();
-  }
+  // 1. 处理日期输入
+  var obj = date ? new Date(date) : new Date();
+  if (isNaN(obj.getTime())) throw new Error('Invalid date input');
+
+  // 2. 工具函数
+  var pad = function pad(n) {
+    return String(n).padStart(2, '0');
+  };
+  var monthNum = obj.getMonth(); // 数值月份 (0-11)
+
+  // 3. 定义格式化规则
   var quarter = ['一', '二', '三', '四'];
+  var halfyear = ['上', '下'];
   var o = {
-    'b+': Math.ceil((obj.getMonth() + 1) / 6), // 半年
-    'M+': obj.getMonth() + 1, // 月份
-    'd+': obj.getDate(), // 日
-    'H+': obj.getHours(), // 小时
-    'm+': obj.getMinutes(), // 分
-    's+': obj.getSeconds(), // 秒
-    'q+': quarter[Math.ceil((obj.getMonth() + 1) / 3) - 1], // 季度
-    S: obj.getMilliseconds() // 毫秒
+    'b+': halfyear[Math.floor(monthNum / 6)], // 1=上半年, 2=下半年
+    'M+': monthNum + 1, // 月份 (1-12)
+    'd+': obj.getDate(), // 日 (1-31)
+    'H+': obj.getHours(), // 小时 (0-23)
+    'm+': obj.getMinutes(), // 分钟 (0-59)
+    's+': obj.getSeconds(), // 秒 (0-59)
+    'q+': quarter[Math.floor(monthNum / 3)], // 季度 (一~四)
+    'S': obj.getMilliseconds() // 毫秒 (0-999)
   };
+
+  // 4. 处理年份
   if (/(y+)/.test(fmt)) {
-    fmt = fmt.replace(RegExp.$1, (obj.getFullYear() + '').substr(4 - RegExp.$1.length));
+    fmt = fmt.replace(RegExp.$1, String(obj.getFullYear()).slice(-RegExp.$1.length));
   }
+
+  // 5. 处理其他字段
   for (var k in o) {
     if (new RegExp('(' + k + ')').test(fmt)) {
-      fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
+      var val = k === 'q+' ? o[k] : pad(o[k]); // 季度不补零
+      fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : val);
     }
   }
+
   return fmt;
 };
 

package/lib/eoss-ui.common.js

@@ -102,6 +102,10 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_5__);
 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; };
 
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -186,7 +190,8 @@ var ajax = function ajax(_ref) {
       publicKey = _ref.publicKey,
       secret = _ref.secret,
       encodes = _ref.encodes,
-      oldmode = _ref.oldmode;
+      oldmode = _ref.oldmode,
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -490,13 +495,13 @@ var ajax = function ajax(_ref) {
   if (oldmode && !header['api-response-mode']) {
     header['api-response-mode'] = true;
   }
-  return http({
+  return http(_extends({
     method: method,
     url: url,
     data: data,
     params: params,
     headers: header
-  });
+  }, configs));
 };
 
 /**
@@ -1204,31 +1209,43 @@ var extend = function extend() {
  * @param {String} [fmt] - 格式
  **/
 var formatDate = function formatDate(date, fmt) {
-  var obj = void 0;
-  if (date) {
-    obj = new Date(date);
-  } else {
-    obj = new Date();
-  }
+  // 1. 处理日期输入
+  var obj = date ? new Date(date) : new Date();
+  if (isNaN(obj.getTime())) throw new Error('Invalid date input');
+
+  // 2. 工具函数
+  var pad = function pad(n) {
+    return String(n).padStart(2, '0');
+  };
+  var monthNum = obj.getMonth(); // 数值月份 (0-11)
+
+  // 3. 定义格式化规则
   var quarter = ['一', '二', '三', '四'];
+  var halfyear = ['上', '下'];
   var o = {
-    'b+': Math.ceil((obj.getMonth() + 1) / 6), // 半年
-    'M+': obj.getMonth() + 1, // 月份
-    'd+': obj.getDate(), // 日
-    'H+': obj.getHours(), // 小时
-    'm+': obj.getMinutes(), // 分
-    's+': obj.getSeconds(), // 秒
-    'q+': quarter[Math.ceil((obj.getMonth() + 1) / 3) - 1], // 季度
-    S: obj.getMilliseconds() // 毫秒
+    'b+': halfyear[Math.floor(monthNum / 6)], // 1=上半年, 2=下半年
+    'M+': monthNum + 1, // 月份 (1-12)
+    'd+': obj.getDate(), // 日 (1-31)
+    'H+': obj.getHours(), // 小时 (0-23)
+    'm+': obj.getMinutes(), // 分钟 (0-59)
+    's+': obj.getSeconds(), // 秒 (0-59)
+    'q+': quarter[Math.floor(monthNum / 3)], // 季度 (一~四)
+    'S': obj.getMilliseconds() // 毫秒 (0-999)
   };
+
+  // 4. 处理年份
   if (/(y+)/.test(fmt)) {
-    fmt = fmt.replace(RegExp.$1, (obj.getFullYear() + '').substr(4 - RegExp.$1.length));
+    fmt = fmt.replace(RegExp.$1, String(obj.getFullYear()).slice(-RegExp.$1.length));
   }
+
+  // 5. 处理其他字段
   for (var k in o) {
     if (new RegExp('(' + k + ')').test(fmt)) {
-      fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
+      var val = k === 'q+' ? o[k] : pad(o[k]); // 季度不补零
+      fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : val);
     }
   }
+
   return fmt;
 };
 
@@ -3840,7 +3857,7 @@ module.exports = require("stompjs");
 /* 14 */
 /***/ (function(module) {
 
-module.exports = JSON.parse("[\"zuomian\",\"monitor\",\"maximize\",\"pointer-up\",\"pointer-left\",\"pointer-down\",\"tri-down\",\"retrograde\",\"rainfall\",\"caveat\",\"print\",\"alarm\",\"table\",\"duigouquan\",\"bumen\",\"mm\",\"accelerate\",\"quanping\",\"password\",\"qing\",\"kaifa\",\"daoru\",\"piaochongicon\",\"instructions\",\"notice\",\"wifi\",\"tishicuo\",\"minganciguanli\",\"switch-off\",\"switch-on\",\"narrow\",\"yidongduan\",\"web\",\"upload\",\"message\",\"go-back\",\"close\",\"shujutongji\",\"folder\",\"edit\",\"enter\",\"dian\",\"wendu\",\"shangwu\",\"shenbao\",\"magnifier\",\"project-add\",\"xiexian\",\"caidan\",\"tupian\",\"yinyu\",\"wenhao\",\"template\",\"daiban\",\"set\",\"zhengwen\",\"cuowu\",\"chenggong\",\"indent\",\"increase\",\"ziliaoku\",\"tuichu\",\"quit\",\"leaf\",\"refresh\",\"statistic\",\"gengduo\",\"lvyou\",\"mail\",\"user\",\"zhishi\",\"weizhi\",\"jinggao\",\"zuzhijigou\",\"xue\",\"fenxiang\",\"jinrong\",\"shanchu\",\"jianhao\",\"jiahao\",\"yinzhang\",\"renyuanqiehuan\",\"gouxuanzhong1\",\"circle\",\"fuxuankuang1\",\"fangkuang\",\"application\",\"wenjianjia\",\"jiaren\",\"xiugai\",\"duanxinguanli\",\"workbench\",\"rizhi\",\"gongwen\",\"qingshi\",\"shiwu\",\"official\",\"baogao\",\"document\",\"wodeyouxiang\",\"ziliaojiaohuan\",\"denglu\",\"podium\",\"fangkuai\",\"xuewei\",\"duoyun\",\"pm\",\"xiajia\",\"huanbao\",\"dunpai\",\"shu\",\"gongzuozheng\",\"more\",\"fenlei\",\"delete\",\"fengsu\",\"bar\",\"yuanqu\",\"duomeiti\",\"youjian\",\"qiye\",\"zuixinzixun\",\"biaoge\",\"omit\",\"diaotou\",\"jiantou-left\",\"jiantou-right\",\"jiantou-up\",\"roles\",\"jiantou-next\",\"chijiuhuacunchu\",\"zhuanhuan\",\"cloudy\",\"form\",\"wuye\",\"tri-up\",\"pointer-right\",\"bianji\",\"tri-right\",\"tri-left\",\"daimaguanli\",\"jiankong\",\"kaifazhong\",\"fujian\",\"bingtu\",\"zhuzhuangtu\",\"lose\",\"rmb\",\"move\",\"xiazai\",\"yiban\",\"laoshi\",\"clear\",\"jinyong\",\"yunxing\",\"weihu\",\"chakan\",\"pifu\",\"ren\",\"gouwuche\",\"loading2\",\"yulan\",\"ziliao\",\"yidong\",\"fenxiang11\",\"kaoqin\",\"change\",\"shidu\",\"portfolio\",\"info\",\"yanjing\",\"laba\",\"camera\",\"xitongxiaoxi\",\"xitongguanli\",\"webduan\",\"wagnz\",\"group\",\"shengqian\",\"jiantou-prev\",\"attention\",\"look\",\"guanzhu\",\"daikuan\",\"tubiao\",\"duigou\",\"star\",\"dayin\",\"xinzeng\",\"reduce\",\"goup\",\"calendar\",\"tree\",\"yingyong\",\"caution\",\"zhuanfa\",\"add\",\"zongtiqixian\",\"daochu\",\"gongwu\",\"ihouse\",\"chilun\",\"weixiu\",\"chengguo\",\"trophy\",\"duiwu\",\"qiehuanjiaose\",\"door\",\"shebei\",\"fangjian\",\"microscope\",\"huaxue\",\"shiyanshianquan\",\"shiyan\",\"qiyexinxi\",\"yewuxinxi\",\"lab\",\"shiyanguanli\",\"yuqing\",\"big-screen\",\"signal-search\",\"database\",\"star-mark\",\"cng\",\"professor\",\"informatization\",\"code\",\"science\",\"price\",\"xunhuan\",\"savings\",\"administration\",\"aid\",\"biao\",\"line\",\"xietong\",\"jingzheng\",\"enterprise\",\"datatable\",\"toubiao\",\"bingdu\",\"keji2\",\"qiyeku5\",\"touzi5\",\"zijinliu\",\"zhishichanquan3\",\"kejifuwu2\",\"zhishichanquan2\",\"zijinanquan\",\"kejifuwu1\",\"geju\",\"yiqingfangkong\",\"kejifuwu\",\"anquanfangkong\",\"shujufuwu\",\"shujuceng\",\"shujugongxiang\",\"flows\",\"setup\",\"shujulian\",\"caiwujianguan\",\"caiwuliushui\",\"mubiaogeju\",\"juxing\",\"fuwuqi\",\"touzijigou\",\"xiezilou\",\"jianzhu\",\"logo\",\"touzhi\",\"zijin\",\"fintech\",\"touzixiangmu\",\"library\",\"touziguanli\",\"zhongda\",\"ziyuan\",\"shujutai\",\"shujudongtai\",\"bank\",\"shujuzhongxin\",\"zhongyaomubiao\",\"touzishijian\",\"caiwuguanli\",\"mingzhong\",\"touzishenpi\",\"jingzhenggeju\",\"property\",\"keji\",\"qiyeku\",\"zhongyaojihui\",\"touzilicai\",\"zhishichanquan\",\"touzi\",\"tzz\",\"menu\",\"xiangmushu\",\"pdf\",\"jiazai\",\"gongsi\",\"rise\",\"jbxx\",\"zwxx\",\"jypx\",\"jcgl\",\"ndkh\",\"grjl\",\"shgx\",\"gou\",\"shijian\",\"fukuan\",\"guoji\",\"shoukuan\",\"down\",\"gongzuotai\",\"gaigedongtai\",\"xitongshezhi\",\"relation\",\"zuzhirenshi\",\"kaohepingjia\",\"caiwujiandu\",\"sanzhongyida\",\"mima\",\"xianshi\",\"zhanghao\",\"bangongshi\",\"checked\",\"checke\",\"help\",\"kuoda\",\"banli\",\"xiaoxi\",\"shouqicaidan\",\"shouqicaidan-right\",\"smile\",\"tongzhi\",\"guanji\",\"shuaxin\",\"guiji\",\"tianjiawenjianjia\",\"yunxiazai\",\"del\",\"touzifangan\",\"zongheguanli\",\"sanzhongyida_mian\",\"gongwenguanli1\",\"heguiguanli\",\"jingyingfenxi\",\"txl\",\"diannao\",\"renliziyuan\",\"caiwuxitong\",\"shiwuguanli\",\"shouye\",\"bangongyongpin\",\"sidebar\",\"zhidulashi\",\"log\",\"fawenguanli\",\"huiyiguanli\",\"zuzhishishi\",\"gongwenqianshou\",\"jinxiupeixun\",\"gongwenbao\",\"jiaohuan\",\"daibanshixiang\",\"richeng\",\"tongxunlu\",\"yongche\",\"yanzheng\",\"daibanxinxi\",\"shuben\",\"fanfu\",\"guangbo\",\"shuzhuangtu\",\"bengqiye\",\"tongguo\",\"dengdai\",\"cross\",\"daichuli\",\"zhenggai\",\"shouli\",\"shujuhecha\",\"guanli\",\"paper-file\",\"wenjian\",\"dakaiwenjian\",\"yewu\",\"jiance\",\"jiheguanli\",\"jinru\",\"arrow-right\",\"lingdao\",\"rencai\",\"prev\",\"next\",\"jianpan\",\"qrcode\",\"bohui\",\"homepage\",\"download\",\"gantanhao\",\"dingding\",\"weixin\",\"pad\",\"ios\",\"android\",\"txt\",\"doc\",\"audioo\",\"video\",\"zip\",\"shuru\",\"duanxin\",\"saoma\",\"youxiang\",\"word\",\"excel\",\"fileword\",\"picture\",\"ppt\",\"ca\",\"usb-key\",\"wenjianjiadakai\",\"yingyonglan\",\"home\",\"tiyanxinban\",\"shiyongjiuban\",\"zhuomian\",\"scan\",\"youbian\",\"zuobian\",\"saomadenglu\",\"zhanghaodenglu\"]");
+module.exports = JSON.parse("[\"zuomian\",\"monitor\",\"maximize\",\"pointer-up\",\"pointer-left\",\"pointer-down\",\"tri-down\",\"retrograde\",\"rainfall\",\"caveat\",\"print\",\"alarm\",\"table\",\"duigouquan\",\"bumen\",\"mm\",\"accelerate\",\"quanping\",\"password\",\"qing\",\"kaifa\",\"daoru\",\"piaochongicon\",\"instructions\",\"notice\",\"wifi\",\"tishicuo\",\"minganciguanli\",\"switch-off\",\"switch-on\",\"narrow\",\"yidongduan\",\"web\",\"upload\",\"message\",\"go-back\",\"close\",\"shujutongji\",\"folder\",\"edit\",\"enter\",\"dian\",\"wendu\",\"shangwu\",\"shenbao\",\"magnifier\",\"project-add\",\"xiexian\",\"caidan\",\"tupian\",\"yinyu\",\"wenhao\",\"template\",\"daiban\",\"set\",\"zhengwen\",\"cuowu\",\"chenggong\",\"indent\",\"increase\",\"ziliaoku\",\"tuichu\",\"quit\",\"leaf\",\"refresh\",\"statistic\",\"gengduo\",\"lvyou\",\"mail\",\"user\",\"zhishi\",\"weizhi\",\"jinggao\",\"zuzhijigou\",\"xue\",\"fenxiang\",\"jinrong\",\"shanchu\",\"jianhao\",\"jiahao\",\"yinzhang\",\"renyuanqiehuan\",\"gouxuanzhong1\",\"circle\",\"fuxuankuang1\",\"fangkuang\",\"application\",\"wenjianjia\",\"jiaren\",\"xiugai\",\"duanxinguanli\",\"workbench\",\"rizhi\",\"gongwen\",\"qingshi\",\"shiwu\",\"official\",\"baogao\",\"document\",\"wodeyouxiang\",\"ziliaojiaohuan\",\"denglu\",\"podium\",\"fangkuai\",\"xuewei\",\"duoyun\",\"pm\",\"xiajia\",\"huanbao\",\"dunpai\",\"shu\",\"gongzuozheng\",\"more\",\"fenlei\",\"delete\",\"fengsu\",\"bar\",\"yuanqu\",\"duomeiti\",\"youjian\",\"qiye\",\"zuixinzixun\",\"biaoge\",\"omit\",\"diaotou\",\"jiantou-left\",\"jiantou-right\",\"jiantou-up\",\"roles\",\"jiantou-next\",\"chijiuhuacunchu\",\"zhuanhuan\",\"cloudy\",\"form\",\"wuye\",\"tri-up\",\"pointer-right\",\"bianji\",\"tri-right\",\"tri-left\",\"daimaguanli\",\"jiankong\",\"kaifazhong\",\"fujian\",\"bingtu\",\"zhuzhuangtu\",\"lose\",\"rmb\",\"move\",\"xiazai\",\"yiban\",\"laoshi\",\"clear\",\"jinyong\",\"yunxing\",\"weihu\",\"chakan\",\"pifu\",\"ren\",\"gouwuche\",\"loading2\",\"yulan\",\"ziliao\",\"yidong\",\"fenxiang11\",\"kaoqin\",\"change\",\"shidu\",\"portfolio\",\"info\",\"yanjing\",\"laba\",\"camera\",\"xitongxiaoxi\",\"xitongguanli\",\"webduan\",\"wagnz\",\"group\",\"shengqian\",\"jiantou-prev\",\"attention\",\"look\",\"guanzhu\",\"daikuan\",\"tubiao\",\"duigou\",\"star\",\"dayin\",\"xinzeng\",\"reduce\",\"goup\",\"calendar\",\"tree\",\"yingyong\",\"caution\",\"zhuanfa\",\"add\",\"zongtiqixian\",\"daochu\",\"gongwu\",\"ihouse\",\"chilun\",\"weixiu\",\"chengguo\",\"trophy\",\"duiwu\",\"qiehuanjiaose\",\"door\",\"shebei\",\"fangjian\",\"microscope\",\"huaxue\",\"shiyanshianquan\",\"shiyan\",\"qiyexinxi\",\"yewuxinxi\",\"lab\",\"shiyanguanli\",\"yuqing\",\"big-screen\",\"signal-search\",\"database\",\"star-mark\",\"cng\",\"professor\",\"informatization\",\"code\",\"science\",\"price\",\"xunhuan\",\"savings\",\"administration\",\"aid\",\"biao\",\"line\",\"xietong\",\"jingzheng\",\"enterprise\",\"datatable\",\"toubiao\",\"bingdu\",\"keji2\",\"qiyeku5\",\"touzi5\",\"zijinliu\",\"zhishichanquan3\",\"kejifuwu2\",\"zhishichanquan2\",\"zijinanquan\",\"kejifuwu1\",\"geju\",\"yiqingfangkong\",\"kejifuwu\",\"anquanfangkong\",\"shujufuwu\",\"shujuceng\",\"shujugongxiang\",\"flows\",\"setup\",\"shujulian\",\"caiwujianguan\",\"caiwuliushui\",\"mubiaogeju\",\"juxing\",\"fuwuqi\",\"touzijigou\",\"xiezilou\",\"jianzhu\",\"logo\",\"touzhi\",\"zijin\",\"fintech\",\"touzixiangmu\",\"library\",\"touziguanli\",\"zhongda\",\"ziyuan\",\"shujutai\",\"shujudongtai\",\"bank\",\"shujuzhongxin\",\"zhongyaomubiao\",\"touzishijian\",\"caiwuguanli\",\"mingzhong\",\"touzishenpi\",\"jingzhenggeju\",\"property\",\"keji\",\"qiyeku\",\"zhongyaojihui\",\"touzilicai\",\"zhishichanquan\",\"touzi\",\"tzz\",\"menu\",\"xiangmushu\",\"pdf\",\"jiazai\",\"gongsi\",\"rise\",\"jbxx\",\"zwxx\",\"jypx\",\"jcgl\",\"ndkh\",\"grjl\",\"shgx\",\"gou\",\"shijian\",\"fukuan\",\"guoji\",\"shoukuan\",\"down\",\"gongzuotai\",\"gaigedongtai\",\"xitongshezhi\",\"relation\",\"zuzhirenshi\",\"kaohepingjia\",\"caiwujiandu\",\"sanzhongyida\",\"mima\",\"xianshi\",\"zhanghao\",\"bangongshi\",\"checked\",\"checke\",\"help\",\"kuoda\",\"banli\",\"xiaoxi\",\"shouqicaidan\",\"shouqicaidan-right\",\"smile\",\"tongzhi\",\"guanji\",\"shuaxin\",\"guiji\",\"tianjiawenjianjia\",\"yunxiazai\",\"del\",\"touzifangan\",\"zongheguanli\",\"sanzhongyida_mian\",\"gongwenguanli1\",\"heguiguanli\",\"jingyingfenxi\",\"txl\",\"diannao\",\"renliziyuan\",\"caiwuxitong\",\"shiwuguanli\",\"shouye\",\"bangongyongpin\",\"sidebar\",\"zhidulashi\",\"log\",\"fawenguanli\",\"huiyiguanli\",\"zuzhishishi\",\"gongwenqianshou\",\"jinxiupeixun\",\"gongwenbao\",\"jiaohuan\",\"daibanshixiang\",\"richeng\",\"tongxunlu\",\"yongche\",\"yanzheng\",\"daibanxinxi\",\"shuben\",\"fanfu\",\"guangbo\",\"shuzhuangtu\",\"bengqiye\",\"tongguo\",\"dengdai\",\"cross\",\"daichuli\",\"zhenggai\",\"shouli\",\"shujuhecha\",\"guanli\",\"paper-file\",\"wenjian\",\"dakaiwenjian\",\"yewu\",\"jiance\",\"jiheguanli\",\"jinru\",\"arrow-right\",\"lingdao\",\"rencai\",\"prev\",\"next\",\"jianpan\",\"qrcode\",\"bohui\",\"homepage\",\"download\",\"gantanhao\",\"dingding\",\"weixin\",\"pad\",\"ios\",\"android\",\"txt\",\"doc\",\"audioo\",\"video\",\"zip\",\"shuru\",\"duanxin\",\"saoma\",\"youxiang\",\"word\",\"excel\",\"fileword\",\"picture\",\"ppt\",\"ca\",\"usb-key\",\"wenjianjiadakai\",\"yingyonglan\",\"home\",\"tiyanxinban\",\"shiyongjiuban\",\"zhuomian\",\"scan\",\"youbian\",\"zuobian\",\"saomadenglu\",\"zhanghaodenglu\",\"zhengfangti\",\"tingzhi\"]");
 
 /***/ }),
 /* 15 */
@@ -41737,8 +41754,8 @@ layout_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_layout = (layout_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=1bcb85a7&
-var mainvue_type_template_id_1bcb85a7_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=6fe37714&
+var mainvue_type_template_id_6fe37714_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -42871,7 +42888,7 @@ var mainvue_type_template_id_1bcb85a7_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_1bcb85a7_staticRenderFns = [
+var mainvue_type_template_id_6fe37714_staticRenderFns = [
   function () {
     var _vm = this
     var _h = _vm.$createElement
@@ -42886,10 +42903,10 @@ var mainvue_type_template_id_1bcb85a7_staticRenderFns = [
     ])
   },
 ]
-mainvue_type_template_id_1bcb85a7_render._withStripped = true
+mainvue_type_template_id_6fe37714_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=1bcb85a7&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=6fe37714&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=45dccfdc&
 var resetPasswordvue_type_template_id_45dccfdc_render = function () {
@@ -43949,7 +43966,7 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
           type: '3',
           name: '手机扫码登录',
           icon: 'es-icon-qrcode',
-          tips: '扫码登陆在这里',
+          tips: '扫码登录在这里',
           background: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAAAoCAYAAAA2cfJIAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDYuMC1jMDA2IDc5LmRhYmFjYmIsIDIwMjEvMDQvMTQtMDA6Mzk6NDQgICAgICAgICI+IDxyZGY6UkRGIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyI+IDxyZGY6RGVzY3JpcHRpb24gcmRmOmFib3V0PSIiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCAyMi40IChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjZFRTVERTUxQzRDMzExRUY4NkFGQ0U2RDY3NEFERkI0IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjZFRTVERTUyQzRDMzExRUY4NkFGQ0U2RDY3NEFERkI0Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NkVFNURFNEZDNEMzMTFFRjg2QUZDRTZENjc0QURGQjQiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6NkVFNURFNTBDNEMzMTFFRjg2QUZDRTZENjc0QURGQjQiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz64XoEfAAAB/UlEQVR42uycOUsDQRiG99vdHJ4JHhFN1EhEQkBsRVACghBbKytBf4OiNrZipQHtRLASsbJIQDQGBVHBysIDAxIvPBCCGpO4ZvwWrCT+gZ33gWV2mam+95mZPWDpcGZYCYQjY4oQs0Y+lxDF4qcCLAFpWrVud/QqRJOpZHy55Jjn3dUODv/oJXU+krm9vkPZrIXL29JU2x5aIaIeluDyb7/KxyDP/C2Eb00yd+l7znfHzLlUvymAk5f9LEplXYRhPHHT8J8AQGIgAAQAEABAAAABAAQAEABAAAABAAQAEABYAiGKBW66A+FIGQSQkIfTk3UjnzM/+G2zBDUQQDK+C3kjfZic+cp+XPHlPkvQCgGk2waESB/vRfNvmdivBJ0QQEJuTw7Wsq/PS7/bQRgCSEjh4/2GlwTNXAAggGS4m9uaXT7/vEI0mkrGExBAIqoafZ6ato5FIprg8DdxDyAR5bUed317KEqqusDhr+ApQCLsFZXOhlDXPGnaBoc/h/cAkuEJdg2pmp7i0+m/fRBAAnjPt3FzxrNfQAAAAQAEABAAQAAAASAAgAAAAgAIAGQVIEeqWo5SWBfSdQ83j/8JENMdzgGXz+9FqayH+ZMozrefT+Ol+nXzz1GBcGS8LhBcdvv8iaJhPKJsFlnebTavbnf0KURTnPNFqTE/AgwAPZCY5D/YjJ4AAAAASUVORK5CYII='
         }];
       }
@@ -45257,8 +45274,8 @@ var ceshi = utils_util["a" /* default */].getParams('ceshi');
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_1bcb85a7_render,
-  mainvue_type_template_id_1bcb85a7_staticRenderFns,
+  mainvue_type_template_id_6fe37714_render,
+  mainvue_type_template_id_6fe37714_staticRenderFns,
   false,
   null,
   null,
@@ -45275,8 +45292,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=43324a71&
-var mainvue_type_template_id_43324a71_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=774e8f3b&
+var mainvue_type_template_id_774e8f3b_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -45369,14 +45386,14 @@ var mainvue_type_template_id_43324a71_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_43324a71_staticRenderFns = []
-mainvue_type_template_id_43324a71_render._withStripped = true
+var mainvue_type_template_id_774e8f3b_staticRenderFns = []
+mainvue_type_template_id_774e8f3b_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=43324a71&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=774e8f3b&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=9473ec14&scoped=true&
-var simplicityvue_type_template_id_9473ec14_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=22cde548&scoped=true&
+var simplicityvue_type_template_id_22cde548_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -46012,11 +46029,11 @@ var simplicityvue_type_template_id_9473ec14_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_9473ec14_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_9473ec14_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_22cde548_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_22cde548_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=9473ec14&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=22cde548&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=e722b45c&scoped=true&
 var avatarvue_type_template_id_e722b45c_scoped_true_render = function () {
@@ -51267,6 +51284,8 @@ var search_component = normalizeComponent(
 
 /* harmony default export */ var public_search = (search_component.exports);
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=script&lang=js&
+var simplicityvue_type_script_lang_js_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; };
+
 var simplicityvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 //
@@ -52398,7 +52417,7 @@ var events = [function (tabs, index, that) {
             if (item[key] === res) {
               return item;
             }
-          } else if (item.url === res || item.id === res) {
+          } else if (item.url === res || item.id === res || item.appCode && item.appCode === res) {
             return item;
           }
           if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
@@ -53097,8 +53116,14 @@ var events = [function (tabs, index, that) {
     },
     jumpMenu: function jumpMenu(res, close) {
       var apps = res;
+      var param = null;
+      var reload = true;
       if (typeof res === 'string') {
         apps = res.split(',');
+      } else if ((typeof res === 'undefined' ? 'undefined' : simplicityvue_type_script_lang_js_typeof(res)) === 'object') {
+        apps = res.appCode.split(',');
+        param = res.param;
+        reload = Object.prototype.hasOwnProperty.call(res, 'reload') ? res.reload : true;
       }
       var obj = this.getMenu(this.menus, apps[apps.length - 1]);
       if (obj) {
@@ -53108,16 +53133,33 @@ var events = [function (tabs, index, that) {
         this.activeName = obj.id;
         if (i == -1) {
           var tab = this.setIframeType(obj);
+          this.$set(tab, 'url', utils_util["a" /* default */].handlerUrl(tab.url, param));
           this.tabs.splice(n + 1, 0, tab);
         } else {
           var _tab7 = this.tabs[i];
           if (_tab7.method === 'iframe') {
-            this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab7.url));
+            this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab7.url, param));
           }
           if (_tab7.method === 'wujie' && _tab7.appCode) {
-            window.document.querySelector('iframe[name=' + _tab7.appCode + ']').contentWindow.location.reload(true);
+            var url = param ? utils_util["a" /* default */].handlerUrl(_tab7.url, param) : _tab7.url;
+            if (reload || param) {
+              _tab7.url = '';
+              this.$nextTick(function () {
+                _tab7.url = url;
+              });
+            }
+            // if (param) {
+            //   window.document.querySelector(
+            //     `iframe[name=${tab.appCode}]`
+            //   ).contentWindow.location.href = util.handlerUrl(tab.url, param);
+            // } else {
+            //   window.document
+            //     .querySelector(`iframe[name=${tab.appCode}]`)
+            //     .contentWindow.location.reload(true);
+            // }
           }
           if (_tab7.method === 'router') {
+            this.$set(this.tabs[i], 'url', utils_util["a" /* default */].handlerUrl(_tab7.url, param));
             this.$set(this.tabs[i], 'keys', utils_util["a" /* default */].uuid());
           }
         }
@@ -53178,18 +53220,18 @@ var events = [function (tabs, index, that) {
 
 var simplicity_component = normalizeComponent(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_9473ec14_scoped_true_render,
-  simplicityvue_type_template_id_9473ec14_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_22cde548_scoped_true_render,
+  simplicityvue_type_template_id_22cde548_scoped_true_staticRenderFns,
   false,
   null,
-  "9473ec14",
+  "22cde548",
   null
   
 )
 
 /* harmony default export */ var simplicity = (simplicity_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=0e385525&
-var defaultvue_type_template_id_0e385525_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=3e631434&
+var defaultvue_type_template_id_3e631434_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -53586,11 +53628,11 @@ var defaultvue_type_template_id_0e385525_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_0e385525_staticRenderFns = []
-defaultvue_type_template_id_0e385525_render._withStripped = true
+var defaultvue_type_template_id_3e631434_staticRenderFns = []
+defaultvue_type_template_id_3e631434_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=0e385525&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=3e631434&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=b6520920&
 var userinfovue_type_template_id_b6520920_render = function () {
@@ -55830,7 +55872,7 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
       }
       for (var i = 0; i < menus.length; i++) {
         var item = menus[i];
-        if (item.id === url) {
+        if (item.id === url || item.appCode && item.appCode === url) {
           if (item.url) {
             if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
               var id = this.getId(item.children, item.url);
@@ -56819,8 +56861,8 @@ var appCode = utils_util["a" /* default */].getParams('appCode') || utils_util["
 
 var default_component = normalizeComponent(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_0e385525_render,
-  defaultvue_type_template_id_0e385525_staticRenderFns,
+  defaultvue_type_template_id_3e631434_render,
+  defaultvue_type_template_id_3e631434_staticRenderFns,
   false,
   null,
   null,
@@ -57240,8 +57282,8 @@ var default_component = normalizeComponent(
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_43324a71_render,
-  mainvue_type_template_id_43324a71_staticRenderFns,
+  mainvue_type_template_id_774e8f3b_render,
+  mainvue_type_template_id_774e8f3b_staticRenderFns,
   false,
   null,
   null,
@@ -77651,7 +77693,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.6.33',
+  version: '0.6.35',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-group.js

@@ -103,6 +103,10 @@ module.exports =
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_5__);
 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; };
 
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
 /**
  * 新封装公告方法规范：
  * 1.方法顺序按字母顺序排列
@@ -187,7 +191,8 @@ var ajax = function ajax(_ref) {
       publicKey = _ref.publicKey,
       secret = _ref.secret,
       encodes = _ref.encodes,
-      oldmode = _ref.oldmode;
+      oldmode = _ref.oldmode,
+      configs = _objectWithoutProperties(_ref, ['headers', 'method', 'url', 'host', 'data', 'params', 'format', 'mix', 'defaults', 'loading', 'publicKey', 'secret', 'encodes', 'oldmode']);
 
   var header = headers || {};
   if (!method) {
@@ -491,13 +496,13 @@ var ajax = function ajax(_ref) {
   if (oldmode && !header['api-response-mode']) {
     header['api-response-mode'] = true;
   }
-  return http({
+  return http(_extends({
     method: method,
     url: url,
     data: data,
     params: params,
     headers: header
-  });
+  }, configs));
 };
 
 /**
@@ -1205,31 +1210,43 @@ var extend = function extend() {
  * @param {String} [fmt] - 格式
  **/
 var formatDate = function formatDate(date, fmt) {
-  var obj = void 0;
-  if (date) {
-    obj = new Date(date);
-  } else {
-    obj = new Date();
-  }
+  // 1. 处理日期输入
+  var obj = date ? new Date(date) : new Date();
+  if (isNaN(obj.getTime())) throw new Error('Invalid date input');
+
+  // 2. 工具函数
+  var pad = function pad(n) {
+    return String(n).padStart(2, '0');
+  };
+  var monthNum = obj.getMonth(); // 数值月份 (0-11)
+
+  // 3. 定义格式化规则
   var quarter = ['一', '二', '三', '四'];
+  var halfyear = ['上', '下'];
   var o = {
-    'b+': Math.ceil((obj.getMonth() + 1) / 6), // 半年
-    'M+': obj.getMonth() + 1, // 月份
-    'd+': obj.getDate(), // 日
-    'H+': obj.getHours(), // 小时
-    'm+': obj.getMinutes(), // 分
-    's+': obj.getSeconds(), // 秒
-    'q+': quarter[Math.ceil((obj.getMonth() + 1) / 3) - 1], // 季度
-    S: obj.getMilliseconds() // 毫秒
+    'b+': halfyear[Math.floor(monthNum / 6)], // 1=上半年, 2=下半年
+    'M+': monthNum + 1, // 月份 (1-12)
+    'd+': obj.getDate(), // 日 (1-31)
+    'H+': obj.getHours(), // 小时 (0-23)
+    'm+': obj.getMinutes(), // 分钟 (0-59)
+    's+': obj.getSeconds(), // 秒 (0-59)
+    'q+': quarter[Math.floor(monthNum / 3)], // 季度 (一~四)
+    'S': obj.getMilliseconds() // 毫秒 (0-999)
   };
+
+  // 4. 处理年份
   if (/(y+)/.test(fmt)) {
-    fmt = fmt.replace(RegExp.$1, (obj.getFullYear() + '').substr(4 - RegExp.$1.length));
+    fmt = fmt.replace(RegExp.$1, String(obj.getFullYear()).slice(-RegExp.$1.length));
   }
+
+  // 5. 处理其他字段
   for (var k in o) {
     if (new RegExp('(' + k + ')').test(fmt)) {
-      fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
+      var val = k === 'q+' ? o[k] : pad(o[k]); // 季度不补零
+      fmt = fmt.replace(RegExp.$1, RegExp.$1.length === 1 ? o[k] : val);
     }
   }
+
   return fmt;
 };