Pull request #2245: 无JIRA任务 统一都采用maxWidth

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit '2125c0d185d1369572134fac6f31e19da81f2b2a':
  统一都采用maxWidth
  统一都采用maxWidth

src/base/single/label/abstract.label.js

@@ -29,6 +29,7 @@
                 textAlign: o.textAlign,
                 whiteSpace: o.whiteSpace,
                 lineHeight: o.textHeight,
+                maxWidth: "100%",
                 text: o.text,
                 value: o.value,
                 py: o.py,
@@ -185,17 +186,13 @@
                 }));
                 return;
             }
-            BI.extend(json, {
+            this.text = BI.createWidget(BI.extend(json, {
                 hgap: o.hgap,
                 vgap: o.vgap,
                 lgap: o.lgap,
                 rgap: o.rgap,
                 tgap: o.tgap,
                 bgap: o.bgap
-            });
-
-            this.text = BI.createWidget(BI.extend(json, {
-                maxWidth: "100%"
             }));
             BI.createWidget({
                 type: "bi.center_adapt",
@@ -211,7 +208,7 @@
             var json = this._createJson();
             if (BI.isNumber(o.width) && o.width > 0) {
                 if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
-                    json.width = o.textWidth;
+                    json.maxWidth = o.textWidth;
                     if (BI.isNumber(o.height) && o.height > 0) { // 2.1
                         BI.createWidget({
                             type: adaptLayout,
@@ -265,7 +262,7 @@
                     }
                     return;
                 }
-                json.width = o.width - 2 * o.hgap - o.lgap - o.rgap;
+                json.maxWidth = o.width - 2 * o.hgap - o.lgap - o.rgap;
                 BI.createWidget({ // 2.4
                     type: adaptLayout,
                     horizontalAlign: o.textAlign,
@@ -285,7 +282,7 @@
                 return;
             }
             if (BI.isNumber(o.textWidth) && o.textWidth > 0) {
-                json.width = o.textWidth;
+                json.maxWidth = o.textWidth;
                 BI.createWidget({  // 2.5
                     type: adaptLayout,
                     horizontalAlign: o.textAlign,
@@ -323,17 +320,13 @@
                 }));
                 return;
             }
-            BI.extend(json, {
+            this.text = BI.createWidget(BI.extend(json, {
                 hgap: o.hgap,
                 vgap: o.vgap,
                 lgap: o.lgap,
                 rgap: o.rgap,
                 tgap: o.tgap,
                 bgap: o.bgap
-            });
-
-            this.text = BI.createWidget(BI.extend(json, {
-                maxWidth: "100%"
             }));
             BI.createWidget({
                 type: adaptLayout,