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

Fixed merge conflict

es6
Frank.Qiu 4 years ago
parent
9def32893b 4d8fe3a665
commit
be2bed5e45
41 changed files with 240 additions and 351 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. 1
      changelog.md
  2. 4
      dist/2.0/fineui.css
  3. 4
      dist/2.0/fineui.ie.min.js
  4. 2
      dist/2.0/fineui.ie.min.js.map
  5. 76
      dist/2.0/fineui.js
  6. 2
      dist/2.0/fineui.js.map
  7. 4
      dist/2.0/fineui.min.css
  8. 4
      dist/2.0/fineui.min.js
  9. 2
      dist/2.0/fineui.min.js.map
  10. 4
      dist/2.0/fineui_without_normalize.css
  11. 4
      dist/2.0/fineui_without_normalize.min.css
  12. 4
      dist/core.css
  13. 76
      dist/core.js
  14. 2
      dist/core.js.map
  15. 4
      dist/demo.css
  16. 76
      dist/demo.js
  17. 2
      dist/demo.js.map
  18. 4
      dist/fineui.css
  19. 4
      dist/fineui.ie.min.js
  20. 2
      dist/fineui.ie.min.js.map
  21. 76
      dist/fineui.js
  22. 2
      dist/fineui.js.map
  23. 4
      dist/fineui.min.css
  24. 4
      dist/fineui.min.js
  25. 2
      dist/fineui.min.js.map
  26. 76
      dist/fineui_without_jquery_polyfill.js
  27. 2
      dist/fineui_without_jquery_polyfill.js.map
  28. 2
      dist/font.css
  29. 2
      dist/resource.css
  30. 55
      dist/utils.js
  31. 2
      dist/utils.js.map
  32. 4
      dist/utils.min.js
  33. 2
      dist/utils.min.js.map
  34. 2
      package.json
  35. 2
      src/case/editor/editor.shelter.js
  36. 2
      src/case/editor/editor.sign.js
  37. 2
      src/case/editor/editor.state.js
  38. 2
      src/case/editor/editor.state.simple.js
  39. 53
      src/core/inject.js
  40. 13
      src/core/shortcut.js
  41. 1
      src/less/core/utils/common.less

1
changelog.md
Unescape View File

@ -1,6 +1,7 @@
# 更新日志
2.0(2020-12)
- bi.editor支持传入autocomplete
- [视觉]editor水印间距统一与文本域水印不可选中
- 修复bi.file的url参数拼接问题
- 修复了colorChooser选择透明后, 打开更多选色面板, 直接点保存会选中自动的问题
- bi.file支持限制上传文件数

4
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

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

@ -1,4 +1,4 @@
/*! time: 2020-12-4 22:30:18 */
/*! time: 2020-12-7 11:50:25 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -11209,7 +11209,7 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (BI.initialized) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
@ -11227,17 +11227,29 @@ _.extend(BI, {
}
if (!configFunctions[type]) {
configFunctions[type] = [];
BI.prepares.push(function () {
var queue = configFunctions[type];
for (var i = 0; i < queue.length; i++) {
if (constantInjection[type]) {
constantInjection[type] = queue[i](constantInjection[type]);
continue;
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
if (providerInstance[type]) {
delete providerInstance[type];
}
queue[i](providers[type]);
continue;
}
BI.Plugin.configWidget(type, queue[i]);
}
configFunctions[type] = null;
});
}
configFunctions[type].push({fn: configFn, args: opt});
};
BI.Configs = BI.Configs || {
getConfigs: function () {
return configFunctions;
},
getConfig: function (type) {
return configFunctions[type];
},
configFunctions[type].push(configFn);
};
var actions = {};
@ -11294,16 +11306,7 @@ _.extend(BI, {
BI.Constants = BI.Constants || {
getConstant: function (type) {
var instance = constantInjection[type];
BI.each(configFunctions[type], function (i, cf) {
var res = cf.fn(instance);
if (res) {
instance = res;
}
});
constantInjection[type] = instance;
configFunctions[type] && (configFunctions[type] = null);
return instance;
return constantInjection[type];
}
};
@ -11392,17 +11395,9 @@ _.extend(BI, {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
var instance = providers[type];
BI.each(configFunctions[type], function (i, cf) {
if (providerInstance[type]) {
delete providerInstance[type];
}
cf.fn(instance);
});
if (!providerInstance[type]) {
providerInstance[type] = new (providers[type].$get())(config);
}
configFunctions[type] && (configFunctions[type] = null);
return providerInstance[type];
}
};
@ -14275,17 +14270,6 @@ module.exports = function (exec) {
return widget;
};
function configWidget (type) {
var configFunctions = BI.Configs.getConfig(type);
if (configFunctions) {
BI.each(configFunctions, function (i, cf) {
BI.Plugin.configWidget(type, cf.fn, cf.args);
});
var configs = BI.Configs.getConfigs();
configs[type] && (configs[type] = null);
}
}
BI.createWidget = BI.createWidget || function (item, options, context, lazy) {
// 先把准备环境准备好
BI.init();
@ -14307,7 +14291,6 @@ module.exports = function (exec) {
}
if (item.type || options.type) {
el = BI.extend({}, options, item);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -14319,7 +14302,6 @@ module.exports = function (exec) {
}
if (item.el && (item.el.type || options.type)) {
el = BI.extend({}, options, item.el);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -36768,7 +36750,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap
hgap: o.hgap + 2
});
BI.createWidget({
type: "bi.absolute",
@ -37050,7 +37032,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -37330,7 +37312,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
height: o.height,
text: o.text,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -37646,7 +37628,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
text: o.text,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();

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

File diff suppressed because one or more lines are too long

4
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

4
dist/2.0/fineui_without_normalize.css vendored
View File

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

4
dist/core.css vendored
View File

File diff suppressed because one or more lines are too long

76
dist/core.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-4 22:30:18 */
/*! time: 2020-12-7 11:50:25 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -11209,7 +11209,7 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (BI.initialized) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
@ -11227,17 +11227,29 @@ _.extend(BI, {
}
if (!configFunctions[type]) {
configFunctions[type] = [];
BI.prepares.push(function () {
var queue = configFunctions[type];
for (var i = 0; i < queue.length; i++) {
if (constantInjection[type]) {
constantInjection[type] = queue[i](constantInjection[type]);
continue;
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
if (providerInstance[type]) {
delete providerInstance[type];
}
queue[i](providers[type]);
continue;
}
BI.Plugin.configWidget(type, queue[i]);
}
configFunctions[type] = null;
});
}
configFunctions[type].push({fn: configFn, args: opt});
};
BI.Configs = BI.Configs || {
getConfigs: function () {
return configFunctions;
},
getConfig: function (type) {
return configFunctions[type];
},
configFunctions[type].push(configFn);
};
var actions = {};
@ -11294,16 +11306,7 @@ _.extend(BI, {
BI.Constants = BI.Constants || {
getConstant: function (type) {
var instance = constantInjection[type];
BI.each(configFunctions[type], function (i, cf) {
var res = cf.fn(instance);
if (res) {
instance = res;
}
});
constantInjection[type] = instance;
configFunctions[type] && (configFunctions[type] = null);
return instance;
return constantInjection[type];
}
};
@ -11392,17 +11395,9 @@ _.extend(BI, {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
var instance = providers[type];
BI.each(configFunctions[type], function (i, cf) {
if (providerInstance[type]) {
delete providerInstance[type];
}
cf.fn(instance);
});
if (!providerInstance[type]) {
providerInstance[type] = new (providers[type].$get())(config);
}
configFunctions[type] && (configFunctions[type] = null);
return providerInstance[type];
}
};
@ -14275,17 +14270,6 @@ module.exports = function (exec) {
return widget;
};
function configWidget (type) {
var configFunctions = BI.Configs.getConfig(type);
if (configFunctions) {
BI.each(configFunctions, function (i, cf) {
BI.Plugin.configWidget(type, cf.fn, cf.args);
});
var configs = BI.Configs.getConfigs();
configs[type] && (configs[type] = null);
}
}
BI.createWidget = BI.createWidget || function (item, options, context, lazy) {
// 先把准备环境准备好
BI.init();
@ -14307,7 +14291,6 @@ module.exports = function (exec) {
}
if (item.type || options.type) {
el = BI.extend({}, options, item);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -14319,7 +14302,6 @@ module.exports = function (exec) {
}
if (item.el && (item.el.type || options.type)) {
el = BI.extend({}, options, item.el);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -36768,7 +36750,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap
hgap: o.hgap + 2
});
BI.createWidget({
type: "bi.absolute",
@ -37050,7 +37032,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -37330,7 +37312,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
height: o.height,
text: o.text,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -37646,7 +37628,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
text: o.text,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();

2
dist/core.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/demo.css vendored
View File

File diff suppressed because one or more lines are too long

76
dist/demo.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-4 22:30:18 */
/*! time: 2020-12-7 11:50:25 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -11209,7 +11209,7 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (BI.initialized) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
@ -11227,17 +11227,29 @@ _.extend(BI, {
}
if (!configFunctions[type]) {
configFunctions[type] = [];
BI.prepares.push(function () {
var queue = configFunctions[type];
for (var i = 0; i < queue.length; i++) {
if (constantInjection[type]) {
constantInjection[type] = queue[i](constantInjection[type]);
continue;
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
if (providerInstance[type]) {
delete providerInstance[type];
}
queue[i](providers[type]);
continue;
}
BI.Plugin.configWidget(type, queue[i]);
}
configFunctions[type] = null;
});
}
configFunctions[type].push({fn: configFn, args: opt});
};
BI.Configs = BI.Configs || {
getConfigs: function () {
return configFunctions;
},
getConfig: function (type) {
return configFunctions[type];
},
configFunctions[type].push(configFn);
};
var actions = {};
@ -11294,16 +11306,7 @@ _.extend(BI, {
BI.Constants = BI.Constants || {
getConstant: function (type) {
var instance = constantInjection[type];
BI.each(configFunctions[type], function (i, cf) {
var res = cf.fn(instance);
if (res) {
instance = res;
}
});
constantInjection[type] = instance;
configFunctions[type] && (configFunctions[type] = null);
return instance;
return constantInjection[type];
}
};
@ -11392,17 +11395,9 @@ _.extend(BI, {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
var instance = providers[type];
BI.each(configFunctions[type], function (i, cf) {
if (providerInstance[type]) {
delete providerInstance[type];
}
cf.fn(instance);
});
if (!providerInstance[type]) {
providerInstance[type] = new (providers[type].$get())(config);
}
configFunctions[type] && (configFunctions[type] = null);
return providerInstance[type];
}
};
@ -14275,17 +14270,6 @@ module.exports = function (exec) {
return widget;
};
function configWidget (type) {
var configFunctions = BI.Configs.getConfig(type);
if (configFunctions) {
BI.each(configFunctions, function (i, cf) {
BI.Plugin.configWidget(type, cf.fn, cf.args);
});
var configs = BI.Configs.getConfigs();
configs[type] && (configs[type] = null);
}
}
BI.createWidget = BI.createWidget || function (item, options, context, lazy) {
// 先把准备环境准备好
BI.init();
@ -14307,7 +14291,6 @@ module.exports = function (exec) {
}
if (item.type || options.type) {
el = BI.extend({}, options, item);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -14319,7 +14302,6 @@ module.exports = function (exec) {
}
if (item.el && (item.el.type || options.type)) {
el = BI.extend({}, options, item.el);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -36768,7 +36750,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap
hgap: o.hgap + 2
});
BI.createWidget({
type: "bi.absolute",
@ -37050,7 +37032,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -37330,7 +37312,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
height: o.height,
text: o.text,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -37646,7 +37628,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
text: o.text,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();

2
dist/demo.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
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

76
dist/fineui.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-4 22:30:18 */
/*! time: 2020-12-7 11:50:25 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -11209,7 +11209,7 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (BI.initialized) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
@ -11227,17 +11227,29 @@ _.extend(BI, {
}
if (!configFunctions[type]) {
configFunctions[type] = [];
BI.prepares.push(function () {
var queue = configFunctions[type];
for (var i = 0; i < queue.length; i++) {
if (constantInjection[type]) {
constantInjection[type] = queue[i](constantInjection[type]);
continue;
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
if (providerInstance[type]) {
delete providerInstance[type];
}
queue[i](providers[type]);
continue;
}
BI.Plugin.configWidget(type, queue[i]);
}
configFunctions[type] = null;
});
}
configFunctions[type].push({fn: configFn, args: opt});
};
BI.Configs = BI.Configs || {
getConfigs: function () {
return configFunctions;
},
getConfig: function (type) {
return configFunctions[type];
},
configFunctions[type].push(configFn);
};
var actions = {};
@ -11294,16 +11306,7 @@ _.extend(BI, {
BI.Constants = BI.Constants || {
getConstant: function (type) {
var instance = constantInjection[type];
BI.each(configFunctions[type], function (i, cf) {
var res = cf.fn(instance);
if (res) {
instance = res;
}
});
constantInjection[type] = instance;
configFunctions[type] && (configFunctions[type] = null);
return instance;
return constantInjection[type];
}
};
@ -11392,17 +11395,9 @@ _.extend(BI, {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
var instance = providers[type];
BI.each(configFunctions[type], function (i, cf) {
if (providerInstance[type]) {
delete providerInstance[type];
}
cf.fn(instance);
});
if (!providerInstance[type]) {
providerInstance[type] = new (providers[type].$get())(config);
}
configFunctions[type] && (configFunctions[type] = null);
return providerInstance[type];
}
};
@ -14275,17 +14270,6 @@ module.exports = function (exec) {
return widget;
};
function configWidget (type) {
var configFunctions = BI.Configs.getConfig(type);
if (configFunctions) {
BI.each(configFunctions, function (i, cf) {
BI.Plugin.configWidget(type, cf.fn, cf.args);
});
var configs = BI.Configs.getConfigs();
configs[type] && (configs[type] = null);
}
}
BI.createWidget = BI.createWidget || function (item, options, context, lazy) {
// 先把准备环境准备好
BI.init();
@ -14307,7 +14291,6 @@ module.exports = function (exec) {
}
if (item.type || options.type) {
el = BI.extend({}, options, item);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -14319,7 +14302,6 @@ module.exports = function (exec) {
}
if (item.el && (item.el.type || options.type)) {
el = BI.extend({}, options, item.el);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -36768,7 +36750,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap
hgap: o.hgap + 2
});
BI.createWidget({
type: "bi.absolute",
@ -37050,7 +37032,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -37330,7 +37312,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
height: o.height,
text: o.text,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -37646,7 +37628,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
text: o.text,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();

2
dist/fineui.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
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

76
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-4 22:30:18 */
/*! time: 2020-12-7 11:50:25 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -8670,7 +8670,7 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (BI.initialized) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
@ -8688,17 +8688,29 @@ _.extend(BI, {
}
if (!configFunctions[type]) {
configFunctions[type] = [];
BI.prepares.push(function () {
var queue = configFunctions[type];
for (var i = 0; i < queue.length; i++) {
if (constantInjection[type]) {
constantInjection[type] = queue[i](constantInjection[type]);
continue;
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
if (providerInstance[type]) {
delete providerInstance[type];
}
queue[i](providers[type]);
continue;
}
BI.Plugin.configWidget(type, queue[i]);
}
configFunctions[type] = null;
});
}
configFunctions[type].push({fn: configFn, args: opt});
};
BI.Configs = BI.Configs || {
getConfigs: function () {
return configFunctions;
},
getConfig: function (type) {
return configFunctions[type];
},
configFunctions[type].push(configFn);
};
var actions = {};
@ -8755,16 +8767,7 @@ _.extend(BI, {
BI.Constants = BI.Constants || {
getConstant: function (type) {
var instance = constantInjection[type];
BI.each(configFunctions[type], function (i, cf) {
var res = cf.fn(instance);
if (res) {
instance = res;
}
});
constantInjection[type] = instance;
configFunctions[type] && (configFunctions[type] = null);
return instance;
return constantInjection[type];
}
};
@ -8853,17 +8856,9 @@ _.extend(BI, {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
var instance = providers[type];
BI.each(configFunctions[type], function (i, cf) {
if (providerInstance[type]) {
delete providerInstance[type];
}
cf.fn(instance);
});
if (!providerInstance[type]) {
providerInstance[type] = new (providers[type].$get())(config);
}
configFunctions[type] && (configFunctions[type] = null);
return providerInstance[type];
}
};
@ -10302,17 +10297,6 @@ BI.Req = {
return widget;
};
function configWidget (type) {
var configFunctions = BI.Configs.getConfig(type);
if (configFunctions) {
BI.each(configFunctions, function (i, cf) {
BI.Plugin.configWidget(type, cf.fn, cf.args);
});
var configs = BI.Configs.getConfigs();
configs[type] && (configs[type] = null);
}
}
BI.createWidget = BI.createWidget || function (item, options, context, lazy) {
// 先把准备环境准备好
BI.init();
@ -10334,7 +10318,6 @@ BI.Req = {
}
if (item.type || options.type) {
el = BI.extend({}, options, item);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -10346,7 +10329,6 @@ BI.Req = {
}
if (item.el && (item.el.type || options.type)) {
el = BI.extend({}, options, item.el);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -32795,7 +32777,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap
hgap: o.hgap + 2
});
BI.createWidget({
type: "bi.absolute",
@ -33077,7 +33059,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -33357,7 +33339,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
height: o.height,
text: o.text,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();
@ -33673,7 +33655,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
text: o.text,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();

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

55
dist/utils.js vendored
Unescape View File

@ -1,4 +1,4 @@
/*! time: 2020-12-4 22:30:18 */
/*! time: 2020-12-7 11:50:25 */
/******/ (function(modules) { // webpackBootstrap
/******/ // The module cache
/******/ var installedModules = {};
@ -8403,7 +8403,7 @@ _.extend(BI, {
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (BI.initialized) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
@ -8421,17 +8421,29 @@ _.extend(BI, {
}
if (!configFunctions[type]) {
configFunctions[type] = [];
BI.prepares.push(function () {
var queue = configFunctions[type];
for (var i = 0; i < queue.length; i++) {
if (constantInjection[type]) {
constantInjection[type] = queue[i](constantInjection[type]);
continue;
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
if (providerInstance[type]) {
delete providerInstance[type];
}
queue[i](providers[type]);
continue;
}
BI.Plugin.configWidget(type, queue[i]);
}
configFunctions[type] = null;
});
}
configFunctions[type].push({fn: configFn, args: opt});
};
BI.Configs = BI.Configs || {
getConfigs: function () {
return configFunctions;
},
getConfig: function (type) {
return configFunctions[type];
},
configFunctions[type].push(configFn);
};
var actions = {};
@ -8488,16 +8500,7 @@ _.extend(BI, {
BI.Constants = BI.Constants || {
getConstant: function (type) {
var instance = constantInjection[type];
BI.each(configFunctions[type], function (i, cf) {
var res = cf.fn(instance);
if (res) {
instance = res;
}
});
constantInjection[type] = instance;
configFunctions[type] && (configFunctions[type] = null);
return instance;
return constantInjection[type];
}
};
@ -8586,17 +8589,9 @@ _.extend(BI, {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
var instance = providers[type];
BI.each(configFunctions[type], function (i, cf) {
if (providerInstance[type]) {
delete providerInstance[type];
}
cf.fn(instance);
});
if (!providerInstance[type]) {
providerInstance[type] = new (providers[type].$get())(config);
}
configFunctions[type] && (configFunctions[type] = null);
return providerInstance[type];
}
};

2
dist/utils.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/utils.min.js.map 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.20201204223215",
"version": "2.0.20201207115208",
"description": "fineui",
"main": "dist/fineui.min.js",
"types": "dist/lib/index.d.ts",

2
src/case/editor/editor.shelter.js
Unescape View File

@ -52,7 +52,7 @@ BI.ShelterEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap
hgap: o.hgap + 2
});
BI.createWidget({
type: "bi.absolute",

2
src/case/editor/editor.sign.js
Unescape View File

@ -52,7 +52,7 @@ BI.SignEditor = BI.inherit(BI.Widget, {
tipType: o.tipType,
textAlign: o.textAlign,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();

2
src/case/editor/editor.state.js
Unescape View File

@ -51,7 +51,7 @@ BI.StateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
height: o.height,
text: o.text,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();

2
src/case/editor/editor.state.simple.js
Unescape View File

@ -51,7 +51,7 @@ BI.SimpleStateEditor = BI.inherit(BI.Widget, {
textAlign: "left",
text: o.text,
height: o.height,
hgap: o.hgap,
hgap: o.hgap + 2,
handler: function () {
self._showInput();
self.editor.focus();

53
src/core/inject.js
Unescape View File

@ -49,7 +49,7 @@
var configFunctions = {};
BI.config = BI.config || function (type, configFn, opt) {
if (opt && opt.immediate) {
if (BI.initialized) {
if (constantInjection[type]) {
return (constantInjection[type] = configFn(constantInjection[type]));
}
@ -67,17 +67,29 @@
}
if (!configFunctions[type]) {
configFunctions[type] = [];
BI.prepares.push(function () {
var queue = configFunctions[type];
for (var i = 0; i < queue.length; i++) {
if (constantInjection[type]) {
constantInjection[type] = queue[i](constantInjection[type]);
continue;
}
if (providerInjection[type]) {
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
if (providerInstance[type]) {
delete providerInstance[type];
}
queue[i](providers[type]);
continue;
}
BI.Plugin.configWidget(type, queue[i]);
}
configFunctions[type] = null;
});
}
configFunctions[type].push({fn: configFn, args: opt});
};
BI.Configs = BI.Configs || {
getConfigs: function () {
return configFunctions;
},
getConfig: function (type) {
return configFunctions[type];
},
configFunctions[type].push(configFn);
};
var actions = {};
@ -134,16 +146,7 @@
BI.Constants = BI.Constants || {
getConstant: function (type) {
var instance = constantInjection[type];
BI.each(configFunctions[type], function (i, cf) {
var res = cf.fn(instance);
if (res) {
instance = res;
}
});
constantInjection[type] = instance;
configFunctions[type] && (configFunctions[type] = null);
return instance;
return constantInjection[type];
}
};
@ -232,17 +235,9 @@
if (!providers[type]) {
providers[type] = new providerInjection[type]();
}
var instance = providers[type];
BI.each(configFunctions[type], function (i, cf) {
if (providerInstance[type]) {
delete providerInstance[type];
}
cf.fn(instance);
});
if (!providerInstance[type]) {
providerInstance[type] = new (providers[type].$get())(config);
}
configFunctions[type] && (configFunctions[type] = null);
return providerInstance[type];
}
};

13
src/core/shortcut.js
Unescape View File

@ -32,17 +32,6 @@
return widget;
};
function configWidget (type) {
var configFunctions = BI.Configs.getConfig(type);
if (configFunctions) {
BI.each(configFunctions, function (i, cf) {
BI.Plugin.configWidget(type, cf.fn, cf.args);
});
var configs = BI.Configs.getConfigs();
configs[type] && (configs[type] = null);
}
}
BI.createWidget = BI.createWidget || function (item, options, context, lazy) {
// 先把准备环境准备好
BI.init();
@ -64,7 +53,6 @@
}
if (item.type || options.type) {
el = BI.extend({}, options, item);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,
@ -76,7 +64,6 @@
}
if (item.el && (item.el.type || options.type)) {
el = BI.extend({}, options, item.el);
configWidget(el.type);
w = BI.Plugin.getWidget(el.type, el);
w.listeners = (w.listeners || []).concat([{
eventName: BI.Events.MOUNT,

1
src/less/core/utils/common.less
Unescape View File

@ -427,6 +427,7 @@ textarea {
.bi-water-mark {
color: @font-color-tips;
cursor: text;
.user-select-disable();
& .bi-input {
color: @font-color-tips;
}

Write Preview
Loading…
Cancel
Save