fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merging in latest from upstream (VISUAL/fineui:refs/heads/master) 

* commit '5b301b91eab3122c88d9ee91852813ade32288ac':
  auto upgrade version to 2.0.20210822213148
  整理代码
  auto upgrade version to 2.0.20210822204116
  整理代码
  整理代码
  auto upgrade version to 2.0.20210822203416
  无JIRA任务 补充下simple_color_chooser的布局调整
es6
Guyi 3 years ago
parent
b08db5b611 5b301b91ea
commit
3111820118
43 changed files with 566 additions and 482 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      demo/app.js
  2. 14
      demo/js/center.js
  3. 9
      demo/js/main.store.js
  4. 2
      dist/2.0/fineui.css
  5. 4
      dist/2.0/fineui.ie.min.js
  6. 2
      dist/2.0/fineui.ie.min.js.map
  7. 8
      dist/2.0/fineui.js
  8. 2
      dist/2.0/fineui.js.map
  9. 2
      dist/2.0/fineui.min.css
  10. 4
      dist/2.0/fineui.min.js
  11. 2
      dist/2.0/fineui.min.js.map
  12. 2
      dist/2.0/fineui_without_normalize.css
  13. 2
      dist/2.0/fineui_without_normalize.min.css
  14. 2
      dist/core.css
  15. 8
      dist/core.js
  16. 2
      dist/core.js.map
  17. 2
      dist/demo.css
  18. 71
      dist/demo.js
  19. 2
      dist/demo.js.map
  20. 2
      dist/fineui.css
  21. 4
      dist/fineui.ie.min.js
  22. 2
      dist/fineui.ie.min.js.map
  23. 8
      dist/fineui.js
  24. 2
      dist/fineui.js.map
  25. 2
      dist/fineui.min.css
  26. 4
      dist/fineui.min.js
  27. 2
      dist/fineui.min.js.map
  28. 2
      dist/fineui.proxy.css
  29. 8
      dist/fineui.proxy.js
  30. 2
      dist/fineui.proxy.js.map
  31. 2
      dist/fineui.proxy.min.css
  32. 4
      dist/fineui.proxy.min.js
  33. 2
      dist/fineui.proxy.min.js.map
  34. 8
      dist/fineui_without_jquery_polyfill.js
  35. 2
      dist/fineui_without_jquery_polyfill.js.map
  36. 2
      dist/font.css
  37. 2
      dist/resource.css
  38. 6
      dist/router.js
  39. 2
      dist/utils.js
  40. 2
      dist/utils.min.js
  41. 2
      package.json
  42. 2
      src/case/colorchooser/colorchooser.js
  43. 4
      src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js

38
demo/app.js
Unescape View File

@ -10,26 +10,34 @@ BI.$(function () {
var tree = BI.Tree.transformToTreeFormat(Demo.CONFIG);
var routes = [{
path: '/',
component: function(){
path: "/",
component: function () {
return Promise.resolve({
type: "demo.face"
})
});
}
}];
BI.Tree.traversal(tree, function (index, node) {
if (!node.children || BI.isEmptyArray(node.children)) {
routes.push({
path: '/' + node.text,
component: function(){
}, {
name: "component",
path: "/component/:componentId",
component: function () {
return Promise.resolve({
type: node.value
})
}
type: "demo.router"
});
}
});
}];
// BI.Tree.traversal(tree, function (index, node) {
// if (!node.children || BI.isEmptyArray(node.children)) {
// routes.push({
// path: "/",
// component: function () {
// return Promise.resolve({
// type: node.value
// });
// }
// });
// }
// });
// var AppRouter = BI.inherit(BI.Router, obj);
// new AppRouter;
@ -49,7 +57,7 @@ BI.$(function () {
console.log(_ref);
ref = _ref;
}
}
};
}
});
});

14
demo/js/center.js
Unescape View File

@ -10,3 +10,17 @@ Demo.Center = BI.inherit(BI.Widget, {
}
});
BI.shortcut("demo.center", Demo.Center);
Demo.Router = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-router"
},
render: function () {
var self = this;
var params = BI.Router.$router.history.current.params;
return {
type: params.componentId
}
}
});
BI.shortcut("demo.router", Demo.Router);

9
demo/js/main.store.js
Unescape View File

@ -44,13 +44,18 @@
handleTreeSelectChange: function (v) {
var matched = BI.some(Demo.CONFIG, function (index, item) {
if (item.value === v) {
BI.router.push(item.text);
BI.Router.$router.push({
name: "component",
params: {
componentId: item.value
}
});
// BI.history.navigate(item.text, {trigger: true});
return true;
}
});
if (!matched) {
BI.router.push("/");
BI.Router.$router.push("/");
// BI.history.navigate("", {trigger: true});
}
}

2
dist/2.0/fineui.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.ie.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/2.0/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-8-21 9:00:30 */
/*! time: 2021-8-22 21:30:32 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -37542,7 +37542,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
},
setValue: function (color) {
this.combo.setValue(color || "");
this.combo.setValue((color || "").toLowerCase());
},
getValue: function () {
@ -39295,8 +39295,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
type: "bi.vertical",
tgap: 10,
items: [{
el: {
type: "bi.vertical_adapt",
rgap: 5,
columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
items: [{
el: {
type: "bi.layout",
@ -39353,8 +39355,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
self.B = _ref
}
}),
rgap: -5,
width: c.RGB_WIDTH
}]
}
}]
}

2
dist/2.0/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/2.0/fineui_without_normalize.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/core.css vendored
View File

File diff suppressed because one or more lines are too long

8
dist/core.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-8-21 9:00:30 */
/*! time: 2021-8-22 21:30:32 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -37542,7 +37542,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
},
setValue: function (color) {
this.combo.setValue(color || "");
this.combo.setValue((color || "").toLowerCase());
},
getValue: function () {
@ -39295,8 +39295,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
type: "bi.vertical",
tgap: 10,
items: [{
el: {
type: "bi.vertical_adapt",
rgap: 5,
columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
items: [{
el: {
type: "bi.layout",
@ -39353,8 +39355,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
self.B = _ref
}
}),
rgap: -5,
width: c.RGB_WIDTH
}]
}
}]
}

2
dist/core.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/demo.css vendored
View File

File diff suppressed because one or more lines are too long

71
dist/demo.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-8-21 9:00:30 */
/*! time: 2021-8-22 21:30:32 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -37542,7 +37542,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
},
setValue: function (color) {
this.combo.setValue(color || "");
this.combo.setValue((color || "").toLowerCase());
},
getValue: function () {
@ -39295,8 +39295,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
type: "bi.vertical",
tgap: 10,
items: [{
el: {
type: "bi.vertical_adapt",
rgap: 5,
columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
items: [{
el: {
type: "bi.layout",
@ -39353,8 +39355,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
self.B = _ref
}
}),
rgap: -5,
width: c.RGB_WIDTH
}]
}
}]
}
@ -109811,26 +109815,34 @@ BI.$(function () {
var tree = BI.Tree.transformToTreeFormat(Demo.CONFIG);
var routes = [{
path: '/',
component: function(){
path: "/",
component: function () {
return Promise.resolve({
type: "demo.face"
})
});
}
}];
BI.Tree.traversal(tree, function (index, node) {
if (!node.children || BI.isEmptyArray(node.children)) {
routes.push({
path: '/' + node.text,
component: function(){
}, {
name: "component",
path: "/component/:componentId",
component: function () {
return Promise.resolve({
type: node.value
})
}
type: "demo.router"
});
}
});
}];
// BI.Tree.traversal(tree, function (index, node) {
// if (!node.children || BI.isEmptyArray(node.children)) {
// routes.push({
// path: "/",
// component: function () {
// return Promise.resolve({
// type: node.value
// });
// }
// });
// }
// });
// var AppRouter = BI.inherit(BI.Router, obj);
// new AppRouter;
@ -109850,7 +109862,7 @@ BI.$(function () {
console.log(_ref);
ref = _ref;
}
}
};
}
});
});
@ -113465,6 +113477,21 @@ Demo.Center = BI.inherit(BI.Widget, {
});
BI.shortcut("demo.center", Demo.Center);
Demo.Router = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-router"
},
render: function () {
var self = this;
var params = BI.Router.$router.history.current.params;
return {
type: params.componentId
}
}
});
BI.shortcut("demo.router", Demo.Router);
/***/ }),
/* 1350 */
/***/ (function(module, exports) {
@ -119610,13 +119637,18 @@ BI.shortcut("demo.main", Demo.Main);
handleTreeSelectChange: function (v) {
var matched = BI.some(Demo.CONFIG, function (index, item) {
if (item.value === v) {
BI.router.push(item.text);
BI.Router.$router.push({
name: "component",
params: {
componentId: item.value
}
});
// BI.history.navigate(item.text, {trigger: true});
return true;
}
});
if (!matched) {
BI.router.push("/");
BI.Router.$router.push("/");
// BI.history.navigate("", {trigger: true});
}
}
@ -119625,6 +119657,7 @@ BI.shortcut("demo.main", Demo.Main);
BI.store("demo.store.main", Store);
})();
/***/ }),
/* 1415 */
/***/ (function(module, exports) {

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.ie.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-8-21 9:00:30 */
/*! time: 2021-8-22 21:30:32 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -37542,7 +37542,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
},
setValue: function (color) {
this.combo.setValue(color || "");
this.combo.setValue((color || "").toLowerCase());
},
getValue: function () {
@ -39295,8 +39295,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
type: "bi.vertical",
tgap: 10,
items: [{
el: {
type: "bi.vertical_adapt",
rgap: 5,
columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
items: [{
el: {
type: "bi.layout",
@ -39353,8 +39355,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
self.B = _ref
}
}),
rgap: -5,
width: c.RGB_WIDTH
}]
}
}]
}

2
dist/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.css vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui.proxy.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-8-21 9:00:30 */
/*! time: 2021-8-22 21:30:32 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -35003,7 +35003,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
},
setValue: function (color) {
this.combo.setValue(color || "");
this.combo.setValue((color || "").toLowerCase());
},
getValue: function () {
@ -36756,8 +36756,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
type: "bi.vertical",
tgap: 10,
items: [{
el: {
type: "bi.vertical_adapt",
rgap: 5,
columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
items: [{
el: {
type: "bi.layout",
@ -36814,8 +36816,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
self.B = _ref
}
}),
rgap: -5,
width: c.RGB_WIDTH
}]
}
}]
}

2
dist/fineui.proxy.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/fineui.proxy.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/fineui.proxy.min.js.map vendored
View File

File diff suppressed because one or more lines are too long

8
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-8-21 9:00:30 */
/*! time: 2021-8-22 21:30:32 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -34618,7 +34618,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
},
setValue: function (color) {
this.combo.setValue(color || "");
this.combo.setValue((color || "").toLowerCase());
},
getValue: function () {
@ -36371,8 +36371,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
type: "bi.vertical",
tgap: 10,
items: [{
el: {
type: "bi.vertical_adapt",
rgap: 5,
columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
items: [{
el: {
type: "bi.layout",
@ -36429,8 +36431,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
self.B = _ref
}
}),
rgap: -5,
width: c.RGB_WIDTH
}]
}
}]
}

2
dist/fineui_without_jquery_polyfill.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/font.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/resource.css vendored
View File

File diff suppressed because one or more lines are too long

6
dist/router.js vendored
Unescape View File

@ -3125,7 +3125,7 @@
var $router, cbs = [];
var RouterWidget = BI.inherit(BI.Widget, {
init: function () {
this.$router = BI.Router.$router = $router = new VueRouter({
this.$router = this._router = BI.Router.$router = $router = new VueRouter({
routes: this.options.routes
});
this.$router.afterEach(function () {
@ -3143,7 +3143,7 @@
created: function () {
var self = this, o = this.options;
cbs.push(this._callbackListener = function () {
self.tab.setSelect($router.history.current.matched[o.deps].path || "/");
self.tab.setSelect($router.history.current.fullPath || "/");
});
},
render: function () {
@ -3169,7 +3169,7 @@
});
BI.shortcut("bi.router_view", RouterView);
BI.Router = VueRouter;
BI.Router = BI.Router || VueRouter;
BI.Router.isSameRoute = isSameRoute;
return VueRouter;

2
dist/utils.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2021-8-21 9:00:30 */
/*! time: 2021-8-22 21:30:32 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
package.json
Unescape View File

@ -1,6 +1,6 @@
{
"name": "fineui",
"version": "2.0.20210821090116",
"version": "2.0.20210822213148",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

2
src/case/colorchooser/colorchooser.js
Unescape View File

@ -91,7 +91,7 @@ BI.ColorChooser = BI.inherit(BI.Widget, {
},
setValue: function (color) {
this.combo.setValue(color || "");
this.combo.setValue((color || "").toLowerCase());
},
getValue: function () {

4
src/case/colorchooser/colorpicker/editor.colorpicker.hex.simple.js
Unescape View File

@ -55,8 +55,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
type: "bi.vertical",
tgap: 10,
items: [{
el: {
type: "bi.vertical_adapt",
rgap: 5,
columnSize: [16, 10, 'fill', 12, c.RGB_WIDTH, 12, c.RGB_WIDTH, 12, c.RGB_WIDTH],
items: [{
el: {
type: "bi.layout",
@ -113,8 +115,10 @@ BI.SimpleHexColorPickerEditor = BI.inherit(BI.Widget, {
self.B = _ref
}
}),
rgap: -5,
width: c.RGB_WIDTH
}]
}
}]
}

Write Preview
Loading…
Cancel
Save