Pull request #1787: BI-75437 feat:多层下拉支持自定义type&多行编辑框提示位置自定义

Merge in VISUAL/fineui from ~CLAIRE.TANG/fineui:master to master

* commit '163b5b0b398ffa5bd1e0d44a980dea0a344cd852':
  BI-75437 feat:多层下拉支持自定义type&多行编辑框提示位置自定义

dist/font/iconfont.svg

@@ -20,6 +20,15 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="beizhu" unicode="&#59199;" d="M777.152 818.816c65.344 0 118.848-53.504 118.848-118.848V454.4l-2.816-4.8a32.832 32.832 0 0 0-56.384 4.352l-0.192 0.448V699.968c0 35.648-23.808 59.392-59.52 59.392H182.912c-35.648 0-59.392-23.744-59.392-59.392v-475.456c0-35.648 23.744-59.456 59.392-59.456h54.848c11.904 0 29.76-5.888 41.6-17.792l77.248-71.296v29.696c0 17.792 5.952 29.696 17.856 41.6a53.952 53.952 0 0 0 41.6 17.792h143.872a42.88 42.88 0 0 0 3.84-3.392l3.072-3.648a37.504 37.504 0 0 0-7.744-52.48l0.064 0.192-143.104-0.064v-83.2c0-23.808-17.856-35.648-35.648-35.648-5.952 0-11.904 0-17.856 5.952l-124.8 112.896h-54.848A119.232 119.232 0 0 0 64 224.512V699.968c0 65.344 53.504 118.848 118.848 118.848z m-218.176-416v-59.392H272c-15.872 0-27.008 9.344-29.312 23.936l-0.384 5.76c0 17.792 11.84 29.696 29.696 29.696h286.976z m129.024 178.24c17.856 0 29.696-11.84 29.696-29.696 0-17.792-11.84-29.696-29.696-29.696h-416c-17.856 0-29.696 11.904-29.696 29.696 0 17.856 11.84 29.696 29.696 29.696zM880.256 405.504l52.416-36.672a64 64 0 0 0 15.744-89.152l-208-297.088a64 64 0 0 0-32.576-24.064l-91.2-29.888a32 32 0 0 0-41.984 29.376l-3.072 95.936a64 64 0 0 0 11.52 38.784l208 297.088a64 64 0 0 0 89.152 15.68z m-36.736-52.416l-208-297.088 1.728-53.248 50.688 16.576L896 316.416l-52.416 36.672z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="normal123" unicode="&#59463;" d="M99.456 305.216c0-11.52 5.696-22.144 14.976-27.904 9.216-5.76 20.608-5.76 29.824 0a32.832 32.832 0 0 1 14.976 27.904 32.64 32.64 0 0 1-14.976 27.84 27.968 27.968 0 0 1-29.824 0 32.64 32.64 0 0 1-14.976-27.84z m0 138.624c0-11.52 5.696-22.08 14.976-27.84 9.216-5.76 20.608-5.76 29.824 0a32.832 32.832 0 0 1 14.976 27.84 32.64 32.64 0 0 1-14.976 27.904 27.968 27.968 0 0 1-29.824 0 32.64 32.64 0 0 1-14.976-27.904z m55.488-266.88v-80.896c0-35.392 26.688-64.192 59.52-64.192h593.6c32.768 0 59.52 28.8 59.52 64.192V673.152c0 35.392-26.752 64.192-59.52 64.192l-593.536-1.728c-32.768 0-59.52-28.8-59.52-64.192v-80.192c0-17.728-13.312-32.128-29.824-32.128s-29.824 14.4-29.824 32.128l0.064 2.432V671.296c0 70.912 53.184 128.32 118.848 128.32l594.24 1.664c65.536 0 118.72-57.536 118.72-128.32v-575.36c0-70.912-53.12-128.32-118.848-128.32H214.208c-65.664 0-118.848 57.408-118.848 128.32v77.056c-0.128 0.832-0.128 1.6-0.128 2.432 0 17.664 13.376 32 29.888 32s29.824-14.336 29.824-32.064z m416.192 22.912a28.352 28.352 0 0 1 42.176 0l125.76 135.68 0.832 0.832 0.768 0.704a33.472 33.472 0 0 1 0 44.8L614.4 518.208a27.84 27.84 0 0 1-41.6 0l-0.64-0.704a33.472 33.472 0 0 1 0-44.8l76.16-82.176H302.848c-16.128 0-29.312-14.208-29.312-31.616 0-17.344 13.184-31.552 29.312-31.552h344.32l-75.84-82.048a33.92 33.92 0 0 1-0.192-45.44z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="normal122" unicode="&#59462;" d="M446.976 801.28l118.336-131.392H825.6c74.24 0 134.4-58.816 134.4-131.328v-175.168h-64v62.592H128v-330.048c0-32 26.688-57.856 59.584-57.856L576 38.144v-68.864H198.4c-74.24 0-134.4 58.816-134.4 131.392V801.28h382.976z m334.976-497.408l4.992-3.968 136-132.992 0.512-0.512a30.912 30.912 0 0 0-0.32-44.032L787.2-10.496a32 32 0 0 0-44.8 0l-0.192 0.256a30.912 30.912 0 0 0-0.512 43.776l0.512 0.512 81.024 79.232H607.296a31.296 31.296 0 1 0 0 62.528h216.128l-81.472 79.68-0.256 0.192a31.04 31.04 0 0 0-3.392 39.744l3.648 4.288 0.256 0.256a32 32 0 0 0 39.744 3.968z m-373.12 434.88H128v-250.24h768V545.92c0 31.936-26.688 57.792-59.584 57.792H531.2l-122.368 135.04z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="bupaixu" unicode="&#59461;" d="M750.4 63.04a32 32 0 0 0 32-32v-10.624a32 32 0 0 0-32-32H533.568a32 32 0 0 0-32 32v10.624a32 32 0 0 0 32 32h216.832z m-493.44 654.08a25.6 25.6 0 0 0 0.512-0.576l137.472-141.632a25.6 25.6 0 0 0-18.432-43.392H277.568v-318.4h98.944a25.6 25.6 0 0 0 14.016-4.224l3.84-3.072a25.6 25.6 0 0 0 0.576-36.16l-137.472-141.696a25.6 25.6 0 0 0-36.736 0L83.2 169.664a25.6 25.6 0 0 0 18.368 43.392h101.312V531.584H101.632a25.6 25.6 0 0 0-18.368 43.392L220.8 716.544a25.6 25.6 0 0 0 36.16 0.576z m655.36-430.144a32 32 0 0 0 32-32v-10.624a32 32 0 0 0-32-32H533.632a32 32 0 0 0-32 32v10.624a32 32 0 0 0 32 32h378.816z m-161.152 223.872a32 32 0 0 0 32-32v-10.624a32 32 0 0 0-32-32h-217.6a32 32 0 0 0-32 32v10.624a32 32 0 0 0 32 32h217.6z m166.208 223.936a32 32 0 0 0 32-32v-10.624a32 32 0 0 0-32-32H533.568a32 32 0 0 0-32 32V702.72a32 32 0 0 0 32 32h383.808z"  horiz-adv-x="1024" />
 
     
@@ -1292,9 +1301,6 @@ Created by iconfont
     <glyph glyph-name="yewubao" unicode="&#59198;" d="M106.666667 469.333333h810.666666v-384a106.666667 106.666667 0 0 0-106.666666-106.666666H213.333333a106.666667 106.666667 0 0 0-106.666666 106.666666V469.333333z m0 42.666667v170.666667a106.666667 106.666667 0 0 0 106.666666 106.666666h193.109334a85.333333 85.333333 0 0 0 58.666666-23.36l63.317334-59.946666A85.333333 85.333333 0 0 1 587.093333 682.666667H810.666667a106.666667 106.666667 0 0 0 106.666666-106.666667v-64H106.666667z m106.666666-128a21.333333 21.333333 0 0 1 0-42.666667h256a21.333333 21.333333 0 0 1 0 42.666667H213.333333z m0-128a21.333333 21.333333 0 0 1 0-42.666667h128a21.333333 21.333333 0 0 1 0 42.666667h-128z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="normal95" unicode="&#59199;" d="M631.488 382.784L549.952 464.32a32 32 0 0 0 45.248 45.248l135.744-135.744a32 32 0 0 0 0.192-45.504l-135.744-135.808a32 32 0 1 0-45.248 45.248l81.024 81.024H312.256a32 32 0 1 0 0 64h319.232zM128 800h320l128-128h320a64 64 0 0 0 64-64v-576a64 64 0 0 0-64-64H128a64 64 0 0 0-64 64v704a64 64 0 0 0 64 64z m293.504-64H128v-704h768v576H549.504l-128 128z"  horiz-adv-x="1024" />
-
-    
     <glyph glyph-name="zhujian" unicode="&#59200;" d="M246.528 75.904c1.024-0.768 1.92-1.664 2.816-2.56l49.152-49.088a32 32 0 0 0-45.248-45.248l-49.152 49.088a32.32 32.32 0 0 0-2.496 2.816l-44.544-44.544a32 32 0 1 0-45.312 45.248L405.952 325.76a32.512 32.512 0 0 0 1.408 1.344 288 288 0 1 0 46.08-44.096 32.384 32.384 0 0 0-2.24-2.496L355.648 184.96000000000004l86.272-86.272a32 32 0 0 0-45.248-45.248L310.4 139.712l-63.872-63.808zM628.224 288a224 224 0 1 1 0 448 224 224 0 0 1 0-448z"  horiz-adv-x="1024" />
 
     

src/base/single/editor/editor.textarea.js

@@ -10,6 +10,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
             baseCls: "bi-textarea-editor",
             value: "",
             errorText: "",
+            adjustYOffset: 2,
+            adjustXOffset: 0,
+            offsetStyle: "left",
             validationChecker: function () {
                 return true;
             },
@@ -137,7 +140,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
         }
         if (!this.disabledError && BI.isKey(errorText)) {
             BI.Bubbles[b ? "show" : "hide"](this.getName(), errorText, this, {
-                adjustYOffset: 2
+                adjustYOffset: o.adjustYOffset,
+                adjustXOffset: o.adjustXOffset,
+                offsetStyle: o.offsetStyle,
             });
             return BI.Bubbles.get(this.getName());
         }

src/widget/multilayerdownlist/popup.downlist.js

@@ -111,7 +111,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
                     };
                     self._createChildren(item);
                 } else {
-                    item.type = "bi.down_list_item";
+                    item.type = item.type || "bi.down_list_item";
                     item.title = item.title || item.text;
                     item.textRgap = 10;
                     item.isNeedAdjustWidth = false;
@@ -159,7 +159,7 @@ BI.MultiLayerDownListPopup = BI.inherit(BI.Pane, {
             var fatherValue = BI.deepClone(self._formatEL(item).el.value);
             var childValue = BI.deepClone(child.value);
             self.singleValues.push(child.value);
-            child.type = "bi.down_list_item";
+            child.type = child.type || "bi.down_list_item";
             child.extraCls = " child-down-list-item";
             child.title = child.title || child.text;
             child.textRgap = 10;