モジュール:Utility/TableUtil - 版の履歴

Mntone: [LineCell] 参照するオブジェクトのミスを修正

2021-09-02T02:35:21Z

[LineCell] 参照するオブジェクトのミスを修正

← 古い版		2021年9月2日 (木) 11:35時点における版
381行目:		381行目:

	if self.gridEnabled then		if self.gridEnabled then
	if ~~obj~~.scale.typename == scale.LogScale.__typename then		if self.scale.typename == scale.LogScale.__typename then
	local ticksCount = #self._ticks + 1		local ticksCount = #self._ticks + 1
	self._classes = string.format('st-grid st-grid-%d st-grid-log%d st-line st-line-h%d-h%d', ticksCount, ticksCount, 10 * self.height, 10 * self.subHeight)		self._classes = string.format('st-grid st-grid-%d st-grid-log%d st-line st-line-h%d-h%d', ticksCount, ticksCount, 10 * self.height, 10 * self.subHeight)
391行目:		391行目:
	end		end
	elseif self.gridEnabled then		elseif self.gridEnabled then
	if ~~obj~~.scale.typename == scale.LogScale.__typename then		if self.scale.typename == scale.LogScale.__typename then
	local ticksCount = #self._ticks + 1		local ticksCount = #self._ticks + 1
	self._classes = string.format('st-grid st-grid-%d st-grid-log%d st-line st-line-h%d', ticksCount, ticksCount, 10 * self.height)		self._classes = string.format('st-grid st-grid-%d st-grid-log%d st-line st-line-h%d', ticksCount, ticksCount, 10 * self.height)

Mntone: [LineCell] LogScaleを用いる場合、特殊なクラス名を書き出す機能を実装

2021-09-02T02:34:34Z

[LineCell] LogScaleを用いる場合、特殊なクラス名を書き出す機能を実装

← 古い版		2021年9月2日 (木) 11:34時点における版
381行目:		381行目:

	if self.gridEnabled then		if self.gridEnabled then
	self._classes = string.format('st-grid st-grid-%d st-line st-line-h%d-h%d', #self._ticks + 1, 10 * self.height, 10 * self.subHeight)		if obj.scale.typename == scale.LogScale.__typename then
			local ticksCount = #self._ticks + 1
			self._classes = string.format('st-grid st-grid-%d st-grid-log%d st-line st-line-h%d-h%d', ticksCount, ticksCount, 10 * self.height, 10 * self.subHeight)
			else
			self._classes = string.format('st-grid st-grid-%d st-line st-line-h%d-h%d', #self._ticks + 1, 10 * self.height, 10 * self.subHeight)
			end
	else		else
	self._classes = string.format('st-line st-line-h%d-h%d', 10 * self.height, 10 * self.subHeight)		self._classes = string.format('st-line st-line-h%d-h%d', 10 * self.height, 10 * self.subHeight)
	end		end
	elseif self.gridEnabled then		elseif self.gridEnabled then
	self._classes = string.format('st-grid st-grid-%d st-line st-line-h%d', #self._ticks + 1, 10 * self.height)		if obj.scale.typename == scale.LogScale.__typename then
			local ticksCount = #self._ticks + 1
			self._classes = string.format('st-grid st-grid-%d st-grid-log%d st-line st-line-h%d', ticksCount, ticksCount, 10 * self.height)
			else
			self._classes = string.format('st-grid st-grid-%d st-line st-line-h%d', #self._ticks + 1, 10 * self.height)
			end
	else		else
	self._classes = string.format('st-line st-line-h%d', 10 * self.height)		self._classes = string.format('st-line st-line-h%d', 10 * self.height)

Mntone: [LineCell] スケールに使用するオブジェクトを指定可能に改善

2021-09-02T02:28:07Z

[LineCell] スケールに使用するオブジェクトを指定可能に改善

← 古い版		2021年9月2日 (木) 11:28時点における版
273行目:		273行目:
	obj.hoverEnabled = opts.hoverEnabled or false		obj.hoverEnabled = opts.hoverEnabled or false
	obj.hoverFormat = opts.hoverFormat or __passthrough		obj.hoverFormat = opts.hoverFormat or __passthrough
	obj.~~minimumValue~~ = opts.~~minimumValue~~ or 0		obj.minimumRate = opts.minimumRate or 0.95
	obj.maximumValue = opts.maximumValue or math.huge		obj.maximumValue = opts.maximumValue or math.huge
	obj.maximumRate = opts.maximumRate or 1.05		obj.maximumRate = opts.maximumRate or 1.05
	obj.preferredGridCount = opts.preferredGridCount or 4		obj.preferredGridCount = opts.preferredGridCount or 4
			obj.scale = opts.scale or scale.LinearScale.new():setClamp(true)
			if obj.scale.typename ~= scale.LinearScale.__typename then
			obj.minimumValue = opts.minimumValue or -math.huge
			else
			obj.minimumValue = opts.minimumValue or 0
			end
	obj.ticksFormat = opts.ticksFormat or __passthrough		obj.ticksFormat = opts.ticksFormat or __passthrough
	else		else
291行目:		297行目:
	obj.hoverEnabled = false		obj.hoverEnabled = false
	obj.hoverFormat = __passthrough		obj.hoverFormat = __passthrough
			obj.minimumRate = 0.95
	obj.minimumValue = 0		obj.minimumValue = 0
	obj.maximumValue = math.huge		obj.maximumValue = math.huge
	obj.maximumRate = 1.05		obj.maximumRate = 1.05
	obj.preferredGridCount = 4		obj.preferredGridCount = 4
			obj.scale = scale.LinearScale.new():setClamp(true)
	obj.ticksFormat = __passthrough		obj.ticksFormat = __passthrough
	end		end
312行目:		320行目:
	-- [Function] Reset context		-- [Function] Reset context
	function __TableUtil__LineCell:resetContext(datainfo)		function __TableUtil__LineCell:resetContext(datainfo)
	local ~~scale~~ = ~~scale~~.~~LinearScale~~.~~new():setClamp(true)~~		local startValue, stopValue
			if self.minimumValue == -math.huge then
			local minValue = datainfo[self.startIndex].minValue
			if self._hasSubGraph then
			local subMinValue = datainfo[self.subStartIndex].minValue
			if minValue < subMinValue then
			minValue = subMinValue
			end
			end
			startValue = self.minimumRate * minValue
			else
			startValue = self.minimumValue
			end
	if self.maximumValue == math.huge then		if self.maximumValue == math.huge then
	local maxValue = datainfo[self.endIndex].maxValue		local maxValue = datainfo[self.endIndex].maxValue
321行目:		341行目:
	end		end
	end		end
	~~scale:setDomain({ self.minimumValue,~~ self.maximumRate * maxValue })		stopValue = self.maximumRate * maxValue
	else		else
	~~scale:setDomain({ self.minimumValue,~~ self.maximumValue })		stopValue = self.maximumValue
	end		end
	scale:nice(self.preferredGridCount)		self.scale
	~~self._scale = scale~~		:setDomain({ startValue, stopValue })
			:nice(self.preferredGridCount)
	if self.gridEnabled then		if self.gridEnabled then
	self._ticks = scale:ticks(self.preferredGridCount)		self._ticks = self.scale:ticks(self.preferredGridCount)
	end		end

383行目:		404行目:
	:addClass('st-axis')		:addClass('st-axis')
	:addClass(string.format('st-axis-%d', #self._ticks + 1))		:addClass(string.format('st-axis-%d', #self._ticks + 1))
	local firstTickLabel = self.ticksFormat(self.~~_scale~~.domain[1])		local firstTickLabel = self.ticksFormat(self.scale.domain[1])
	list:tag('li'):wikitext(firstTickLabel)		list:tag('li'):wikitext(firstTickLabel)
	for _, tick in ipairs(self._ticks) do		for _, tick in ipairs(self._ticks) do
389行目:		410行目:
	list:tag('li'):wikitext(tickLabel)		list:tag('li'):wikitext(tickLabel)
	end		end
	local lastTickLabel = self.ticksFormat(self.~~_scale~~.domain[2])		local lastTickLabel = self.ticksFormat(self.scale.domain[2])
	list:tag('li'):wikitext(lastTickLabel)		list:tag('li'):wikitext(lastTickLabel)

427行目:		448行目:
	local minimumValue = dataset[self.startIndex]		local minimumValue = dataset[self.startIndex]
	local maximumValue = dataset[self.endIndex]		local maximumValue = dataset[self.endIndex]
	local minimumPercentage = self.~~_scale~~:scale(minimumValue)		local minimumPercentage = self.scale:scale(minimumValue)
	local maximumPercentage = self.~~_scale~~:scale(maximumValue)		local maximumPercentage = self.scale:scale(maximumValue)
	gradient = self._gradientFormat(minimumPercentage, maximumPercentage)		gradient = self._gradientFormat(minimumPercentage, maximumPercentage)

448行目:		469行目:
	end		end
	else		else
	local percentage = self.~~_scale~~:scale(value)		local percentage = self.scale:scale(value)
	gradient = self._gradientFormat(percentage)		gradient = self._gradientFormat(percentage)

466行目:		487行目:
	local minimumValue2 = dataset[self.subStartIndex]		local minimumValue2 = dataset[self.subStartIndex]
	local maximumValue2 = dataset[self.subEndIndex]		local maximumValue2 = dataset[self.subEndIndex]
	local minimumPercentage = self.~~_scale~~:scale(minimumValue2)		local minimumPercentage = self.scale:scale(minimumValue2)
	local maximumPercentage = self.~~_scale~~:scale(maximumValue2)		local maximumPercentage = self.scale:scale(maximumValue2)
	subGradient = self._subGradientFormat(minimumPercentage, maximumPercentage)		subGradient = self._subGradientFormat(minimumPercentage, maximumPercentage)

488行目:		509行目:
	else		else
	local value2 = dataset[self.subDataIndex]		local value2 = dataset[self.subDataIndex]
	local percentage = self.~~_scale~~:scale(value)		local percentage = self.scale:scale(value)
	subGradient = self._subGradientFormat(percentage)		subGradient = self._subGradientFormat(percentage)

676行目:		697行目:
	tableutil.LineCell.new('LineGradient', 1, { cellClass = 'st-graph', colorStops = { '#F8B3BC', '#F26D7D' }, height = 1.4 }),		tableutil.LineCell.new('LineGradient', 1, { cellClass = 'st-graph', colorStops = { '#F8B3BC', '#F26D7D' }, height = 1.4 }),
	tableutil.LineValueCell.new('LineValue', 2, { cellClass = 'st-graph st-textshadow' }),		tableutil.LineValueCell.new('LineValue', 2, { cellClass = 'st-graph st-textshadow' }),
	tableutil.LineCell.new('Line (Range)', 1, { cellClass = 'st-graph', startIndex = 1, endIndex = 2 }),		tableutil.LineCell.new('Line (Range)', 1, { cellClass = 'st-graph', startIndex = 1, endIndex = 2, scale = scale.LogScale.new() }),
	tableutil.LineCell.new('Line (Range & Sub)', 1, { cellClass = 'st-graph', startIndex = 1, endIndex = 2, subStartIndex = 1, subEndIndex = 3, hoverEnabled = true }),		tableutil.LineCell.new('Line (Range & Sub)', 1, { cellClass = 'st-graph', startIndex = 1, endIndex = 2, subStartIndex = 1, subEndIndex = 3, hoverEnabled = true }),
	}		}

Mntone: [LineCell] 末尾の軸の数値の表示を実装

2021-08-31T03:06:03Z

[LineCell] 末尾の軸の数値の表示を実装

← 古い版		2021年8月31日 (火) 12:06時点における版
389行目:		389行目:
	list:tag('li'):wikitext(tickLabel)		list:tag('li'):wikitext(tickLabel)
	end		end
			local lastTickLabel = self.ticksFormat(self._scale.domain[2])
			list:tag('li'):wikitext(lastTickLabel)

	if self._hasSubGraph then		if self._hasSubGraph then

Mntone: 関数renderの引数からdatainfoの削除

2021-08-30T10:59:22Z

関数renderの引数からdatainfoの削除

← 古い版		2021年8月30日 (月) 19:59時点における版
146行目:		146行目:

	-- [Function] Render		-- [Function] Render
	function __TableUtil__ValueCell:render(row, dataset, i~~, datainfo~~)		function __TableUtil__ValueCell:render(row, dataset, i)
	local value = dataset[self.dataIndex]		local value = dataset[self.dataIndex]
	local formattedValue = self.format(value)		local formattedValue = self.format(value)
	local cell = self:__cell__render(row, dataset, i~~, datainfo~~)		local cell = self:__cell__render(row, dataset, i)
	:attr('data-sort-value', value)		:attr('data-sort-value', value)
	:wikitext(formattedValue)		:wikitext(formattedValue)
415行目:		415行目:

	-- [Function] Render		-- [Function] Render
	function __TableUtil__LineCell:render(row, dataset, i~~, datainfo~~)		function __TableUtil__LineCell:render(row, dataset, i)
	local value = dataset[self.dataIndex]		local value = dataset[self.dataIndex]
	local cell = self:__cell__render(row, dataset, i~~, datainfo~~)		local cell = self:__cell__render(row, dataset, i)
	:addClass(self._classes)		:addClass(self._classes)
	:attr('data-sort-value', value)		:attr('data-sort-value', value)
540行目:		540行目:
	return setmetatable(obj, { __index = valueKlass })		return setmetatable(obj, { __index = valueKlass })
	end		end
	function valueKlass:render(row, dataset, i~~, datainfo~~)		function valueKlass:render(row, dataset, i)
	local value = dataset[self.dataIndex]		local value = dataset[self.dataIndex]
	local formattedValue = self.format(value)		local formattedValue = self.format(value)
	local cell = self:__super__render(row, dataset, i~~, datainfo~~)		local cell = self:__super__render(row, dataset, i)
	return cell:wikitext(formattedValue)		return cell:wikitext(formattedValue)
	end		end
650行目:		650行目:
	local row = tbl:tag('tr')		local row = tbl:tag('tr')
	for k, m in ipairs(metadata) do		for k, m in ipairs(metadata) do
	m:render(row, d, i~~, datainfo~~)		m:render(row, d, i)
	end		end
	end		end

Mntone: [LineCell] hover表示の実装

2021-08-30T07:59:54Z

[LineCell] hover表示の実装

差分を表示

Mntone: [RankCell] ソートのための値を生データから順位番号に変更

2021-08-30T02:50:34Z

[RankCell] ソートのための値を生データから順位番号に変更

← 古い版		2021年8月30日 (月) 11:50時点における版
195行目:		195行目:
	end		end
	local cell = row:tag('th')		local cell = row:tag('th')
	:attr('data-sort-value', ~~value~~)		:attr('data-sort-value', self.currentRank)
	:wikitext(self.currentRank)		:wikitext(self.currentRank)
	return cell		return cell

Mntone: クラスwikitableの削除

2021-08-29T03:15:32Z

クラスwikitableの削除

← 古い版		2021年8月29日 (日) 12:15時点における版
519行目:		519行目:
	:addClass('sortable')		:addClass('sortable')
	:addClass('st')		:addClass('st')
	~~:addClass('wikitable')~~
	if opts and type(opts.tableClass) == 'string' then		if opts and type(opts.tableClass) == 'string' then
	tbl:addClass(opts.tableClass)		tbl:addClass(opts.tableClass)

Mntone: [LineCell] 項目マークを出力していなかった問題の修正

2021-08-29T02:44:56Z

[LineCell] 項目マークを出力していなかった問題の修正

← 古い版		2021年8月29日 (日) 11:44時点における版
385行目:		385行目:
	local legend = footerCell:tag('ul'):addClass('st-legend')		local legend = footerCell:tag('ul'):addClass('st-legend')
	local item = legend:tag('li')		local item = legend:tag('li')
	local mark = item:tag('span'):addClass('st-legend-mark')		local mark = item:tag('span'):addClass('st-legend-mark'):wikitext('■')
	if type(self.colorStops) == 'table' then		if type(self.colorStops) == 'table' then
	mark:css('background-image', string.format('linear-gradient(to right,%s,%s)!important', self.colorStops[1], self.colorStops[2]))		mark:css('background-image', string.format('linear-gradient(to right,%s,%s)!important', self.colorStops[1], self.colorStops[2]))
394行目:		394行目:

	local subItem = legend:tag('li')		local subItem = legend:tag('li')
	local subMark = subItem:tag('span'):addClass('st-legend-mark')		local subMark = subItem:tag('span'):addClass('st-legend-mark'):wikitext('■')
	if type(self.subColorStops) == 'table' then		if type(self.subColorStops) == 'table' then
	subMark:css('background-image', string.format('linear-gradient(to right,%s,%s)!important', self.subColorStops[1], self.subColorStops[2]))		subMark:css('background-image', string.format('linear-gradient(to right,%s,%s)!important', self.subColorStops[1], self.subColorStops[2]))

Mntone: [LineCell] 項目名の表示に対応

2021-08-29T02:43:55Z

[LineCell] 項目名の表示に対応

@@ 249行目: / 249行目: @@
 	obj.dataIndex = dataIndex
 	if type(opts) == 'table' then
 		obj.startIndex         = opts.startIndex or dataIndex
 		obj.endIndex           = opts.endIndex   or dataIndex
@@ 255行目: / 256行目: @@
 		if obj._hasSubGraph then
 			obj.height         = opts.height or 1.0
 			obj.subStartIndex  = opts.subStartIndex or opts.subDataIndex
 			obj.subEndIndex    = opts.subEndIndex   or opts.subDataIndex
@@ 273行目: / 275行目: @@
 		obj.ticksFormat        = opts.ticksFormat        or __passthrough
 	else
 		obj.startIndex         = dataIndex
 		obj.endIndex           = dataIndex
@@ 377行目: / 380行目: @@
 			local tickLabel = self.ticksFormat(tick)
 			list:tag('li'):wikitext(tickLabel)
 		end
 	end