forked from 0x2620/oxjs
form elements rewrite, part 2
This commit is contained in:
parent
fe303bf2b0
commit
074902d079
33 changed files with 163 additions and 153 deletions
|
|
@ -32,11 +32,9 @@ Ox.Spreadsheet = function(options, self) {
|
|||
|
||||
function addColumn(index) {
|
||||
self.options.columns.splice(index, 0, '');
|
||||
Ox.print('sv', JSON.stringify(self.values))
|
||||
self.values.forEach(function(columns) {
|
||||
columns.splice(index, 0, 0);
|
||||
});
|
||||
Ox.print('sv', JSON.stringify(self.values))
|
||||
renderSpreadsheet();
|
||||
}
|
||||
|
||||
|
|
@ -52,7 +50,6 @@ Ox.Spreadsheet = function(options, self) {
|
|||
row: Ox.repeat([0], self.rows),
|
||||
sheet: 0
|
||||
};
|
||||
Ox.print('sv', self.values);
|
||||
self.values.forEach(function(columns, r) {
|
||||
columns.forEach(function(value, c) {
|
||||
sums.column[c] += value;
|
||||
|
|
@ -93,12 +90,10 @@ Ox.Spreadsheet = function(options, self) {
|
|||
|
||||
Ox.merge([self.options.title], Ox.clone(self.options.rows), ['Total']).forEach(function(row, r) {
|
||||
r--;
|
||||
Ox.print('ROW', row);
|
||||
Ox.merge([''], Ox.clone(self.options.columns), ['Total']).forEach(function(column, c) {
|
||||
c--;
|
||||
if (r == -1) {
|
||||
if (c == -1 || c == self.columns) {
|
||||
Ox.print('c', c, 'row', row)
|
||||
Ox.Label({
|
||||
style: 'square',
|
||||
textAlign: c == -1 ? 'left' : 'right',
|
||||
|
|
@ -210,9 +205,9 @@ Ox.Spreadsheet = function(options, self) {
|
|||
change: function(data) {
|
||||
self.values[r][c] = parseInt(data.value);
|
||||
self.sums = getSums();
|
||||
self.$input[c + ',' + self.rows].options({value: self.sums.column[c]});
|
||||
self.$input[self.columns + ',' + r].options({value: self.sums.row[r]});
|
||||
self.$input[self.columns + ',' + self.rows].options({value: self.sums.sheet});
|
||||
self.$input[c + ',' + self.rows].value(self.sums.column[c]);
|
||||
self.$input[self.columns + ',' + r].value(self.sums.row[r]);
|
||||
self.$input[self.columns + ',' + self.rows].value(self.sums.sheet);
|
||||
triggerChangeEvent();
|
||||
}
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue