diff --git a/LICENSE b/LICENSE index 4c16a80..4dbc4c0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) 2015 +Copyright (c) 2015 , imweb(http://imweb.io/) +Copyright (c) 2015 , chriscai(345446383@qq.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/controller/action/ApplyAction.js b/controller/action/ApplyAction.js index af47cfa..838ac78 100644 --- a/controller/action/ApplyAction.js +++ b/controller/action/ApplyAction.js @@ -8,6 +8,7 @@ var log4js = require('log4js'), logger = log4js.getLogger(), _ = require('underscore'), + crypto = require('crypto'), ApplyService = require('../../service/ApplyService'), isError = function (res , error){ if(error){ @@ -56,6 +57,7 @@ var applyAction = { }); }else { apply.createTime = new Date(); + apply.appkey = crypto.createHash("md5").update(new Date-0 + "badjsappkey" +params.user.loginName).digest('hex'); applyService.add(apply,function(err, items){ if(isError(res, err)){ return; diff --git a/dao/ApplyDao.js b/dao/ApplyDao.js index fa99793..db00737 100644 --- a/dao/ApplyDao.js +++ b/dao/ApplyDao.js @@ -11,6 +11,7 @@ module.exports = function (db){ userName : String, status : Number, name : String, + appkey : String, url : String, description : String, mail : String, diff --git a/db/create.sql b/db/create.sql index 7074c57..819e513 100644 --- a/db/create.sql +++ b/db/create.sql @@ -38,6 +38,7 @@ CREATE TABLE `b_apply` ( `userName` varchar(25) COLLATE utf8_unicode_ci NOT NULL, `status` int(11) NOT NULL, `name` varchar(25) COLLATE utf8_unicode_ci NOT NULL, + `appkey` varchar(200) COLLATE utf8_unicode_ci NOT NULL, `url` varchar(200) COLLATE utf8_unicode_ci NOT NULL, `description` text COLLATE utf8_unicode_ci, `mail` varchar(80) COLLATE utf8_unicode_ci DEFAULT NULL, diff --git a/package.json b/package.json index 8290adf..4a1b5c0 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "orm-transaction": "0.0.2", "passport": "^0.2.1", "passport-local": "^1.0.0", + "request": "^2.63.0", "serve-static": "^1.7.1", "socket.io": "^1.2.0", "underscore": "1.5.2", diff --git a/project.debug.json b/project.debug.json index 9463b48..71111d9 100644 --- a/project.debug.json +++ b/project.debug.json @@ -11,6 +11,9 @@ "acceptor": { "pushProjectUrl" : "http://127.0.0.1:9001/getProjects" }, + "open": { + "pushProjectUrl" : "http://127.0.0.1:9002/getProjects" + }, "zmq" : { "url" : "tcp://127.0.0.1:10000", "subscribe" : "badjs" diff --git a/service/ApplyService.js b/service/ApplyService.js index d3313c2..0995bd5 100644 --- a/service/ApplyService.js +++ b/service/ApplyService.js @@ -122,7 +122,7 @@ ApplyService.prototype = { update : function(target, callback){ this.applyDao.one({id: target.id }, function (err, apply) { // SQL: "SELECT * FROM b_apply WHERE name = 'xxxx'" - for(key in target){ + for(var key in target){ apply[key] = target[key]; }; apply.save(function (err) { diff --git a/service/BusinessService.js b/service/BusinessService.js index d34e494..a0fdcfa 100644 --- a/service/BusinessService.js +++ b/service/BusinessService.js @@ -57,7 +57,7 @@ BusinessService.prototype = { findBusiness : function ( callback){ - var string = "select a.id, u.loginName, u.chineseName , a.name "+ + var string = "select a.id , a.appkey, u.loginName, u.chineseName , a.name "+ "from b_apply a join b_user u on (a.userName=u.loginName) "+ "where a.status=? "; var condition = [Apply.STATUS_PASS ]; diff --git a/service/LogService.js b/service/LogService.js index d30443d..86087f9 100644 --- a/service/LogService.js +++ b/service/LogService.js @@ -9,6 +9,8 @@ var log4js = require('log4js'), _ = require('underscore'), logger = log4js.getLogger(); +var request = require("request"); + var LogService = function (){ @@ -22,6 +24,7 @@ var LogService = function (){ this.queryUrl = GLOBAL.pjconfig.storage.queryUrl; this.pushProjectUrl = GLOBAL.pjconfig.acceptor.pushProjectUrl; + this.pushProjectUrl2 = GLOBAL.pjconfig.open.pushProjectUrl; logger.debug('query url : ' + this.queryUrl) // this.url = 'http://127.0.0.1:9000/query'; @@ -67,7 +70,6 @@ LogService.prototype = { var businessService = new BusinessService(); - var tryTimes = 0; var push = function (){ businessService.findBusiness(function (err , item){ @@ -75,35 +77,46 @@ LogService.prototype = { var strParams = ''; _.each( item , function (value , ke){ - strParams+=value.id+"_"; + strParams+=value.id+"|"+value.appkey+"_"; }); if(strParams.length >0){ - strParams = "projectsId="+strParams.substring(0 , strParams.length-1 ) + "&"; + strParams = strParams.substring(0 , strParams.length-1 ) ; } - strParams +="auth=badjsAccepter"; + //strParams +="auth=badjsAccepter"; + + var result = [0,0] + var resultCall = function (){ + if(result[0] < 0 && result[1] <0){ + callback(new Error("error")) + }else if(result[0] > 0 && result[1] > 0) { + callback() + } + } - http.get( self.pushProjectUrl + '?' + strParams , function (res){ - res - .on('data' , function (){}) - .on('end' , function (){ - callback(); - }) + request.post(self.pushProjectUrl , {form:{projectsId : strParams, auth : "badjsAccepter"}} , function (err ){ + if(err){ + logger.warn('push projectIds to acceptor error :' + err); + result[0] = -1 + }else { + result[0] = 1; + } + resultCall(); + }); - }).on('error' , function (err){ - if(tryTimes <=3 ){ - tryTimes++; - logger.warn('push project error and try:' + err); - push(); + request.post(self.pushProjectUrl2 , {form:{projectsId : strParams , auth : "badjsOpen"}} , function (err ){ + if(err){ + logger.warn('push projectIds to open error :' + err); + result[1] = -1; }else { - logger.warn('push project error :' + err); - callback(err) + result[1] = 1; } + resultCall(); + }); - }) }); } diff --git a/static/common.js b/static/common.js index 866d2bc..a681a56 100644 --- a/static/common.js +++ b/static/common.js @@ -76,7 +76,7 @@ /******/ script.charset = 'utf-8'; /******/ script.async = true; -/******/ script.src = __webpack_require__.p + "" + chunkId + "../" + ({"0":"entry.home","1":"entry.charts","2":"entry.realtime","4":"entry.authUserManage","5":"entry.userManage","6":"entry.projectTotal","7":"entry.applyList","8":"entry.log","9":"entry.statistics","10":"entry.apply"}[chunkId]||chunkId) + ".js"; +/******/ script.src = __webpack_require__.p + "" + chunkId + "../" + ({"0":"entry.home","1":"entry.apply","2":"entry.realtime","4":"entry.charts","5":"entry.userManage","6":"entry.authUserManage","7":"entry.applyList","8":"entry.projectTotal","9":"entry.statistics","10":"entry.log"}[chunkId]||chunkId) + ".js"; /******/ head.appendChild(script); /******/ } /******/ }; @@ -16308,166 +16308,166 @@ /***/ function(module, exports, __webpack_require__) { var map = { - "./af": 21, - "./af.js": 21, - "./ar": 25, - "./ar-ma": 22, - "./ar-ma.js": 22, - "./ar-sa": 23, - "./ar-sa.js": 23, - "./ar-tn": 24, - "./ar-tn.js": 24, - "./ar.js": 25, - "./az": 26, - "./az.js": 26, - "./be": 27, - "./be.js": 27, - "./bg": 28, - "./bg.js": 28, - "./bn": 29, - "./bn.js": 29, - "./bo": 30, - "./bo.js": 30, - "./br": 31, - "./br.js": 31, - "./bs": 32, - "./bs.js": 32, - "./ca": 33, - "./ca.js": 33, - "./cs": 34, - "./cs.js": 34, - "./cv": 35, - "./cv.js": 35, - "./cy": 36, - "./cy.js": 36, - "./da": 37, - "./da.js": 37, - "./de": 39, - "./de-at": 38, - "./de-at.js": 38, - "./de.js": 39, - "./el": 40, - "./el.js": 40, - "./en-au": 41, - "./en-au.js": 41, - "./en-ca": 42, - "./en-ca.js": 42, - "./en-gb": 43, - "./en-gb.js": 43, - "./eo": 44, - "./eo.js": 44, - "./es": 45, - "./es.js": 45, - "./et": 46, - "./et.js": 46, - "./eu": 47, - "./eu.js": 47, - "./fa": 48, - "./fa.js": 48, - "./fi": 49, - "./fi.js": 49, - "./fo": 50, - "./fo.js": 50, - "./fr": 52, - "./fr-ca": 51, - "./fr-ca.js": 51, - "./fr.js": 52, - "./fy": 53, - "./fy.js": 53, - "./gl": 54, - "./gl.js": 54, - "./he": 55, - "./he.js": 55, - "./hi": 56, - "./hi.js": 56, - "./hr": 57, - "./hr.js": 57, - "./hu": 58, - "./hu.js": 58, - "./hy-am": 59, - "./hy-am.js": 59, - "./id": 60, - "./id.js": 60, - "./is": 61, - "./is.js": 61, - "./it": 62, - "./it.js": 62, - "./ja": 63, - "./ja.js": 63, - "./ka": 64, - "./ka.js": 64, - "./km": 65, - "./km.js": 65, - "./ko": 66, - "./ko.js": 66, - "./lb": 67, - "./lb.js": 67, - "./lt": 68, - "./lt.js": 68, - "./lv": 69, - "./lv.js": 69, - "./mk": 70, - "./mk.js": 70, - "./ml": 71, - "./ml.js": 71, - "./mr": 72, - "./mr.js": 72, - "./ms-my": 73, - "./ms-my.js": 73, - "./my": 74, - "./my.js": 74, - "./nb": 75, - "./nb.js": 75, - "./ne": 76, - "./ne.js": 76, - "./nl": 77, - "./nl.js": 77, - "./nn": 78, - "./nn.js": 78, - "./pl": 79, - "./pl.js": 79, - "./pt": 81, - "./pt-br": 80, - "./pt-br.js": 80, - "./pt.js": 81, - "./ro": 82, - "./ro.js": 82, - "./ru": 83, - "./ru.js": 83, - "./sk": 84, - "./sk.js": 84, - "./sl": 85, - "./sl.js": 85, - "./sq": 86, - "./sq.js": 86, - "./sr": 88, - "./sr-cyrl": 87, - "./sr-cyrl.js": 87, - "./sr.js": 88, - "./sv": 89, - "./sv.js": 89, - "./ta": 90, - "./ta.js": 90, - "./th": 91, - "./th.js": 91, - "./tl-ph": 92, - "./tl-ph.js": 92, - "./tr": 93, - "./tr.js": 93, - "./tzm": 95, - "./tzm-latn": 94, - "./tzm-latn.js": 94, - "./tzm.js": 95, - "./uk": 96, - "./uk.js": 96, - "./uz": 97, - "./uz.js": 97, - "./vi": 98, - "./vi.js": 98, - "./zh-cn": 99, - "./zh-cn.js": 99, - "./zh-tw": 100, - "./zh-tw.js": 100 + "./af": 20, + "./af.js": 20, + "./ar": 24, + "./ar-ma": 21, + "./ar-ma.js": 21, + "./ar-sa": 22, + "./ar-sa.js": 22, + "./ar-tn": 23, + "./ar-tn.js": 23, + "./ar.js": 24, + "./az": 25, + "./az.js": 25, + "./be": 26, + "./be.js": 26, + "./bg": 27, + "./bg.js": 27, + "./bn": 28, + "./bn.js": 28, + "./bo": 29, + "./bo.js": 29, + "./br": 30, + "./br.js": 30, + "./bs": 31, + "./bs.js": 31, + "./ca": 32, + "./ca.js": 32, + "./cs": 33, + "./cs.js": 33, + "./cv": 34, + "./cv.js": 34, + "./cy": 35, + "./cy.js": 35, + "./da": 36, + "./da.js": 36, + "./de": 38, + "./de-at": 37, + "./de-at.js": 37, + "./de.js": 38, + "./el": 39, + "./el.js": 39, + "./en-au": 40, + "./en-au.js": 40, + "./en-ca": 43, + "./en-ca.js": 43, + "./en-gb": 41, + "./en-gb.js": 41, + "./eo": 42, + "./eo.js": 42, + "./es": 44, + "./es.js": 44, + "./et": 45, + "./et.js": 45, + "./eu": 46, + "./eu.js": 46, + "./fa": 47, + "./fa.js": 47, + "./fi": 48, + "./fi.js": 48, + "./fo": 49, + "./fo.js": 49, + "./fr": 51, + "./fr-ca": 50, + "./fr-ca.js": 50, + "./fr.js": 51, + "./fy": 52, + "./fy.js": 52, + "./gl": 53, + "./gl.js": 53, + "./he": 54, + "./he.js": 54, + "./hi": 55, + "./hi.js": 55, + "./hr": 56, + "./hr.js": 56, + "./hu": 57, + "./hu.js": 57, + "./hy-am": 58, + "./hy-am.js": 58, + "./id": 59, + "./id.js": 59, + "./is": 60, + "./is.js": 60, + "./it": 61, + "./it.js": 61, + "./ja": 62, + "./ja.js": 62, + "./ka": 63, + "./ka.js": 63, + "./km": 64, + "./km.js": 64, + "./ko": 65, + "./ko.js": 65, + "./lb": 66, + "./lb.js": 66, + "./lt": 67, + "./lt.js": 67, + "./lv": 68, + "./lv.js": 68, + "./mk": 69, + "./mk.js": 69, + "./ml": 70, + "./ml.js": 70, + "./mr": 71, + "./mr.js": 71, + "./ms-my": 72, + "./ms-my.js": 72, + "./my": 73, + "./my.js": 73, + "./nb": 74, + "./nb.js": 74, + "./ne": 75, + "./ne.js": 75, + "./nl": 76, + "./nl.js": 76, + "./nn": 77, + "./nn.js": 77, + "./pl": 78, + "./pl.js": 78, + "./pt": 80, + "./pt-br": 79, + "./pt-br.js": 79, + "./pt.js": 80, + "./ro": 81, + "./ro.js": 81, + "./ru": 82, + "./ru.js": 82, + "./sk": 83, + "./sk.js": 83, + "./sl": 84, + "./sl.js": 84, + "./sq": 85, + "./sq.js": 85, + "./sr": 87, + "./sr-cyrl": 86, + "./sr-cyrl.js": 86, + "./sr.js": 87, + "./sv": 88, + "./sv.js": 88, + "./ta": 89, + "./ta.js": 89, + "./th": 90, + "./th.js": 90, + "./tl-ph": 91, + "./tl-ph.js": 91, + "./tr": 92, + "./tr.js": 92, + "./tzm": 94, + "./tzm-latn": 93, + "./tzm-latn.js": 93, + "./tzm.js": 94, + "./uk": 95, + "./uk.js": 95, + "./uz": 96, + "./uz.js": 96, + "./vi": 97, + "./vi.js": 97, + "./zh-cn": 98, + "./zh-cn.js": 98, + "./zh-tw": 99, + "./zh-tw.js": 99 }; function webpackContext(req) { return __webpack_require__(webpackContextResolve(req)); @@ -16486,8 +16486,7 @@ /***/ }, /* 18 */, /* 19 */, -/* 20 */, -/* 21 */ +/* 20 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -16564,7 +16563,7 @@ })); /***/ }, -/* 22 */ +/* 21 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -16627,7 +16626,7 @@ })); /***/ }, -/* 23 */ +/* 22 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -16734,7 +16733,7 @@ })); /***/ }, -/* 24 */ +/* 23 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -16795,7 +16794,7 @@ })); /***/ }, -/* 25 */ +/* 24 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -16935,7 +16934,7 @@ })); /***/ }, -/* 26 */ +/* 25 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -17043,7 +17042,7 @@ })); /***/ }, -/* 27 */ +/* 26 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -17194,7 +17193,7 @@ })); /***/ }, -/* 28 */ +/* 27 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -17288,7 +17287,7 @@ })); /***/ }, -/* 29 */ +/* 28 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -17405,7 +17404,7 @@ })); /***/ }, -/* 30 */ +/* 29 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -17519,7 +17518,7 @@ })); /***/ }, -/* 31 */ +/* 30 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -17630,7 +17629,7 @@ })); /***/ }, -/* 32 */ +/* 31 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -17775,7 +17774,7 @@ })); /***/ }, -/* 33 */ +/* 32 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -17858,7 +17857,7 @@ })); /***/ }, -/* 34 */ +/* 33 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18019,7 +18018,7 @@ })); /***/ }, -/* 35 */ +/* 34 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18086,7 +18085,7 @@ })); /***/ }, -/* 36 */ +/* 35 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18169,7 +18168,7 @@ })); /***/ }, -/* 37 */ +/* 36 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18233,7 +18232,7 @@ })); /***/ }, -/* 38 */ +/* 37 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18313,7 +18312,7 @@ })); /***/ }, -/* 39 */ +/* 38 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18392,7 +18391,7 @@ })); /***/ }, -/* 40 */ +/* 39 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18490,7 +18489,7 @@ })); /***/ }, -/* 41 */ +/* 40 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18560,74 +18559,7 @@ })); /***/ }, -/* 42 */ -/***/ function(module, exports, __webpack_require__) { - - //! moment.js locale configuration - //! locale : canadian english (en-ca) - //! author : Jonathan Abourbih : https://github.com/jonbca - - (function (global, factory) { - true ? factory(__webpack_require__(7)) : - typeof define === 'function' && define.amd ? define(['moment'], factory) : - factory(global.moment) - }(this, function (moment) { 'use strict'; - - - var en_ca = moment.defineLocale('en-ca', { - months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'), - monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'), - weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'), - weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'), - weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'), - longDateFormat : { - LT : 'h:mm A', - LTS : 'h:mm:ss A', - L : 'YYYY-MM-DD', - LL : 'D MMMM, YYYY', - LLL : 'D MMMM, YYYY LT', - LLLL : 'dddd, D MMMM, YYYY LT' - }, - calendar : { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[Last] dddd [at] LT', - sameElse : 'L' - }, - relativeTime : { - future : 'in %s', - past : '%s ago', - s : 'a few seconds', - m : 'a minute', - mm : '%d minutes', - h : 'an hour', - hh : '%d hours', - d : 'a day', - dd : '%d days', - M : 'a month', - MM : '%d months', - y : 'a year', - yy : '%d years' - }, - ordinalParse: /\d{1,2}(st|nd|rd|th)/, - ordinal : function (number) { - var b = number % 10, - output = (~~(number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - } - }); - - return en_ca; - - })); - -/***/ }, -/* 43 */ +/* 41 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18698,7 +18630,7 @@ })); /***/ }, -/* 44 */ +/* 42 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18775,7 +18707,74 @@ })); /***/ }, -/* 45 */ +/* 43 */ +/***/ function(module, exports, __webpack_require__) { + + //! moment.js locale configuration + //! locale : canadian english (en-ca) + //! author : Jonathan Abourbih : https://github.com/jonbca + + (function (global, factory) { + true ? factory(__webpack_require__(7)) : + typeof define === 'function' && define.amd ? define(['moment'], factory) : + factory(global.moment) + }(this, function (moment) { 'use strict'; + + + var en_ca = moment.defineLocale('en-ca', { + months : 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_'), + monthsShort : 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_'), + weekdays : 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_'), + weekdaysShort : 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_'), + weekdaysMin : 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_'), + longDateFormat : { + LT : 'h:mm A', + LTS : 'h:mm:ss A', + L : 'YYYY-MM-DD', + LL : 'D MMMM, YYYY', + LLL : 'D MMMM, YYYY LT', + LLLL : 'dddd, D MMMM, YYYY LT' + }, + calendar : { + sameDay : '[Today at] LT', + nextDay : '[Tomorrow at] LT', + nextWeek : 'dddd [at] LT', + lastDay : '[Yesterday at] LT', + lastWeek : '[Last] dddd [at] LT', + sameElse : 'L' + }, + relativeTime : { + future : 'in %s', + past : '%s ago', + s : 'a few seconds', + m : 'a minute', + mm : '%d minutes', + h : 'an hour', + hh : '%d hours', + d : 'a day', + dd : '%d days', + M : 'a month', + MM : '%d months', + y : 'a year', + yy : '%d years' + }, + ordinalParse: /\d{1,2}(st|nd|rd|th)/, + ordinal : function (number) { + var b = number % 10, + output = (~~(number % 100 / 10) === 1) ? 'th' : + (b === 1) ? 'st' : + (b === 2) ? 'nd' : + (b === 3) ? 'rd' : 'th'; + return number + output; + } + }); + + return en_ca; + + })); + +/***/ }, +/* 44 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18858,7 +18857,7 @@ })); /***/ }, -/* 46 */ +/* 45 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -18942,7 +18941,7 @@ })); /***/ }, -/* 47 */ +/* 46 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19010,7 +19009,7 @@ })); /***/ }, -/* 48 */ +/* 47 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19119,7 +19118,7 @@ })); /***/ }, -/* 49 */ +/* 48 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19230,7 +19229,7 @@ })); /***/ }, -/* 50 */ +/* 49 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19294,7 +19293,7 @@ })); /***/ }, -/* 51 */ +/* 50 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19356,7 +19355,7 @@ })); /***/ }, -/* 52 */ +/* 51 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19422,7 +19421,7 @@ })); /***/ }, -/* 53 */ +/* 52 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19497,7 +19496,7 @@ })); /***/ }, -/* 54 */ +/* 53 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19576,7 +19575,7 @@ })); /***/ }, -/* 55 */ +/* 54 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19662,7 +19661,7 @@ })); /***/ }, -/* 56 */ +/* 55 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19789,7 +19788,7 @@ })); /***/ }, -/* 57 */ +/* 56 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -19933,7 +19932,7 @@ })); /***/ }, -/* 58 */ +/* 57 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20046,7 +20045,7 @@ })); /***/ }, -/* 59 */ +/* 58 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20161,7 +20160,7 @@ })); /***/ }, -/* 60 */ +/* 59 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20248,7 +20247,7 @@ })); /***/ }, -/* 61 */ +/* 60 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20379,7 +20378,7 @@ })); /***/ }, -/* 62 */ +/* 61 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20453,7 +20452,7 @@ })); /***/ }, -/* 63 */ +/* 62 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20522,7 +20521,7 @@ })); /***/ }, -/* 64 */ +/* 63 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20629,7 +20628,7 @@ })); /***/ }, -/* 65 */ +/* 64 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20691,7 +20690,7 @@ })); /***/ }, -/* 66 */ +/* 65 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20763,7 +20762,7 @@ })); /***/ }, -/* 67 */ +/* 66 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -20901,7 +20900,7 @@ })); /***/ }, -/* 68 */ +/* 67 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21020,7 +21019,7 @@ })); /***/ }, -/* 69 */ +/* 68 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21103,7 +21102,7 @@ })); /***/ }, -/* 70 */ +/* 69 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21197,7 +21196,7 @@ })); /***/ }, -/* 71 */ +/* 70 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21272,7 +21271,7 @@ })); /***/ }, -/* 72 */ +/* 71 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21397,7 +21396,7 @@ })); /***/ }, -/* 73 */ +/* 72 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21483,7 +21482,7 @@ })); /***/ }, -/* 74 */ +/* 73 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21579,7 +21578,7 @@ })); /***/ }, -/* 75 */ +/* 74 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21644,7 +21643,7 @@ })); /***/ }, -/* 76 */ +/* 75 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21771,7 +21770,7 @@ })); /***/ }, -/* 77 */ +/* 76 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21846,7 +21845,7 @@ })); /***/ }, -/* 78 */ +/* 77 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -21910,7 +21909,7 @@ })); /***/ }, -/* 79 */ +/* 78 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -22014,7 +22013,7 @@ })); /***/ }, -/* 80 */ +/* 79 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -22078,7 +22077,7 @@ })); /***/ }, -/* 81 */ +/* 80 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -22146,7 +22145,7 @@ })); /***/ }, -/* 82 */ +/* 81 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -22224,7 +22223,7 @@ })); /***/ }, -/* 83 */ +/* 82 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -22392,7 +22391,7 @@ })); /***/ }, -/* 84 */ +/* 83 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -22554,7 +22553,7 @@ })); /***/ }, -/* 85 */ +/* 84 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -22705,7 +22704,7 @@ })); /***/ }, -/* 86 */ +/* 85 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -22778,7 +22777,7 @@ })); /***/ }, -/* 87 */ +/* 86 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -22890,7 +22889,7 @@ })); /***/ }, -/* 88 */ +/* 87 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23002,7 +23001,7 @@ })); /***/ }, -/* 89 */ +/* 88 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23073,7 +23072,7 @@ })); /***/ }, -/* 90 */ +/* 89 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23172,7 +23171,7 @@ })); /***/ }, -/* 91 */ +/* 90 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23241,7 +23240,7 @@ })); /***/ }, -/* 92 */ +/* 91 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23307,7 +23306,7 @@ })); /***/ }, -/* 93 */ +/* 92 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23401,7 +23400,7 @@ })); /***/ }, -/* 94 */ +/* 93 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23463,7 +23462,7 @@ })); /***/ }, -/* 95 */ +/* 94 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23525,7 +23524,7 @@ })); /***/ }, -/* 96 */ +/* 95 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23682,7 +23681,7 @@ })); /***/ }, -/* 97 */ +/* 96 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23744,7 +23743,7 @@ })); /***/ }, -/* 98 */ +/* 97 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23814,7 +23813,7 @@ })); /***/ }, -/* 99 */ +/* 98 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -23945,7 +23944,7 @@ })); /***/ }, -/* 100 */ +/* 99 */ /***/ function(module, exports, __webpack_require__) { //! moment.js locale configuration @@ -24050,6 +24049,7 @@ })); /***/ }, +/* 100 */, /* 101 */, /* 102 */, /* 103 */ diff --git a/static/entry.apply.js b/static/entry.apply.js index 519ce27..6b1e0fb 100644 --- a/static/entry.apply.js +++ b/static/entry.apply.js @@ -1,15 +1,15 @@ -webpackJsonp([10],{ +webpackJsonp([1],{ /***/ 0: /***/ function(module, exports, __webpack_require__) { - var apply = __webpack_require__(8); + var apply = __webpack_require__(11); apply.init(); /***/ }, -/***/ 8: +/***/ 11: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($) {/** @@ -17,7 +17,7 @@ webpackJsonp([10],{ * @author coverguo * */ - var Dialog = __webpack_require__(20); + var Dialog = __webpack_require__(100); var isValid = true, @@ -75,7 +75,7 @@ webpackJsonp([10],{ /***/ }, -/***/ 19: +/***/ 18: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($) {/** @@ -255,10 +255,10 @@ webpackJsonp([10],{ /***/ }, -/***/ 20: +/***/ 100: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(18); var modal = __webpack_require__(112); var container; diff --git a/static/entry.applyList.js b/static/entry.applyList.js index f22500b..85a31da 100644 --- a/static/entry.applyList.js +++ b/static/entry.applyList.js @@ -3,13 +3,13 @@ webpackJsonp([7],{ /***/ 0: /***/ function(module, exports, __webpack_require__) { - var applyList = __webpack_require__(9); + var applyList = __webpack_require__(8); applyList.init(); /***/ }, -/***/ 9: +/***/ 8: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($) {/** @@ -18,8 +18,8 @@ webpackJsonp([7],{ * */ - var Dialog = __webpack_require__(20); - var applyTable = __webpack_require__(104); + var Dialog = __webpack_require__(100); + var applyTable = __webpack_require__(107); var maxDate = 60*60*1000*24 *2; @@ -125,6 +125,10 @@ webpackJsonp([7],{ e.stopPropagation(); }); + $("#applyList .appkey_btn").click(function (){ + + }); + } function getSearchList(params,cb){ $.get('./controller/applyAction/queryListBySearch.do',params, function (data) { @@ -185,7 +189,7 @@ webpackJsonp([7],{ /***/ }, -/***/ 19: +/***/ 18: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($) {/** @@ -365,10 +369,10 @@ webpackJsonp([7],{ /***/ }, -/***/ 20: +/***/ 100: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(18); var modal = __webpack_require__(112); var container; @@ -417,7 +421,7 @@ webpackJsonp([7],{ /***/ }, -/***/ 104: +/***/ 107: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(_) {module.exports = function (obj) { @@ -434,7 +438,7 @@ webpackJsonp([7],{ ; __p += '\r\n'; if(len !=0){; - __p += '\r\n\r\n\r\n \r\n #\r\n 上报id\r\n 名称\r\n 申请人\r\n 申请时间\r\n 业务描述\r\n 业务网址\r\n ' + + __p += '\r\n\r\n\r\n \r\n #\r\n 上报id\r\n appkey\r\n 名称\r\n 申请人\r\n 申请时间\r\n 业务描述\r\n 业务网址\r\n ' + ((__t = ( it.role ==1 ? '操作' : '状态')) == null ? '' : __t) + '\r\n '; if (it.role != 1) { ; @@ -461,7 +465,9 @@ webpackJsonp([7],{ ((__t = ((i +1))) == null ? '' : __t) + '\r\n ' + ((__t = (one.id)) == null ? '' : __t) + - '\r\n \r\n \r\n appkey\r\n
\r\n
appkey :' + + ((__t = (one.appkey)) == null ? '' : __t) + + '
\r\n
\r\n \r\n \r\n ' + ((__t = (one.name)) == null ? '' : __t) + diff --git a/static/entry.authUserManage.js b/static/entry.authUserManage.js index 514a037..2e2a214 100644 --- a/static/entry.authUserManage.js +++ b/static/entry.authUserManage.js @@ -1,15 +1,15 @@ -webpackJsonp([4],{ +webpackJsonp([6],{ /***/ 0: /***/ function(module, exports, __webpack_require__) { - var usermanger = __webpack_require__(10); + var usermanger = __webpack_require__(16); usermanger.init(); /***/ }, -/***/ 10: +/***/ 16: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($) {/** @@ -17,7 +17,7 @@ webpackJsonp([4],{ * @author coverguo * */ - var userTable = __webpack_require__(105); + var userTable = __webpack_require__(111); var encodeHtml = function (str) { @@ -96,7 +96,7 @@ webpackJsonp([4],{ /***/ }, -/***/ 105: +/***/ 111: /***/ function(module, exports, __webpack_require__) { module.exports = function (obj) { diff --git a/static/entry.charts.js b/static/entry.charts.js index 00326a7..d9bac45 100644 --- a/static/entry.charts.js +++ b/static/entry.charts.js @@ -1,15 +1,15 @@ -webpackJsonp([1],{ +webpackJsonp([4],{ /***/ 0: /***/ function(module, exports, __webpack_require__) { - var charts = __webpack_require__(11); + var charts = __webpack_require__(10); charts.init(); /***/ }, -/***/ 11: +/***/ 10: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($, _) {/** @@ -18,10 +18,10 @@ webpackJsonp([1],{ * */ - __webpack_require__(18); + __webpack_require__(19); __webpack_require__(101); __webpack_require__(102); - var Dialog = __webpack_require__(20); + var Dialog = __webpack_require__(100); var dayNumber = 0, @@ -148,6 +148,186 @@ webpackJsonp([1],{ /***/ }, /***/ 18: +/***/ function(module, exports, __webpack_require__) { + + /* WEBPACK VAR INJECTION */(function($) {/** + * Map + * @class + */ + function Map() { + this.map = {}; + this.length = 0; + } + Map.prototype = { + constructor: Map, + /** + * has + * @param {String} key + * @returns {Boolean} + */ + has: function (key) { + return (key in this.map); + }, + /** + * get + * @param {String} key + * @returns {Any} + */ + get: function (key) { + return this.map[key]; + }, + /** + * set + * @param {String} key + * @param {Any} value + */ + set: function (key, value) { + !this.has(key) && this.length++; + return (this.map[key] = value); + }, + /** + * count + * @returns {Number} + */ + count: function () { + return this.length; + }, + /** + * remove + * @param {String} key + */ + remove: function (key) { + if (this.has(key)) { + this.map[key] = null; + delete this.map[key]; + this.length--; + } + } + }; + + var cache = new Map(), set = cache.set, uid = 0; + cache.set = function (node, value) { + if (!value) { + value = node; + set.call(cache, ++uid + '', value); + return uid; + } else { + typeof node === 'string' && + (node = $(node)[0]); + $.data(node, 'event-data', value); + return this; + } + }; + + function _key(arr) { + if (!arr) return {}; + arr = arr.split(' '); + var obj = {}; + for (var i = 0, l = arr.length; i < l; i++) { + obj[arr[i]] = true; + } + return obj; + } + + /** + * Delegator + * @class + * @param {Selector} container + */ + function Delegator(container) { + this.container = $(container); + this.listenerMap = new Map(); + } + + /** + * getKey + * @param {Any} value + * @returns {Number} + */ + Delegator.set = cache.set; + /** + * cache + * @class + * @static + */ + Delegator.cache = cache; + + Delegator.prototype = { + constructor: Delegator, + _getListener: function (type) { + if (this.listenerMap.has(type)) { + return this.listenerMap.get(type); + } + function listener(e) { + var data = $.data(this), + routes = data['event-' + type + '-routes'], + eventData = data['event-data'], handle, dataKey; + + // preprocessing + if (!routes && (routes = this.getAttribute('data-event-' + type))) { + (routes = routes.split(' ')) && + (data['event-' + type + '-routes'] = routes); + !eventData && + (dataKey = this.getAttribute('data-event-data')) && + (eventData = cache.get(dataKey)) && + (data['event-data'] = eventData) && + (cache.remove(dataKey)); + !data['event-stop-propagation'] && + (data['event-stop-propagation'] = _key(this.getAttribute('data-event-stop-propagation'))); + } + + if (routes) { + for (var i = 0, l = routes.length; i < l; i++) { + handle = listener.handleMap.get(routes[i]); + + if (handle) { + handle.call(this, e, eventData); + } + data['event-stop-propagation'][type] && + e.stopPropagation(); + } + } + } + + listener.handleMap = new Map(); + this.listenerMap.set(type, listener); + this.container.on(type, '[data-event-' + type + ']', listener); + return listener; + }, + /** + * on + * @param {String} type + * @param {String} name + * @param {Function} handle + */ + on: function (type, name, handle) { + var listener = this._getListener(type); + listener.handleMap.set(name, handle); + return this; + }, + /** + * off + * @param {String} type + * @param {String} name + */ + off: function (type, name) { + var listener = this._getListener(type), + handleMap = listener.handleMap; + handleMap.remove(name); + if (!handleMap.count()) { + this.container.off(type, '[data-event-' + type + ']', listener); + this.listenerMap.remove(type); + } + } + }; + + module.exports = Delegator; + + /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(5))) + +/***/ }, + +/***/ 19: /***/ function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(jQuery) {/** @@ -2006,190 +2186,10 @@ webpackJsonp([1],{ /***/ }, -/***/ 19: -/***/ function(module, exports, __webpack_require__) { - - /* WEBPACK VAR INJECTION */(function($) {/** - * Map - * @class - */ - function Map() { - this.map = {}; - this.length = 0; - } - Map.prototype = { - constructor: Map, - /** - * has - * @param {String} key - * @returns {Boolean} - */ - has: function (key) { - return (key in this.map); - }, - /** - * get - * @param {String} key - * @returns {Any} - */ - get: function (key) { - return this.map[key]; - }, - /** - * set - * @param {String} key - * @param {Any} value - */ - set: function (key, value) { - !this.has(key) && this.length++; - return (this.map[key] = value); - }, - /** - * count - * @returns {Number} - */ - count: function () { - return this.length; - }, - /** - * remove - * @param {String} key - */ - remove: function (key) { - if (this.has(key)) { - this.map[key] = null; - delete this.map[key]; - this.length--; - } - } - }; - - var cache = new Map(), set = cache.set, uid = 0; - cache.set = function (node, value) { - if (!value) { - value = node; - set.call(cache, ++uid + '', value); - return uid; - } else { - typeof node === 'string' && - (node = $(node)[0]); - $.data(node, 'event-data', value); - return this; - } - }; - - function _key(arr) { - if (!arr) return {}; - arr = arr.split(' '); - var obj = {}; - for (var i = 0, l = arr.length; i < l; i++) { - obj[arr[i]] = true; - } - return obj; - } - - /** - * Delegator - * @class - * @param {Selector} container - */ - function Delegator(container) { - this.container = $(container); - this.listenerMap = new Map(); - } - - /** - * getKey - * @param {Any} value - * @returns {Number} - */ - Delegator.set = cache.set; - /** - * cache - * @class - * @static - */ - Delegator.cache = cache; - - Delegator.prototype = { - constructor: Delegator, - _getListener: function (type) { - if (this.listenerMap.has(type)) { - return this.listenerMap.get(type); - } - function listener(e) { - var data = $.data(this), - routes = data['event-' + type + '-routes'], - eventData = data['event-data'], handle, dataKey; - - // preprocessing - if (!routes && (routes = this.getAttribute('data-event-' + type))) { - (routes = routes.split(' ')) && - (data['event-' + type + '-routes'] = routes); - !eventData && - (dataKey = this.getAttribute('data-event-data')) && - (eventData = cache.get(dataKey)) && - (data['event-data'] = eventData) && - (cache.remove(dataKey)); - !data['event-stop-propagation'] && - (data['event-stop-propagation'] = _key(this.getAttribute('data-event-stop-propagation'))); - } - - if (routes) { - for (var i = 0, l = routes.length; i < l; i++) { - handle = listener.handleMap.get(routes[i]); - - if (handle) { - handle.call(this, e, eventData); - } - data['event-stop-propagation'][type] && - e.stopPropagation(); - } - } - } - - listener.handleMap = new Map(); - this.listenerMap.set(type, listener); - this.container.on(type, '[data-event-' + type + ']', listener); - return listener; - }, - /** - * on - * @param {String} type - * @param {String} name - * @param {Function} handle - */ - on: function (type, name, handle) { - var listener = this._getListener(type); - listener.handleMap.set(name, handle); - return this; - }, - /** - * off - * @param {String} type - * @param {String} name - */ - off: function (type, name) { - var listener = this._getListener(type), - handleMap = listener.handleMap; - handleMap.remove(name); - if (!handleMap.count()) { - this.container.off(type, '[data-event-' + type + ']', listener); - this.listenerMap.remove(type); - } - } - }; - - module.exports = Delegator; - - /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(5))) - -/***/ }, - -/***/ 20: +/***/ 100: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(18); var modal = __webpack_require__(112); var container; diff --git a/static/entry.log.js b/static/entry.log.js index eca96f8..3683b42 100644 --- a/static/entry.log.js +++ b/static/entry.log.js @@ -1,25 +1,25 @@ -webpackJsonp([8],{ +webpackJsonp([10],{ /***/ 0: /***/ function(module, exports, __webpack_require__) { - var log =__webpack_require__(13); + var log =__webpack_require__(9); log.init(); /***/ }, -/***/ 13: +/***/ 9: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($, _) {var Dialog = __webpack_require__(20); - var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($, _) {var Dialog = __webpack_require__(100); + var Delegator = __webpack_require__(18); - var logTable = __webpack_require__(107); - var keyword = __webpack_require__(108); - var debar = __webpack_require__(109); + var logTable = __webpack_require__(104); + var keyword = __webpack_require__(105); + var debar = __webpack_require__(106); - __webpack_require__(18); + __webpack_require__(19); var logConfig = { id: 0, @@ -261,6 +261,186 @@ webpackJsonp([8],{ /***/ }, /***/ 18: +/***/ function(module, exports, __webpack_require__) { + + /* WEBPACK VAR INJECTION */(function($) {/** + * Map + * @class + */ + function Map() { + this.map = {}; + this.length = 0; + } + Map.prototype = { + constructor: Map, + /** + * has + * @param {String} key + * @returns {Boolean} + */ + has: function (key) { + return (key in this.map); + }, + /** + * get + * @param {String} key + * @returns {Any} + */ + get: function (key) { + return this.map[key]; + }, + /** + * set + * @param {String} key + * @param {Any} value + */ + set: function (key, value) { + !this.has(key) && this.length++; + return (this.map[key] = value); + }, + /** + * count + * @returns {Number} + */ + count: function () { + return this.length; + }, + /** + * remove + * @param {String} key + */ + remove: function (key) { + if (this.has(key)) { + this.map[key] = null; + delete this.map[key]; + this.length--; + } + } + }; + + var cache = new Map(), set = cache.set, uid = 0; + cache.set = function (node, value) { + if (!value) { + value = node; + set.call(cache, ++uid + '', value); + return uid; + } else { + typeof node === 'string' && + (node = $(node)[0]); + $.data(node, 'event-data', value); + return this; + } + }; + + function _key(arr) { + if (!arr) return {}; + arr = arr.split(' '); + var obj = {}; + for (var i = 0, l = arr.length; i < l; i++) { + obj[arr[i]] = true; + } + return obj; + } + + /** + * Delegator + * @class + * @param {Selector} container + */ + function Delegator(container) { + this.container = $(container); + this.listenerMap = new Map(); + } + + /** + * getKey + * @param {Any} value + * @returns {Number} + */ + Delegator.set = cache.set; + /** + * cache + * @class + * @static + */ + Delegator.cache = cache; + + Delegator.prototype = { + constructor: Delegator, + _getListener: function (type) { + if (this.listenerMap.has(type)) { + return this.listenerMap.get(type); + } + function listener(e) { + var data = $.data(this), + routes = data['event-' + type + '-routes'], + eventData = data['event-data'], handle, dataKey; + + // preprocessing + if (!routes && (routes = this.getAttribute('data-event-' + type))) { + (routes = routes.split(' ')) && + (data['event-' + type + '-routes'] = routes); + !eventData && + (dataKey = this.getAttribute('data-event-data')) && + (eventData = cache.get(dataKey)) && + (data['event-data'] = eventData) && + (cache.remove(dataKey)); + !data['event-stop-propagation'] && + (data['event-stop-propagation'] = _key(this.getAttribute('data-event-stop-propagation'))); + } + + if (routes) { + for (var i = 0, l = routes.length; i < l; i++) { + handle = listener.handleMap.get(routes[i]); + + if (handle) { + handle.call(this, e, eventData); + } + data['event-stop-propagation'][type] && + e.stopPropagation(); + } + } + } + + listener.handleMap = new Map(); + this.listenerMap.set(type, listener); + this.container.on(type, '[data-event-' + type + ']', listener); + return listener; + }, + /** + * on + * @param {String} type + * @param {String} name + * @param {Function} handle + */ + on: function (type, name, handle) { + var listener = this._getListener(type); + listener.handleMap.set(name, handle); + return this; + }, + /** + * off + * @param {String} type + * @param {String} name + */ + off: function (type, name) { + var listener = this._getListener(type), + handleMap = listener.handleMap; + handleMap.remove(name); + if (!handleMap.count()) { + this.container.off(type, '[data-event-' + type + ']', listener); + this.listenerMap.remove(type); + } + } + }; + + module.exports = Delegator; + + /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(5))) + +/***/ }, + +/***/ 19: /***/ function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(jQuery) {/** @@ -2119,190 +2299,10 @@ webpackJsonp([8],{ /***/ }, -/***/ 19: -/***/ function(module, exports, __webpack_require__) { - - /* WEBPACK VAR INJECTION */(function($) {/** - * Map - * @class - */ - function Map() { - this.map = {}; - this.length = 0; - } - Map.prototype = { - constructor: Map, - /** - * has - * @param {String} key - * @returns {Boolean} - */ - has: function (key) { - return (key in this.map); - }, - /** - * get - * @param {String} key - * @returns {Any} - */ - get: function (key) { - return this.map[key]; - }, - /** - * set - * @param {String} key - * @param {Any} value - */ - set: function (key, value) { - !this.has(key) && this.length++; - return (this.map[key] = value); - }, - /** - * count - * @returns {Number} - */ - count: function () { - return this.length; - }, - /** - * remove - * @param {String} key - */ - remove: function (key) { - if (this.has(key)) { - this.map[key] = null; - delete this.map[key]; - this.length--; - } - } - }; - - var cache = new Map(), set = cache.set, uid = 0; - cache.set = function (node, value) { - if (!value) { - value = node; - set.call(cache, ++uid + '', value); - return uid; - } else { - typeof node === 'string' && - (node = $(node)[0]); - $.data(node, 'event-data', value); - return this; - } - }; - - function _key(arr) { - if (!arr) return {}; - arr = arr.split(' '); - var obj = {}; - for (var i = 0, l = arr.length; i < l; i++) { - obj[arr[i]] = true; - } - return obj; - } - - /** - * Delegator - * @class - * @param {Selector} container - */ - function Delegator(container) { - this.container = $(container); - this.listenerMap = new Map(); - } - - /** - * getKey - * @param {Any} value - * @returns {Number} - */ - Delegator.set = cache.set; - /** - * cache - * @class - * @static - */ - Delegator.cache = cache; - - Delegator.prototype = { - constructor: Delegator, - _getListener: function (type) { - if (this.listenerMap.has(type)) { - return this.listenerMap.get(type); - } - function listener(e) { - var data = $.data(this), - routes = data['event-' + type + '-routes'], - eventData = data['event-data'], handle, dataKey; - - // preprocessing - if (!routes && (routes = this.getAttribute('data-event-' + type))) { - (routes = routes.split(' ')) && - (data['event-' + type + '-routes'] = routes); - !eventData && - (dataKey = this.getAttribute('data-event-data')) && - (eventData = cache.get(dataKey)) && - (data['event-data'] = eventData) && - (cache.remove(dataKey)); - !data['event-stop-propagation'] && - (data['event-stop-propagation'] = _key(this.getAttribute('data-event-stop-propagation'))); - } - - if (routes) { - for (var i = 0, l = routes.length; i < l; i++) { - handle = listener.handleMap.get(routes[i]); - - if (handle) { - handle.call(this, e, eventData); - } - data['event-stop-propagation'][type] && - e.stopPropagation(); - } - } - } - - listener.handleMap = new Map(); - this.listenerMap.set(type, listener); - this.container.on(type, '[data-event-' + type + ']', listener); - return listener; - }, - /** - * on - * @param {String} type - * @param {String} name - * @param {Function} handle - */ - on: function (type, name, handle) { - var listener = this._getListener(type); - listener.handleMap.set(name, handle); - return this; - }, - /** - * off - * @param {String} type - * @param {String} name - */ - off: function (type, name) { - var listener = this._getListener(type), - handleMap = listener.handleMap; - handleMap.remove(name); - if (!handleMap.count()) { - this.container.off(type, '[data-event-' + type + ']', listener); - this.listenerMap.remove(type); - } - } - }; - - module.exports = Delegator; - - /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(5))) - -/***/ }, - -/***/ 20: +/***/ 100: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(18); var modal = __webpack_require__(112); var container; @@ -2351,7 +2351,7 @@ webpackJsonp([8],{ /***/ }, -/***/ 107: +/***/ 104: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(_) {module.exports = function (obj) { @@ -2456,7 +2456,7 @@ webpackJsonp([8],{ /***/ }, -/***/ 108: +/***/ 105: /***/ function(module, exports, __webpack_require__) { module.exports = function (obj) { @@ -2475,7 +2475,7 @@ webpackJsonp([8],{ /***/ }, -/***/ 109: +/***/ 106: /***/ function(module, exports, __webpack_require__) { module.exports = function (obj) { diff --git a/static/entry.projectTotal.js b/static/entry.projectTotal.js index 997a222..fc841da 100644 --- a/static/entry.projectTotal.js +++ b/static/entry.projectTotal.js @@ -1,15 +1,15 @@ -webpackJsonp([6],{ +webpackJsonp([8],{ /***/ 0: /***/ function(module, exports, __webpack_require__) { - var projectTotal = __webpack_require__(12); + var projectTotal = __webpack_require__(13); projectTotal.init(); /***/ }, -/***/ 12: +/***/ 13: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($, _) {/** @@ -18,11 +18,11 @@ webpackJsonp([6],{ * */ - __webpack_require__(18); + __webpack_require__(19); __webpack_require__(101); __webpack_require__(102); - var Dialog = __webpack_require__(20); - var statisticsTpl = __webpack_require__(106); + var Dialog = __webpack_require__(100); + var statisticsTpl = __webpack_require__(109); var dayNumber = 0, @@ -153,6 +153,186 @@ webpackJsonp([6],{ /***/ }, /***/ 18: +/***/ function(module, exports, __webpack_require__) { + + /* WEBPACK VAR INJECTION */(function($) {/** + * Map + * @class + */ + function Map() { + this.map = {}; + this.length = 0; + } + Map.prototype = { + constructor: Map, + /** + * has + * @param {String} key + * @returns {Boolean} + */ + has: function (key) { + return (key in this.map); + }, + /** + * get + * @param {String} key + * @returns {Any} + */ + get: function (key) { + return this.map[key]; + }, + /** + * set + * @param {String} key + * @param {Any} value + */ + set: function (key, value) { + !this.has(key) && this.length++; + return (this.map[key] = value); + }, + /** + * count + * @returns {Number} + */ + count: function () { + return this.length; + }, + /** + * remove + * @param {String} key + */ + remove: function (key) { + if (this.has(key)) { + this.map[key] = null; + delete this.map[key]; + this.length--; + } + } + }; + + var cache = new Map(), set = cache.set, uid = 0; + cache.set = function (node, value) { + if (!value) { + value = node; + set.call(cache, ++uid + '', value); + return uid; + } else { + typeof node === 'string' && + (node = $(node)[0]); + $.data(node, 'event-data', value); + return this; + } + }; + + function _key(arr) { + if (!arr) return {}; + arr = arr.split(' '); + var obj = {}; + for (var i = 0, l = arr.length; i < l; i++) { + obj[arr[i]] = true; + } + return obj; + } + + /** + * Delegator + * @class + * @param {Selector} container + */ + function Delegator(container) { + this.container = $(container); + this.listenerMap = new Map(); + } + + /** + * getKey + * @param {Any} value + * @returns {Number} + */ + Delegator.set = cache.set; + /** + * cache + * @class + * @static + */ + Delegator.cache = cache; + + Delegator.prototype = { + constructor: Delegator, + _getListener: function (type) { + if (this.listenerMap.has(type)) { + return this.listenerMap.get(type); + } + function listener(e) { + var data = $.data(this), + routes = data['event-' + type + '-routes'], + eventData = data['event-data'], handle, dataKey; + + // preprocessing + if (!routes && (routes = this.getAttribute('data-event-' + type))) { + (routes = routes.split(' ')) && + (data['event-' + type + '-routes'] = routes); + !eventData && + (dataKey = this.getAttribute('data-event-data')) && + (eventData = cache.get(dataKey)) && + (data['event-data'] = eventData) && + (cache.remove(dataKey)); + !data['event-stop-propagation'] && + (data['event-stop-propagation'] = _key(this.getAttribute('data-event-stop-propagation'))); + } + + if (routes) { + for (var i = 0, l = routes.length; i < l; i++) { + handle = listener.handleMap.get(routes[i]); + + if (handle) { + handle.call(this, e, eventData); + } + data['event-stop-propagation'][type] && + e.stopPropagation(); + } + } + } + + listener.handleMap = new Map(); + this.listenerMap.set(type, listener); + this.container.on(type, '[data-event-' + type + ']', listener); + return listener; + }, + /** + * on + * @param {String} type + * @param {String} name + * @param {Function} handle + */ + on: function (type, name, handle) { + var listener = this._getListener(type); + listener.handleMap.set(name, handle); + return this; + }, + /** + * off + * @param {String} type + * @param {String} name + */ + off: function (type, name) { + var listener = this._getListener(type), + handleMap = listener.handleMap; + handleMap.remove(name); + if (!handleMap.count()) { + this.container.off(type, '[data-event-' + type + ']', listener); + this.listenerMap.remove(type); + } + } + }; + + module.exports = Delegator; + + /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(5))) + +/***/ }, + +/***/ 19: /***/ function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(jQuery) {/** @@ -2011,190 +2191,10 @@ webpackJsonp([6],{ /***/ }, -/***/ 19: -/***/ function(module, exports, __webpack_require__) { - - /* WEBPACK VAR INJECTION */(function($) {/** - * Map - * @class - */ - function Map() { - this.map = {}; - this.length = 0; - } - Map.prototype = { - constructor: Map, - /** - * has - * @param {String} key - * @returns {Boolean} - */ - has: function (key) { - return (key in this.map); - }, - /** - * get - * @param {String} key - * @returns {Any} - */ - get: function (key) { - return this.map[key]; - }, - /** - * set - * @param {String} key - * @param {Any} value - */ - set: function (key, value) { - !this.has(key) && this.length++; - return (this.map[key] = value); - }, - /** - * count - * @returns {Number} - */ - count: function () { - return this.length; - }, - /** - * remove - * @param {String} key - */ - remove: function (key) { - if (this.has(key)) { - this.map[key] = null; - delete this.map[key]; - this.length--; - } - } - }; - - var cache = new Map(), set = cache.set, uid = 0; - cache.set = function (node, value) { - if (!value) { - value = node; - set.call(cache, ++uid + '', value); - return uid; - } else { - typeof node === 'string' && - (node = $(node)[0]); - $.data(node, 'event-data', value); - return this; - } - }; - - function _key(arr) { - if (!arr) return {}; - arr = arr.split(' '); - var obj = {}; - for (var i = 0, l = arr.length; i < l; i++) { - obj[arr[i]] = true; - } - return obj; - } - - /** - * Delegator - * @class - * @param {Selector} container - */ - function Delegator(container) { - this.container = $(container); - this.listenerMap = new Map(); - } - - /** - * getKey - * @param {Any} value - * @returns {Number} - */ - Delegator.set = cache.set; - /** - * cache - * @class - * @static - */ - Delegator.cache = cache; - - Delegator.prototype = { - constructor: Delegator, - _getListener: function (type) { - if (this.listenerMap.has(type)) { - return this.listenerMap.get(type); - } - function listener(e) { - var data = $.data(this), - routes = data['event-' + type + '-routes'], - eventData = data['event-data'], handle, dataKey; - - // preprocessing - if (!routes && (routes = this.getAttribute('data-event-' + type))) { - (routes = routes.split(' ')) && - (data['event-' + type + '-routes'] = routes); - !eventData && - (dataKey = this.getAttribute('data-event-data')) && - (eventData = cache.get(dataKey)) && - (data['event-data'] = eventData) && - (cache.remove(dataKey)); - !data['event-stop-propagation'] && - (data['event-stop-propagation'] = _key(this.getAttribute('data-event-stop-propagation'))); - } - - if (routes) { - for (var i = 0, l = routes.length; i < l; i++) { - handle = listener.handleMap.get(routes[i]); - - if (handle) { - handle.call(this, e, eventData); - } - data['event-stop-propagation'][type] && - e.stopPropagation(); - } - } - } - - listener.handleMap = new Map(); - this.listenerMap.set(type, listener); - this.container.on(type, '[data-event-' + type + ']', listener); - return listener; - }, - /** - * on - * @param {String} type - * @param {String} name - * @param {Function} handle - */ - on: function (type, name, handle) { - var listener = this._getListener(type); - listener.handleMap.set(name, handle); - return this; - }, - /** - * off - * @param {String} type - * @param {String} name - */ - off: function (type, name) { - var listener = this._getListener(type), - handleMap = listener.handleMap; - handleMap.remove(name); - if (!handleMap.count()) { - this.container.off(type, '[data-event-' + type + ']', listener); - this.listenerMap.remove(type); - } - } - }; - - module.exports = Delegator; - - /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(5))) - -/***/ }, - -/***/ 20: +/***/ 100: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(18); var modal = __webpack_require__(112); var container; @@ -2659,7 +2659,7 @@ webpackJsonp([6],{ /***/ }, -/***/ 106: +/***/ 109: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($, _) {module.exports = function (obj) { diff --git a/static/entry.realtime.js b/static/entry.realtime.js index be0bec2..9598ae4 100644 --- a/static/entry.realtime.js +++ b/static/entry.realtime.js @@ -3,21 +3,21 @@ webpackJsonp([2],{ /***/ 0: /***/ function(module, exports, __webpack_require__) { - var log =__webpack_require__(14); + var log =__webpack_require__(12); log.init(); /***/ }, -/***/ 14: +/***/ 12: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($) {var Dialog = __webpack_require__(20); - var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($) {var Dialog = __webpack_require__(100); + var Delegator = __webpack_require__(18); - var logTable = __webpack_require__(107); - var keyword = __webpack_require__(108); - var debar = __webpack_require__(109); + var logTable = __webpack_require__(104); + var keyword = __webpack_require__(105); + var debar = __webpack_require__(106); var logConfig = { @@ -222,7 +222,7 @@ webpackJsonp([2],{ /***/ }, -/***/ 19: +/***/ 18: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($) {/** @@ -402,10 +402,10 @@ webpackJsonp([2],{ /***/ }, -/***/ 20: +/***/ 100: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(18); var modal = __webpack_require__(112); var container; @@ -454,7 +454,7 @@ webpackJsonp([2],{ /***/ }, -/***/ 107: +/***/ 104: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function(_) {module.exports = function (obj) { @@ -559,7 +559,7 @@ webpackJsonp([2],{ /***/ }, -/***/ 108: +/***/ 105: /***/ function(module, exports, __webpack_require__) { module.exports = function (obj) { @@ -578,7 +578,7 @@ webpackJsonp([2],{ /***/ }, -/***/ 109: +/***/ 106: /***/ function(module, exports, __webpack_require__) { module.exports = function (obj) { diff --git a/static/entry.statistics.js b/static/entry.statistics.js index 8f69a2b..ef4e498 100644 --- a/static/entry.statistics.js +++ b/static/entry.statistics.js @@ -3,13 +3,13 @@ webpackJsonp([9],{ /***/ 0: /***/ function(module, exports, __webpack_require__) { - var statistics = __webpack_require__(16); + var statistics = __webpack_require__(14); statistics.init(); /***/ }, -/***/ 16: +/***/ 14: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($) {/** @@ -18,9 +18,9 @@ webpackJsonp([9],{ * */ - __webpack_require__(18); - var Dialog = __webpack_require__(20); - var statisticsTpl = __webpack_require__(110); + __webpack_require__(19); + var Dialog = __webpack_require__(100); + var statisticsTpl = __webpack_require__(108); var encodeHtml = function (str) { return (str + '').replace(/&/g, '&').replace(//g, '>').replace(/\x60/g, '`').replace(/\x27/g, ''').replace(/\x22/g, '"'); @@ -69,6 +69,186 @@ webpackJsonp([9],{ /***/ }, /***/ 18: +/***/ function(module, exports, __webpack_require__) { + + /* WEBPACK VAR INJECTION */(function($) {/** + * Map + * @class + */ + function Map() { + this.map = {}; + this.length = 0; + } + Map.prototype = { + constructor: Map, + /** + * has + * @param {String} key + * @returns {Boolean} + */ + has: function (key) { + return (key in this.map); + }, + /** + * get + * @param {String} key + * @returns {Any} + */ + get: function (key) { + return this.map[key]; + }, + /** + * set + * @param {String} key + * @param {Any} value + */ + set: function (key, value) { + !this.has(key) && this.length++; + return (this.map[key] = value); + }, + /** + * count + * @returns {Number} + */ + count: function () { + return this.length; + }, + /** + * remove + * @param {String} key + */ + remove: function (key) { + if (this.has(key)) { + this.map[key] = null; + delete this.map[key]; + this.length--; + } + } + }; + + var cache = new Map(), set = cache.set, uid = 0; + cache.set = function (node, value) { + if (!value) { + value = node; + set.call(cache, ++uid + '', value); + return uid; + } else { + typeof node === 'string' && + (node = $(node)[0]); + $.data(node, 'event-data', value); + return this; + } + }; + + function _key(arr) { + if (!arr) return {}; + arr = arr.split(' '); + var obj = {}; + for (var i = 0, l = arr.length; i < l; i++) { + obj[arr[i]] = true; + } + return obj; + } + + /** + * Delegator + * @class + * @param {Selector} container + */ + function Delegator(container) { + this.container = $(container); + this.listenerMap = new Map(); + } + + /** + * getKey + * @param {Any} value + * @returns {Number} + */ + Delegator.set = cache.set; + /** + * cache + * @class + * @static + */ + Delegator.cache = cache; + + Delegator.prototype = { + constructor: Delegator, + _getListener: function (type) { + if (this.listenerMap.has(type)) { + return this.listenerMap.get(type); + } + function listener(e) { + var data = $.data(this), + routes = data['event-' + type + '-routes'], + eventData = data['event-data'], handle, dataKey; + + // preprocessing + if (!routes && (routes = this.getAttribute('data-event-' + type))) { + (routes = routes.split(' ')) && + (data['event-' + type + '-routes'] = routes); + !eventData && + (dataKey = this.getAttribute('data-event-data')) && + (eventData = cache.get(dataKey)) && + (data['event-data'] = eventData) && + (cache.remove(dataKey)); + !data['event-stop-propagation'] && + (data['event-stop-propagation'] = _key(this.getAttribute('data-event-stop-propagation'))); + } + + if (routes) { + for (var i = 0, l = routes.length; i < l; i++) { + handle = listener.handleMap.get(routes[i]); + + if (handle) { + handle.call(this, e, eventData); + } + data['event-stop-propagation'][type] && + e.stopPropagation(); + } + } + } + + listener.handleMap = new Map(); + this.listenerMap.set(type, listener); + this.container.on(type, '[data-event-' + type + ']', listener); + return listener; + }, + /** + * on + * @param {String} type + * @param {String} name + * @param {Function} handle + */ + on: function (type, name, handle) { + var listener = this._getListener(type); + listener.handleMap.set(name, handle); + return this; + }, + /** + * off + * @param {String} type + * @param {String} name + */ + off: function (type, name) { + var listener = this._getListener(type), + handleMap = listener.handleMap; + handleMap.remove(name); + if (!handleMap.count()) { + this.container.off(type, '[data-event-' + type + ']', listener); + this.listenerMap.remove(type); + } + } + }; + + module.exports = Delegator; + + /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(5))) + +/***/ }, + +/***/ 19: /***/ function(module, exports, __webpack_require__) { var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_DEFINE_RESULT__;/* WEBPACK VAR INJECTION */(function(jQuery) {/** @@ -1927,190 +2107,10 @@ webpackJsonp([9],{ /***/ }, -/***/ 19: -/***/ function(module, exports, __webpack_require__) { - - /* WEBPACK VAR INJECTION */(function($) {/** - * Map - * @class - */ - function Map() { - this.map = {}; - this.length = 0; - } - Map.prototype = { - constructor: Map, - /** - * has - * @param {String} key - * @returns {Boolean} - */ - has: function (key) { - return (key in this.map); - }, - /** - * get - * @param {String} key - * @returns {Any} - */ - get: function (key) { - return this.map[key]; - }, - /** - * set - * @param {String} key - * @param {Any} value - */ - set: function (key, value) { - !this.has(key) && this.length++; - return (this.map[key] = value); - }, - /** - * count - * @returns {Number} - */ - count: function () { - return this.length; - }, - /** - * remove - * @param {String} key - */ - remove: function (key) { - if (this.has(key)) { - this.map[key] = null; - delete this.map[key]; - this.length--; - } - } - }; - - var cache = new Map(), set = cache.set, uid = 0; - cache.set = function (node, value) { - if (!value) { - value = node; - set.call(cache, ++uid + '', value); - return uid; - } else { - typeof node === 'string' && - (node = $(node)[0]); - $.data(node, 'event-data', value); - return this; - } - }; - - function _key(arr) { - if (!arr) return {}; - arr = arr.split(' '); - var obj = {}; - for (var i = 0, l = arr.length; i < l; i++) { - obj[arr[i]] = true; - } - return obj; - } - - /** - * Delegator - * @class - * @param {Selector} container - */ - function Delegator(container) { - this.container = $(container); - this.listenerMap = new Map(); - } - - /** - * getKey - * @param {Any} value - * @returns {Number} - */ - Delegator.set = cache.set; - /** - * cache - * @class - * @static - */ - Delegator.cache = cache; - - Delegator.prototype = { - constructor: Delegator, - _getListener: function (type) { - if (this.listenerMap.has(type)) { - return this.listenerMap.get(type); - } - function listener(e) { - var data = $.data(this), - routes = data['event-' + type + '-routes'], - eventData = data['event-data'], handle, dataKey; - - // preprocessing - if (!routes && (routes = this.getAttribute('data-event-' + type))) { - (routes = routes.split(' ')) && - (data['event-' + type + '-routes'] = routes); - !eventData && - (dataKey = this.getAttribute('data-event-data')) && - (eventData = cache.get(dataKey)) && - (data['event-data'] = eventData) && - (cache.remove(dataKey)); - !data['event-stop-propagation'] && - (data['event-stop-propagation'] = _key(this.getAttribute('data-event-stop-propagation'))); - } - - if (routes) { - for (var i = 0, l = routes.length; i < l; i++) { - handle = listener.handleMap.get(routes[i]); - - if (handle) { - handle.call(this, e, eventData); - } - data['event-stop-propagation'][type] && - e.stopPropagation(); - } - } - } - - listener.handleMap = new Map(); - this.listenerMap.set(type, listener); - this.container.on(type, '[data-event-' + type + ']', listener); - return listener; - }, - /** - * on - * @param {String} type - * @param {String} name - * @param {Function} handle - */ - on: function (type, name, handle) { - var listener = this._getListener(type); - listener.handleMap.set(name, handle); - return this; - }, - /** - * off - * @param {String} type - * @param {String} name - */ - off: function (type, name) { - var listener = this._getListener(type), - handleMap = listener.handleMap; - handleMap.remove(name); - if (!handleMap.count()) { - this.container.off(type, '[data-event-' + type + ']', listener); - this.listenerMap.remove(type); - } - } - }; - - module.exports = Delegator; - - /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(5))) - -/***/ }, - -/***/ 20: +/***/ 100: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(18); var modal = __webpack_require__(112); var container; @@ -2159,7 +2159,7 @@ webpackJsonp([9],{ /***/ }, -/***/ 110: +/***/ 108: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($) {module.exports = function (obj) { diff --git a/static/entry.userManage.js b/static/entry.userManage.js index c731e76..0b680e9 100644 --- a/static/entry.userManage.js +++ b/static/entry.userManage.js @@ -17,8 +17,8 @@ webpackJsonp([5],{ * @author coverguo * */ - var Dialog = __webpack_require__(20); - var userTable = __webpack_require__(111); + var Dialog = __webpack_require__(100); + var userTable = __webpack_require__(110); var encodeHtml = function (str) { @@ -167,7 +167,7 @@ webpackJsonp([5],{ /***/ }, -/***/ 19: +/***/ 18: /***/ function(module, exports, __webpack_require__) { /* WEBPACK VAR INJECTION */(function($) {/** @@ -347,10 +347,10 @@ webpackJsonp([5],{ /***/ }, -/***/ 20: +/***/ 100: /***/ function(module, exports, __webpack_require__) { - /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(19); + /* WEBPACK VAR INJECTION */(function($) {var Delegator = __webpack_require__(18); var modal = __webpack_require__(112); var container; @@ -399,7 +399,7 @@ webpackJsonp([5],{ /***/ }, -/***/ 111: +/***/ 110: /***/ function(module, exports, __webpack_require__) { module.exports = function (obj) { diff --git a/static/module/applyList/mod.applyList.js b/static/module/applyList/mod.applyList.js index 0a839de..94b9196 100644 --- a/static/module/applyList/mod.applyList.js +++ b/static/module/applyList/mod.applyList.js @@ -111,6 +111,10 @@ var applyTable = require("./template/applyTable.ejs"); e.stopPropagation(); }); + $("#applyList .appkey_btn").click(function (){ + + }); + } function getSearchList(params,cb){ $.get('./controller/applyAction/queryListBySearch.do',params, function (data) { diff --git a/static/module/applyList/template/applyTable.ejs b/static/module/applyList/template/applyTable.ejs index c03db4c..65676f4 100644 --- a/static/module/applyList/template/applyTable.ejs +++ b/static/module/applyList/template/applyTable.ejs @@ -10,6 +10,7 @@ # 上报id + appkey 名称 申请人 申请时间 @@ -45,6 +46,12 @@ for(var i = 0; i--> <%=(i +1)%> <%=one.id%> + + appkey +
+
appkey :<%=one.appkey%>
+
+ <%=one.name%> diff --git a/static/module/common/app.css b/static/module/common/app.css index d0b103c..982025e 100644 --- a/static/module/common/app.css +++ b/static/module/common/app.css @@ -723,4 +723,25 @@ form { .toolar-ul.show li { left:0px; +} + +.apply_appkey { + position: relative; + } + +.apply_appkey:hover .appkey-panel { + display: block; +} + +.apply_appkey .appkey-panel { + display: none; + position: absolute; + width:360px; + border: 1px solid #9D9696; + background: #E5E5E5; + border-radius: 4px; + z-index: 99; + padding: 5px; + left:-100px; + top:30px; } \ No newline at end of file