diff --git a/packages/fineui/dist/font/iconfont.eot b/packages/fineui/dist/font/iconfont.eot
index 70e4d934a..dbf3ee194 100644
Binary files a/packages/fineui/dist/font/iconfont.eot and b/packages/fineui/dist/font/iconfont.eot differ
diff --git a/packages/fineui/dist/font/iconfont.svg b/packages/fineui/dist/font/iconfont.svg
index 4d2393e54..d9079616e 100644
--- a/packages/fineui/dist/font/iconfont.svg
+++ b/packages/fineui/dist/font/iconfont.svg
@@ -14,6 +14,22 @@
/>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -62,7 +78,7 @@
-
+
@@ -1118,19 +1134,19 @@
-
+
-
+
-
+
-
+
-
+
@@ -1326,11 +1342,11 @@
-
+
-
+
@@ -1342,11 +1358,11 @@
-
+
-
+
@@ -1372,93 +1388,93 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1470,139 +1486,139 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -1614,43 +1630,43 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/packages/fineui/dist/font/iconfont.ttf b/packages/fineui/dist/font/iconfont.ttf
index 2b7abb202..fb470c14f 100644
Binary files a/packages/fineui/dist/font/iconfont.ttf and b/packages/fineui/dist/font/iconfont.ttf differ
diff --git a/packages/fineui/dist/font/iconfont.woff b/packages/fineui/dist/font/iconfont.woff
index dbd285e14..a1e24fea3 100644
Binary files a/packages/fineui/dist/font/iconfont.woff and b/packages/fineui/dist/font/iconfont.woff differ
diff --git a/packages/fineui/dist/font/iconfont.woff2 b/packages/fineui/dist/font/iconfont.woff2
index 75d399f9f..1f1db4174 100644
Binary files a/packages/fineui/dist/font/iconfont.woff2 and b/packages/fineui/dist/font/iconfont.woff2 differ
diff --git a/packages/fineui/package.json b/packages/fineui/package.json
index f467aa097..509cc8077 100644
--- a/packages/fineui/package.json
+++ b/packages/fineui/package.json
@@ -57,7 +57,7 @@
"jquery": "3.6.3"
},
"devDependencies": {
- "core-js": "^3.30.2",
+ "core-js": "^3.37.1",
"cross-env": "^7.0.3"
}
}
\ No newline at end of file
diff --git a/packages/fineui/src/core/5.inject.js b/packages/fineui/src/core/5.inject.js
index 901512a03..6f8182ee2 100644
--- a/packages/fineui/src/core/5.inject.js
+++ b/packages/fineui/src/core/5.inject.js
@@ -62,7 +62,7 @@ const constantInjection = {};
export function constant(xtype, cls) {
if (isNotNull(constantInjection[xtype])) {
- _global.console && console.error(`constant: [${xtype}]already registered`);
+ _global.console && console.warn(`constant: [${xtype}]already registered`);
} else {
constantInjection[xtype] = cls;
}
diff --git a/packages/fineui/src/core/constant/writable.var.js b/packages/fineui/src/core/constant/writable.var.js
index d8a503c29..16fb88042 100644
--- a/packages/fineui/src/core/constant/writable.var.js
+++ b/packages/fineui/src/core/constant/writable.var.js
@@ -138,4 +138,13 @@ addDescriptor("DOM", {
addDescriptor("nextTick", {
get: () => nextTick,
set: setNextTick,
-});
\ No newline at end of file
+});
+
+export let PasteLimit = 2000;
+export const setPasteLimit = v => {
+ PasteLimit = v;
+};
+addDescriptor("PasteLimit", {
+ get: () => PasteLimit,
+ set: setPasteLimit,
+});
diff --git a/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js b/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js
index 25ebc9feb..61e9f125a 100644
--- a/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js
+++ b/packages/fineui/src/widget/multiselect/multiselect.insert.combo.js
@@ -33,6 +33,7 @@ import {
SIZE_CONSANTS,
BlankSplitChar,
size,
+ PasteLimit,
} from "@/core";
import { Single, Combo, Msg } from "@/base";
import { MultiSelectBar, TriggerIconButton } from "@/case";
@@ -146,8 +147,8 @@ export class MultiSelectInsertCombo extends Single {
}
self._dataChange = true;
});
- this.getSearcher().getKeywordsLength() > 2000 &&
- Msg.alert(i18nText("BI-Basic_Prompt"), i18nText("BI-Basic_Too_Much_Value_Get_Two_Thousand"));
+ this.getSearcher().getKeywordsLength() > PasteLimit &&
+ Msg.alert(i18nText("BI-Basic_Prompt"), i18nText("BI-Basic_Paste_Too_Much_Value", PasteLimit));
}
self.fireEvent(MultiSelectInsertCombo.EVENT_SEARCHING);
});
diff --git a/packages/fineui/src/widget/multiselect/multiselect.insert.combo.nobar.js b/packages/fineui/src/widget/multiselect/multiselect.insert.combo.nobar.js
index 03300f29c..3c782b9e9 100644
--- a/packages/fineui/src/widget/multiselect/multiselect.insert.combo.nobar.js
+++ b/packages/fineui/src/widget/multiselect/multiselect.insert.combo.nobar.js
@@ -29,7 +29,8 @@ import {
pushDistinct,
Selection,
BlankSplitChar,
- SIZE_CONSANTS
+ SIZE_CONSANTS,
+ PasteLimit,
} from "@/core";
import { Single, Combo, Msg } from "@/base";
import { MultiSelectInsertTrigger } from "./multiselect.insert.trigger";
@@ -134,8 +135,8 @@ export class MultiSelectInsertNoBarCombo extends Single {
}
self._dataChange = true;
});
- this.getSearcher().getKeywordsLength() > 2000 &&
- Msg.alert(i18nText("BI-Basic_Prompt"), i18nText("BI-Basic_Too_Much_Value_Get_Two_Thousand"));
+ this.getSearcher().getKeywordsLength() > PasteLimit &&
+ Msg.alert(i18nText("BI-Basic_Prompt"), i18nText("BI-Basic_Paste_Too_Much_Value", PasteLimit));
}
});
diff --git a/packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js b/packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js
index c54bba3c8..36d2cf184 100644
--- a/packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js
+++ b/packages/fineui/src/widget/multiselect/trigger/searcher.multiselect.insert.js
@@ -10,7 +10,8 @@ import {
size,
each,
BlankSplitChar,
- Selection
+ Selection,
+ PasteLimit,
} from "@/core";
import { MultiSelectEditor } from "./editor.multiselect";
import { Searcher } from "@/base";
@@ -123,7 +124,7 @@ export class MultiSelectInsertSearcher extends Widget {
const keywords = this.getKeywords();
self.fireEvent(
MultiSelectInsertSearcher.EVENT_SEARCHING,
- keywords.length > 2000 ? keywords.slice(0, 2000).concat([BlankSplitChar]) : keywords.slice(0, 2000)
+ keywords.length > PasteLimit ? keywords.slice(0, PasteLimit).concat([BlankSplitChar]) : keywords.slice(0, PasteLimit)
);
});
if (isNotNull(o.value)) {
@@ -150,7 +151,7 @@ export class MultiSelectInsertSearcher extends Widget {
}
getKeyword() {
- let keywords = this.editor.getKeywords().slice(0, 2000);
+ let keywords = this.editor.getKeywords().slice(0, PasteLimit);
if (keywords[keywords.length - 1] === BlankSplitChar) {
keywords = keywords.slice(0, keywords.length - 1);
}
diff --git a/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js b/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js
index 2c854fb31..4d5bab1da 100644
--- a/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js
+++ b/packages/fineui/src/widget/multiselect/trigger/switcher.checkselected.js
@@ -10,7 +10,6 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
static EVENT_TRIGGER_CHANGE = "EVENT_TRIGGER_CHANGE";
static EVENT_BEFORE_POPUPVIEW = "EVENT_BEFORE_POPUPVIEW";
static EVENT_AFTER_HIDEVIEW = "EVENT_AFTER_HIDEVIEW";
- static EVENT_TRIGGER_COMBO = "EVENT_TRIGGER_COMBO";
_defaultConfig() {
return extend(super._defaultConfig(...arguments), {
@@ -49,7 +48,6 @@ export class MultiSelectCheckSelectedSwitcher extends Widget {
itemsCreator: o.itemsCreator,
onClickContinueSelect() {
self.switcher.hideView();
- self.fireEvent(MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_COMBO);
},
ref(_ref) {
self.checkPane = _ref;
diff --git a/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js b/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js
index e0e4aac3b..a7b52fc2e 100644
--- a/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js
+++ b/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.js
@@ -28,7 +28,8 @@ import {
isNull,
VerticalFillLayout,
SIZE_CONSANTS,
- BlankSplitChar
+ BlankSplitChar,
+ PasteLimit,
} from "@/core";
import { Single, Searcher, Msg } from "@/base";
import { MultiSelectBar } from "@/case";
@@ -200,10 +201,10 @@ export class MultiSelectInsertList extends Single {
}
self.fireEvent(MultiSelectInsertList.EVENT_CHANGE);
});
- self._getKeywordsLength() > 2000 &&
+ self._getKeywordsLength() > PasteLimit &&
Msg.alert(
i18nText("BI-Basic_Prompt"),
- i18nText("BI-Basic_Too_Much_Value_Get_Two_Thousand")
+ i18nText("BI-Basic_Paste_Too_Much_Value", PasteLimit)
);
}
},
@@ -266,7 +267,7 @@ export class MultiSelectInsertList extends Single {
keywords = keywords.concat([BlankSplitChar]);
}
- return keywords.length > 2000 ? keywords.slice(0, 2000).concat([BlankSplitChar]) : keywords.slice(0, 2000);
+ return keywords.length > PasteLimit ? keywords.slice(0, PasteLimit).concat([BlankSplitChar]) : keywords.slice(0, PasteLimit);
}
_getKeywordsLength() {
diff --git a/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.nobar.js b/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.nobar.js
index 1bca0a442..c166b8224 100644
--- a/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.nobar.js
+++ b/packages/fineui/src/widget/multiselectlist/multiselectlist.insert.nobar.js
@@ -28,7 +28,8 @@ import {
isNull,
VTapeLayout,
BlankSplitChar,
- SIZE_CONSANTS
+ SIZE_CONSANTS,
+ PasteLimit,
} from "@/core";
import { Single, Searcher, Msg } from "@/base";
import { MultiSelectBar } from "@/case";
@@ -201,10 +202,10 @@ export class MultiSelectInsertNoBarList extends Single {
}
self.fireEvent(MultiSelectInsertNoBarList.EVENT_CHANGE);
});
- self._getKeywordsLength() > 2000 &&
+ self._getKeywordsLength() > PasteLimit &&
Msg.alert(
i18nText("BI-Basic_Prompt"),
- i18nText("BI-Basic_Too_Much_Value_Get_Two_Thousand")
+ i18nText("BI-Basic_Paste_Too_Much_Value", PasteLimit)
);
}
},
@@ -271,7 +272,7 @@ export class MultiSelectInsertNoBarList extends Single {
keywords = keywords.concat([BlankSplitChar]);
}
- return keywords.length > 2000 ? keywords.slice(0, 2000).concat([BlankSplitChar]) : keywords.slice(0, 2000);
+ return keywords.length > PasteLimit ? keywords.slice(0, PasteLimit).concat([BlankSplitChar]) : keywords.slice(0, PasteLimit);
}
_getKeywordsLength() {
diff --git a/packages/fineui/src/widget/multitree/multi.tree.combo.js b/packages/fineui/src/widget/multitree/multi.tree.combo.js
index 435db661e..7d61b6e9d 100644
--- a/packages/fineui/src/widget/multitree/multi.tree.combo.js
+++ b/packages/fineui/src/widget/multitree/multi.tree.combo.js
@@ -182,7 +182,6 @@ export class MultiTreeCombo extends Single {
return self.combo.isViewVisible();
}
- let shouldComboPopulate = true;
this.trigger.on(MultiSelectTrigger.EVENT_FOCUS, () => {
self.fireEvent(MultiTreeCombo.EVENT_FOCUS);
});
@@ -260,14 +259,14 @@ export class MultiTreeCombo extends Single {
}
self.combo.setValue(self.storeValue);
self.numberCounter.setValue(self.storeValue);
- shouldComboPopulate && self.populate();
+ self.populate();
self.fireEvent(MultiTreeCombo.EVENT_BEFORE_POPUPVIEW);
});
this.combo.on(Combo.EVENT_BEFORE_HIDEVIEW, () => {
if (isSearching()) {
self._stopEditing();
self._dataChange &&
- self.fireEvent(MultiTreeCombo.EVENT_CONFIRM);
+ self.fireEvent(MultiTreeCombo.EVENT_CONFIRM);
} else {
if (isPopupView()) {
self._stopEditing();
@@ -276,7 +275,7 @@ export class MultiTreeCombo extends Single {
self.storeValue = { value: {} };
}
self._dataChange &&
- self.fireEvent(MultiTreeCombo.EVENT_CONFIRM);
+ self.fireEvent(MultiTreeCombo.EVENT_CONFIRM);
}
}
clear = false;
@@ -317,18 +316,10 @@ export class MultiTreeCombo extends Single {
valueFormatter: o.valueFormatter,
value: { value: o.value || {} },
});
- this.numberCounter.on(
- MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_COMBO,
- () => {
- self.populate();
- shouldComboPopulate = true;
- }
- );
this.numberCounter.on(
MultiSelectCheckSelectedSwitcher.EVENT_TRIGGER_CHANGE,
() => {
if (!self.combo.isViewVisible()) {
- shouldComboPopulate = false;
self.combo.showView();
}
}
diff --git a/packages/fineui/typescript/core/var.ts b/packages/fineui/typescript/core/var.ts
index 580091fb2..09e5c89e9 100644
--- a/packages/fineui/typescript/core/var.ts
+++ b/packages/fineui/typescript/core/var.ts
@@ -130,6 +130,7 @@ export declare const VerticalAlign: {
export declare const StartOfWeek: number;
export declare const BlankSplitChar: string;
export declare const Events: Record;
+export declare const PasteLimit: number;
type SetFunc = (value: any) => void;
@@ -141,3 +142,4 @@ export declare const setBlankSplitChar: SetFunc;
export declare const setPixFormat: SetFunc;
export declare const setToPix: SetFunc;
export declare const setEventBlur: SetFunc;
+export declare const setPasteLimit: SetFunc;
diff --git a/scripts/lib/fui.export.txt b/scripts/lib/fui.export.txt
index b04b355ce..b24fd652c 100644
--- a/scripts/lib/fui.export.txt
+++ b/scripts/lib/fui.export.txt
@@ -295,6 +295,7 @@ Pager
Pane
Panel
PartTree
+PasteLimit
Plugin
PlusGroupNode
Popover