Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/visual/fineui 

# Conflicts:
#	dist/bundle.min.js
es6
windy 7 years ago
parent
73eabc5beb cb293e90cf
commit
ab50c5f000
6 changed files with 10 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dist/_fineui.min.js
  2. 4
      dist/bundle.js
  3. 4
      dist/fineui.js
  4. 2
      dist/fineui.min.js
  5. 4
      dist/widget.js
  6. 4
      src/widget/filter/operation/filter.operation.js

2
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored
Unescape View File

@ -94244,7 +94244,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
} }
}); });
}, },
props: { props: {
baseCls: "bi-filter-operation", baseCls: "bi-filter-operation",
expander: {}, expander: {},
@ -94411,7 +94411,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
iconCls2: "pull-down-font", iconCls2: "pull-down-font",
text: text, text: text,
height: 30, height: 30,
width: 100 width: 110
}); });
combos.push({ combos.push({
type: "bi.combo", type: "bi.combo",

4
dist/fineui.js vendored
Unescape View File

@ -94493,7 +94493,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
} }
}); });
}, },
props: { props: {
baseCls: "bi-filter-operation", baseCls: "bi-filter-operation",
expander: {}, expander: {},
@ -94660,7 +94660,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
iconCls2: "pull-down-font", iconCls2: "pull-down-font",
text: text, text: text,
height: 30, height: 30,
width: 100 width: 110
}); });
combos.push({ combos.push({
type: "bi.combo", type: "bi.combo",

2
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
dist/widget.js vendored
Unescape View File

@ -6590,7 +6590,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
} }
}); });
}, },
props: { props: {
baseCls: "bi-filter-operation", baseCls: "bi-filter-operation",
expander: {}, expander: {},
@ -6757,7 +6757,7 @@ BI.Filter.FILTER_TYPE.EMPTY_CONDITION = 37;
iconCls2: "pull-down-font", iconCls2: "pull-down-font",
text: text, text: text,
height: 30, height: 30,
width: 100 width: 110
}); });
combos.push({ combos.push({
type: "bi.combo", type: "bi.combo",

4
src/widget/filter/operation/filter.operation.js
Unescape View File

@ -28,7 +28,7 @@
} }
}); });
}, },
props: { props: {
baseCls: "bi-filter-operation", baseCls: "bi-filter-operation",
expander: {}, expander: {},
@ -195,7 +195,7 @@
iconCls2: "pull-down-font", iconCls2: "pull-down-font",
text: text, text: text,
height: 30, height: 30,
width: 100 width: 110
}); });
combos.push({ combos.push({
type: "bi.combo", type: "bi.combo",

Write Preview
Loading…
Cancel
Save