Merge branch 'master' of https://code.fineres.com/scm/~guy/fineui

package.json

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

src/base/single/button/buttons/button.text.js

@@ -42,7 +42,6 @@ BI.TextButton = BI.inherit(BI.BasicButton, {
             value: o.value,
             py: o.py,
             keyword: o.keyword,
-            title: null,
         });
     },
 

src/base/single/button/listitem/blankiconicontextitem.js

@@ -62,7 +62,6 @@ BI.BlankIconIconTextItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height,
-                    title: null,
                 },
             }],
         };

src/base/single/button/listitem/blankicontexticonitem.js

@@ -56,7 +56,6 @@ BI.BlankIconTextIconItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height,
-                    title: null,
                 },
             }, {
                 type: "bi.icon_label",

src/base/single/button/listitem/blankicontextitem.js

@@ -55,7 +55,6 @@ BI.BlankIconTextItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height,
-                    title: null,
                 },
             }],
         };

src/base/single/button/listitem/icontexticonitem.js

@@ -52,7 +52,6 @@ BI.IconTextIconItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height,
-                    title: null,
                 },
             }, {
                 type: "bi.icon_label",

src/base/single/button/listitem/icontextitem.js

@@ -53,7 +53,6 @@ BI.IconTextItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height,
-                    title: null,
                 },
             }],
         };

src/base/single/button/listitem/texticonitem.js

@@ -46,7 +46,6 @@ BI.TextIconItem = BI.inherit(BI.BasicButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height,
-                    title: null,
                 },
             }, {
                 type: "bi.icon_label",

src/base/single/button/listitem/textitem.js

@@ -39,7 +39,6 @@ BI.TextItem = BI.inherit(BI.BasicButton, {
             value: o.value,
             keyword: o.keyword,
             py: o.py,
-            title: null,
         });
     },
 

src/base/single/button/node/icontexticonnode.js

@@ -50,7 +50,6 @@ BI.IconTextIconNode = BI.inherit(BI.NodeButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height,
-                    title: null,
                 },
             }, {
                 type: "bi.icon_label",

src/base/single/button/node/icontextnode.js

@@ -50,7 +50,6 @@ BI.IconTextNode = BI.inherit(BI.NodeButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height,
-                    title: null,
                 },
             }],
         };

src/base/single/button/node/texticonnode.js

@@ -42,7 +42,6 @@ BI.TextIconNode = BI.inherit(BI.NodeButton, {
                     value: o.value,
                     keyword: o.keyword,
                     height: o.height,
-                    title: null,
                 },
             }, {
                 type: "bi.icon_label",

src/base/single/button/node/textnode.js

@@ -38,7 +38,6 @@ BI.TextNode = BI.inherit(BI.NodeButton, {
             value: o.value,
             keyword: o.keyword,
             py: o.py,
-            title: null,
         });
     },
 

src/case/combo/textvaluecombo/popup.textvalue.js

@@ -8,7 +8,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
 
     render () {
         var o = this.options, self = this;
-        if (o.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) {
+        if (o.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
             return {
                 type: "bi.vertical",
                 vgap: 5,
@@ -99,7 +99,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
         var o = this.options;
         return BI.map(items, function (i, item) {
             return BI.extend({
-                type: o.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE ? "bi.single_select_item" : "bi.multi_select_item",
+                type: o.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI ? "bi.single_select_item" : "bi.multi_select_item",
                 iconWrapperWidth: 36,
                 textAlign: o.textAlign,
                 title: item.title || item.text
@@ -113,7 +113,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
     },
 
     getValue: function () {
-        if (this.options.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) {
+        if (this.options.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
             return this.popup.getValue();
         }
         var val = this.popup.getValue();
@@ -125,7 +125,7 @@ BI.TextValueComboPopup = BI.inherit(BI.Pane, {
     },
 
     setValue: function (v) {
-        if (this.options.chooseType === BI.ButtonGroup.CHOOSE_TYPE_SINGLE) {
+        if (this.options.chooseType !== BI.ButtonGroup.CHOOSE_TYPE_MULTI) {
             return this.popup.setValue(v);
         }
         this.popup.setValue({

src/core/2.base.js

@@ -389,7 +389,7 @@
             }
             for (var i = 0, len = array.length; i < len; i++) {
                 if (BI.isArray(array[i])) {
-                    res.push(arguments.callee(array[i], value));
+                    res.push(BI.makeArrayByArray(array[i], value));
                 } else {
                     res.push(BI.deepClone(value));
                 }
@@ -987,7 +987,7 @@
          * @param DD 日
          * @param minDate '1900-01-01'
          * @param maxDate '2099-12-31'
-         * @returns {Array} 若无效返回无效状态
+         * @returns {Array} 若无效返回无效状态,数组第一位为无效属性,第二位缺省为超下限,1为超上限
          */
         checkDateVoid: function (YY, MM, DD, minDate, maxDate) {
             var back = [];

src/less/lib/font.less

@@ -23,6 +23,7 @@
 
 @font-arrow-left: "e1bc";
 @font-arrow-right: "e1bd";
+@font-arrow-bottom: "e1a4";
 
 @font-up-triangle: "e1c6";
 @font-down-triangle: "e1c9";

src/less/resource/font.less

@@ -66,7 +66,7 @@
 //实心下拉三角
 .font-hover(solid-triangle-left-font, @font-solid-left);
 .font-hover(solid-triangle-top-font, @font-solid-top);
-.font-hover(solid-triangle-bottom-font, @font-solid-bottom);
+.font-hover(solid-triangle-bottom-font, @font-arrow-bottom);
 //实心展开三角
 .font(expander-right-font, @font-solid-right);
 .font(expander-down-font, @font-solid-bottom);