Merge remote-tracking branch 'origin/master'

package.json

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

src/base/combination/searcher.js

@@ -315,6 +315,10 @@ BI.Searcher = BI.inherit(BI.Widget, {
 
     blur: function () {
         this.editor.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.editor.setWaterMark(v);
     }
 });
 BI.Searcher.EVENT_CHANGE = "EVENT_CHANGE";

src/base/combination/tab.js

@@ -15,7 +15,8 @@ BI.Tab = BI.inherit(BI.Widget, {
             tab: false,
             cardCreator: function (v) {
                 return BI.createWidget();
-            }
+            },
+            keepAlives: []
         });
     },
 
@@ -66,7 +67,7 @@ BI.Tab = BI.inherit(BI.Widget, {
         var self = this, o = this.options;
         if (o.single === true) {
             BI.each(this.cardMap, function (name, card) {
-                if (name !== (currCardName + "")) {
+                if (name !== (currCardName + "") && self._keepAlive(name) !== true) {
                     self.layout.deleteCardByName(name);
                     delete self.cardMap[name];
                 }
@@ -82,6 +83,12 @@ BI.Tab = BI.inherit(BI.Widget, {
         }
     },
 
+    _keepAlive: function (v) {
+        var o = this.options;
+        return BI.isFunction(o.keepAlives) ? o.keepAlives(v) : BI.contains(o.keepAlives, v);
+
+    },
+
     created: function () {
         var o = this.options;
         if (o.showIndex !== false) {

src/component/treevaluechooser/combo.listtreevaluechooser.js

@@ -110,6 +110,10 @@ BI.ListTreeValueChooserInsertCombo = BI.inherit(BI.AbstractListTreeValueChooser,
 
     blur: function () {
         this.combo.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.combo.setWaterMark(v);
     }
 });
 

src/component/treevaluechooser/combo.treevaluechooser.insert.js

@@ -109,6 +109,10 @@ BI.TreeValueChooserInsertCombo = BI.inherit(BI.AbstractTreeValueChooser, {
 
     blur: function () {
         this.combo.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.combo.setWaterMark(v);
     }
 });
 

src/component/treevaluechooser/combo.treevaluechooser.js

@@ -113,6 +113,10 @@ BI.TreeValueChooserCombo = BI.inherit(BI.AbstractTreeValueChooser, {
 
     blur: function () {
         this.combo.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.combo.setWaterMark(v);
     }
 });
 

src/core/func/alias.js

@@ -417,16 +417,17 @@
         "\"": """,
         "<": "&lt;",
         ">": "&gt;",
-        " ": "&nbsp;"
+        "\x20": "&nbsp;",
+        "\n": "&#10;"
     };
     BI.htmlEncode = function (text) {
-        return BI.isNull(text) ? "" : BI.replaceAll(text + "", "&|\"|<|>|\\s", function (v) {
-            return SPECIAL_TAGS[v] ? SPECIAL_TAGS[v] : "&nbsp;";
+        return BI.isNull(text) ? "" : BI.replaceAll(text + "", BI.keys(SPECIAL_TAGS).join("|"), function (v) {
+            return SPECIAL_TAGS[v] ? SPECIAL_TAGS[v] : v;
         });
     };
     // html decode
     BI.htmlDecode = function (text) {
-        return BI.isNull(text) ? "" : BI.replaceAll(text + "", "&amp;|&quot;|&lt;|&gt;|&nbsp;", function (v) {
+        return BI.isNull(text) ? "" : BI.replaceAll(text + "", BI.values(SPECIAL_TAGS).join("|"), function (v) {
             switch (v) {
                 case "&amp;":
                     return "&";
@@ -437,8 +438,11 @@
                 case "&gt;":
                     return ">";
                 case "&nbsp;":
-                default:
                     return " ";
+                case "&#10;":
+                    return "\n";
+                default:
+                    return v;
             }
         });
     };

src/router/router.js

@@ -3179,7 +3179,8 @@
           ref: function (_ref) {
             self.tab = _ref;
           },
-          single: false, // 是不是单页面
+          single: o.single, // 是不是单页面
+          keepAlives: o.keepAlives,
           logic: {
             dynamic: false
           },

src/widget/multilayerselecttree/multilayerselecttree.combo.js

@@ -250,6 +250,10 @@ BI.MultiLayerSelectTreeCombo = BI.inherit(BI.Widget, {
 
     showView: function () {
         this.combo.showView();
+    },
+
+    setWaterMark: function (v) {
+        this.trigger.setWaterMark(v);
     }
 });
 

src/widget/multilayerselecttree/multilayerselecttree.trigger.js

@@ -245,6 +245,10 @@ BI.MultiLayerSelectTreeTrigger = BI.inherit(BI.Trigger, {
 
     blur: function () {
         this.searcher.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.searcher.setWaterMark(v);
     }
 });
 

src/widget/multilayersingletree/multilayersingletree.combo.js

@@ -251,6 +251,10 @@ BI.MultiLayerSingleTreeCombo = BI.inherit(BI.Widget, {
 
     showView: function () {
         this.combo.showView();
+    },
+
+    setWaterMark: function (v) {
+        this.trigger.setWaterMark(v);
     }
 });
 

src/widget/multilayersingletree/multilayersingletree.trigger.js

@@ -247,6 +247,10 @@ BI.MultiLayerSingleTreeTrigger = BI.inherit(BI.Trigger, {
 
     blur: function () {
         this.searcher.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.searcher.setWaterMark(v);
     }
 });
 BI.MultiLayerSingleTreeTrigger.EVENT_FOCUS = "EVENT_FOCUS";

src/widget/multiselect/multiselect.trigger.js

@@ -144,6 +144,10 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
 
     blur: function () {
         this.searcher.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.searcher.setWaterMark(v);
     }
 });
 

src/widget/multiselect/trigger/editor.multiselect.js

@@ -93,6 +93,10 @@ BI.MultiSelectEditor = BI.inherit(BI.Widget, {
 
     populate: function (items) {
 
+    },
+
+    setWaterMark: function (v) {
+        this.editor.setWaterMark(v);
     }
 });
 

src/widget/multitree/multi.tree.combo.js

@@ -352,6 +352,10 @@ BI.MultiTreeCombo = BI.inherit(BI.Single, {
 
     blur: function () {
         this.trigger.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.trigger.setWaterMark(v);
     }
 });
 

src/widget/multitree/multi.tree.insert.combo.js

@@ -368,6 +368,10 @@ BI.MultiTreeInsertCombo = BI.inherit(BI.Single, {
 
     blur: function () {
         this.trigger.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.trigger.setWaterMark(v);
     }
 });
 

src/widget/multitree/multi.tree.list.combo.js

@@ -386,6 +386,10 @@ BI.MultiTreeListCombo = BI.inherit(BI.Single, {
 
     blur: function () {
         this.trigger.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.trigger.setWaterMark(v);
     }
 });
 

src/widget/multitree/trigger/searcher.list.multi.tree.js

@@ -172,6 +172,10 @@ BI.MultiListTreeSearcher = BI.inherit(BI.Widget, {
 
     blur: function () {
         this.editor.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.editor.setWaterMark(v);
     }
 });
 

src/widget/multitree/trigger/searcher.multi.tree.js

@@ -192,6 +192,10 @@ BI.MultiTreeSearcher = BI.inherit(BI.Widget, {
 
     blur: function () {
         this.editor.blur();
+    },
+
+    setWaterMark: function (v) {
+        this.editor.setWaterMark(v);
     }
 });
 

typescript/base/combination/tab.ts

@@ -15,6 +15,7 @@ export declare class Tab extends Widget {
             dynamic: boolean;
         };
         tab?: Obj;
+        keepAlives?: string[] | ((cardName: string) => boolean)
     }
 
     setSelect(v: string | number, action?: Action, callback?: Function): void;

typescript/case/segment/segment.ts

@@ -0,0 +1,8 @@
+import { Widget } from "../../core/widget";
+
+export declare class Segment extends Widget {
+    static xtype: string;
+    static EVENT_CHANGE: string;
+
+    setEnabledValue(v: any): void;
+}

typescript/component/treevaluechooser/combo.listtreevaluechooser.ts

@@ -27,4 +27,6 @@ export declare class ListTreeValueChooserInsertCombo extends AbstractListTreeVal
     focus(): void;
 
     blur(): void;
+
+    setWaterMark(v: string): void;
 }

typescript/component/treevaluechooser/combo.treevaluechooser.insert.ts

@@ -26,4 +26,6 @@ export declare class TreeValueChooserInsertCombo extends AbstractTreeValueChoose
     focus(): void;
 
     blur(): void;
+
+    setWaterMark(v: string): void;
 }

typescript/component/treevaluechooser/combo.treevaluechooser.ts

@@ -28,4 +28,6 @@ export declare class TreeValueChooserCombo extends AbstractTreeValueChooser {
     focus(): void;
 
     blur(): void;
+    
+    setWaterMark(v: string): void;
 }

typescript/index.ts

@@ -146,6 +146,7 @@ import { MultiSelectInsertList } from "./widget/multiselectlist/multiselectlist.
 import { YearMonthInterval } from "./widget/yearmonthinterval/yearmonthinterval";
 import { NumberEditor } from "./widget/numbereditor/numbereditor";
 import { TextValueCheckCombo } from "./case/combo/textvaluecheckcombo/combo.textvaluecheck";
+import { Segment } from "./case/segment/segment";
 import { LinearSegment } from "./case/linersegment/linear.segment";
 import { Img } from "./base/single/img/img";
 import { EditorIconCheckCombo } from "./case/combo/editoriconcheckcombo/combo.editiconcheck";
@@ -345,6 +346,7 @@ export interface BI extends _func, _i18n, _base, _inject, _var, _web, _utils {
     YearMonthInterval: typeof YearMonthInterval;
     TextValueCheckCombo: typeof TextValueCheckCombo;
     NumberEditor: typeof NumberEditor;
+    Segment: typeof Segment;
     LinearSegment: typeof LinearSegment;
     Img: typeof Img;
     EditorIconCheckCombo: typeof EditorIconCheckCombo;
@@ -534,6 +536,7 @@ export {
     YearMonthInterval,
     TextValueCheckCombo,
     NumberEditor,
+    Segment,
     LinearSegment,
     Img,
     EditorIconCheckCombo,

typescript/widget/multitree/multi.tree.combo.ts

@@ -19,4 +19,6 @@ export declare class MultiTreeCombo extends Single {
     focus(): void;
 
     blur(): void;
+
+    setWaterMark(v: string): void;
 }

typescript/widget/multitree/multi.tree.insert.combo.ts

@@ -27,4 +27,6 @@ export declare class MultiTreeInsertCombo extends Single {
     focus(): void;
 
     blur(): void;
+
+    setWaterMark(v: string): void;
 }

typescript/widget/multitree/multi.tree.list.combo.ts

@@ -26,4 +26,6 @@ export declare class MultiTreeListCombo extends Single {
     focus(): void;
 
     blur(): void;
+
+    setWaterMark(v: string): void;
 }