yangbiao 10 年之前
父節點
當前提交
7b3513ac7e

+ 1 - 0
display-client/.gitignore

1
/.settings
1
/.settings
2
/bin
2
/bin
3
/gen
3
/gen
4
/.classpath
4
/proguard
5
/proguard

+ 1 - 9
display-server/bin/.gitignore

1
/com/
1
/com/
2
/database.xml
3
/log4j.properties
4
/lua/
5
/memcache.properties
6
/private_key
7
/server-config.xml
8
/server-data-result.txt
9
/server-data.xml
10
/server-page.xml
2
/org/

+ 1 - 0
display-server/web/.gitignore

1
/encrypt
1
/encrypt
2
/res.version.properties
2
/res.version.properties
3
/.classpath

+ 16 - 0
display-server/web/template/lua/tag/.gitignore

1
/WmDialog.lua
2
/WmDropmenu.lua
3
/WmDropmenuItem.lua
4
/WmNavBar.lua
5
/WmNavBarItem.lua
6
/WmProgress.lua
7
/WmSegment.lua
8
/WmSlider.lua
9
/WmSliderItem.lua
10
/WmSwitch.lua
11
/WmTab.lua
12
/WmTabbar.lua
13
/WmTabbarItem.lua
14
/WmTabItem.lua
15
/WmTest.lua
16
/WmToolTip.lua

+ 5 - 1
display-server/web/template/lua/tag/WmDialog.lua

2
local Tag = require("engine.Tag")
2
local Tag = require("engine.Tag")
3
local WmDialog = Class(Tag)
3
local WmDialog = Class(Tag)
4

4

5
function WmDialog:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

5
function WmDialog:doStartTag(attr)
9
function WmDialog:doStartTag(attr)
6
	if not (attr.id and attr.title) then
10
	if not (attr.id and attr.title) then
7
		monitor:error("WmDialog组件 id、title属性不能为空 ")
11
		monitor:error("WmDialog组件 id、title属性不能为空 ")
34
	self.htmlbuff:append('')
38
	self.htmlbuff:append('')
35

39

36
	self.htmlbuff:append('<script type="text/javascript">')
40
	self.htmlbuff:append('<script type="text/javascript">')
37
	self.htmlbuff:append('require(["wmDialog"],function(WmDialog) {')
41
	self.htmlbuff:append('require(["wmDialog","wmWebUI"],function(WmDialog,WmWebUI) {')
38
	self.htmlbuff:append('var dialog_'..attr.id..' = new WmDialog("'..attr.id..'");')
42
	self.htmlbuff:append('var dialog_'..attr.id..' = new WmDialog("'..attr.id..'");')
39
	if attr.contentId then
43
	if attr.contentId then
40
		self.htmlbuff:append(' dialog_'..attr.id..'.setContent("'..attr.contentId..'","html");')
44
		self.htmlbuff:append(' dialog_'..attr.id..'.setContent("'..attr.contentId..'","html");')

+ 2 - 2
display-server/web/template/lua/tag/WmNavBar.lua

1
local Class = require("util.Class")
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
2
local Tag = require("engine.Tag")
3
local WmNavBar = Class(Tag)
3
local WmNavBar = Class(Tag)
4
--[[
4

5
function WmNavBar:createNew(obj,htmlbuff)
5
function WmNavBar:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
6
  self.htmlbuff=htmlbuff
7
  monitor:debug("------------------------")
7
  monitor:debug("------------------------")
8
 -- monitor:debug("htmlbuff length:"..#self.htmlbuff)
8
 -- monitor:debug("htmlbuff length:"..#self.htmlbuff)
9
  self.bottoms = {}
9
  self.bottoms = {}
10
end
10
end
11
--]]
11

12
function WmNavBar:doStartTag(attr)
12
function WmNavBar:doStartTag(attr)
13
	self.id = attr.id
13
	self.id = attr.id
14
	self.bottoms = {}
14
	self.bottoms = {}

+ 4 - 0
display-server/web/template/lua/tag/WmNavBarItem.lua

2
local Tag = require("engine.Tag")
2
local Tag = require("engine.Tag")
3
local WmNavBarItem = Class(Tag)
3
local WmNavBarItem = Class(Tag)
4

4

5
function WmNavBarItem:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

5
function WmNavBarItem:doStartTag(attr)
9
function WmNavBarItem:doStartTag(attr)
6
	if attr.type == "back" then
10
	if attr.type == "back" then
7
		self.htmlbuff:append('<div class="left"><div class="back"><span class="e_ico-back"></span>')
11
		self.htmlbuff:append('<div class="left"><div class="back"><span class="e_ico-back"></span>')

+ 4 - 0
display-server/web/template/lua/tag/WmProgress.lua

2
local Tag = require("engine.Tag")
2
local Tag = require("engine.Tag")
3
local WmProgress = Class(Tag)
3
local WmProgress = Class(Tag)
4

4

5
function WmProgress:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

5
function WmProgress:doStartTag(attr)
9
function WmProgress:doStartTag(attr)
6

10

7
	if not (attr.id and attr.progress) then
11
	if not (attr.id and attr.progress) then

+ 13 - 9
display-server/web/template/lua/tag/WmSegment.lua

2
local Tag = require("engine.Tag")
2
local Tag = require("engine.Tag")
3
local WmSegment = Class(Tag)
3
local WmSegment = Class(Tag)
4

4

5
function WmSegment:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

5
function WmSegment:doStartTag(attr)
9
function WmSegment:doStartTag(attr)
6
	local texts = self.Split(attr.texts, ",")
10
	local texts = self.Split(attr.texts, ",")
7
	local values = self.Split(attr.values, ",")
11
	local values = self.Split(attr.values, ",")
13
	self.htmlbuff:append('<input type="hidden" id="'..attr.name..'" name="'..attr.name..'" value="" />')
17
	self.htmlbuff:append('<input type="hidden" id="'..attr.name..'" name="'..attr.name..'" value="" />')
14
	
18
	
15
	
19
	
16
	self.htmlbuff:append('<script type="text/javascript">')
17
	self.htmlbuff:append('require(["wmSegment"],function(WmSegment) {')
18
	self.htmlbuff:append('var segment_'..attr.id..' = new WmSegment("'..attr.id..'","'..attr.name..'",false);')
20
	self.htmlbuff:append('<script type="text/javascript">\n')
21
	self.htmlbuff:append('require(["wmSegment"],function(WmSegment) {\n')
22
	self.htmlbuff:append('var segment_'..attr.id..' = new WmSegment("'..attr.id..'","'..attr.name..'",false);\n')
19
	if attr.selected then
23
	if attr.selected then
20
		self.htmlbuff:append('segment_'..attr.id..'.activeItem("'..attr.selected..'");')
24
		self.htmlbuff:append('segment_'..attr.id..'.activeItem("'..attr.selected..'");\n')
21
	else
25
	else
22
		self.htmlbuff:append('segment_'..attr.id..'.activeItemIndex(0);')
26
		self.htmlbuff:append('segment_'..attr.id..'.activeItemIndex(0);\n')
23
	end 
27
	end 
24
	if attr.action then
28
	if attr.action then
25
		self.htmlbuff:append('segment_'..attr.id..'.setAction(function(){ return '..attr.action..'.apply(window,arguments);})')
29
		self.htmlbuff:append('segment_'..attr.id..'.setAction(function(){ return '..attr.action..'.apply(window,arguments);})\n')
26
	else
30
	else
27
		self.htmlbuff:append('segment_'..attr.id..'.setAction()')
31
		self.htmlbuff:append('segment_'..attr.id..'.setAction();\n')
28
	end 
32
	end 
29
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",segment_'..attr.id..');')
30
	self.htmlbuff:append('})')
33
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",segment_'..attr.id..');\n')
34
	self.htmlbuff:append('})\n')
31
	self.htmlbuff:append('</script>')
35
	self.htmlbuff:append('</script>')
32
end
36
end
33

37


+ 6 - 1
display-server/web/template/lua/tag/WmToolTip.lua

2
local Tag = require("engine.Tag")
2
local Tag = require("engine.Tag")
3
local WmToolTip = Class(Tag)
3
local WmToolTip = Class(Tag)
4

4

5
function WmToolTip:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

9

5
function WmToolTip:doStartTag(attr)
10
function WmToolTip:doStartTag(attr)
6
	self.id = attr.id
11
	self.id = attr.id
7
	local align = ""
12
	local align = ""
28
	end
33
	end
29
	self.htmlbuff:append('</div></div>')
34
	self.htmlbuff:append('</div></div>')
30
	self.htmlbuff:append('<script type="text/javascript">')
35
	self.htmlbuff:append('<script type="text/javascript">')
31
	self.htmlbuff:append('require(["wmToolTip"],function(WmToolTip) {')
36
	self.htmlbuff:append('require(["wmToolTip","wmWebUI"],function(WmToolTip,WmWebUI) {')
32
	self.htmlbuff:append('var tooltip_'..self.id..' = new WmToolTip("'..self.id..'");')
37
	self.htmlbuff:append('var tooltip_'..self.id..' = new WmToolTip("'..self.id..'");')
33
	if attr.action then
38
	if attr.action then
34
		self.htmlbuff:append('tooltip_'..self.id..'.setCloseAction(function(){ return '..attr.action..'.apply(window,arguments);});')
39
		self.htmlbuff:append('tooltip_'..self.id..'.setCloseAction(function(){ return '..attr.action..'.apply(window,arguments);});')