Merge pull request #385 in FUI/fineui from ~TELLER/fineui:bugfix/BI-19837 to master

* commit '1f6aab1bbe672a936c60a6e88524916ac197a402':
  update
  update
  update
  update
  update
  update
  update
  update

dist/base.css

@@ -927,6 +927,9 @@ li.CodeMirror-hint-active {
   cursor: text;
   font-size: 14px;
 }
+.bi-sortable-holder {
+  border: 1px dashed #d4dadd;
+}
 .bi-all-count-pager .all-pager-prev {
   font-size: 16px;
 }

dist/bundle.css

@@ -2973,6 +2973,9 @@ li.CodeMirror-hint-active {
   cursor: text;
   font-size: 14px;
 }
+.bi-sortable-holder {
+  border: 1px dashed #d4dadd;
+}
 .bi-all-count-pager .all-pager-prev {
   font-size: 16px;
 }

dist/bundle.js

@@ -82013,7 +82013,8 @@ BI.SortList = BI.inherit(BI.Widget, {
     }
 });
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.sort_list", BI.SortList);/**
+BI.shortcut("bi.sort_list", BI.SortList);
+/**
  * 有总页数和总行数的分页控件
  * Created by Young's on 2016/10/13.
  */

dist/case.js

@@ -9557,7 +9557,8 @@ BI.SortList = BI.inherit(BI.Widget, {
     }
 });
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.sort_list", BI.SortList);/**
+BI.shortcut("bi.sort_list", BI.SortList);
+/**
  * 有总页数和总行数的分页控件
  * Created by Young's on 2016/10/13.
  */

dist/fineui.css

@@ -2973,6 +2973,9 @@ li.CodeMirror-hint-active {
   cursor: text;
   font-size: 14px;
 }
+.bi-sortable-holder {
+  border: 1px dashed #d4dadd;
+}
 .bi-all-count-pager .all-pager-prev {
   font-size: 16px;
 }

dist/fineui.js

@@ -82256,7 +82256,8 @@ BI.SortList = BI.inherit(BI.Widget, {
     }
 });
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.sort_list", BI.SortList);/**
+BI.shortcut("bi.sort_list", BI.SortList);
+/**
  * 有总页数和总行数的分页控件
  * Created by Young's on 2016/10/13.
  */

dist/font/iconfont.svg

@@ -957,6 +957,42 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="liekuandengfen" unicode="&#59277;" d="M634.112 345.6H389.952a38.72 38.72 0 0 0-5.44 0.384v-143.488a32 32 0 0 0-54.656-22.656l-179.2 179.2a32 32 0 0 0 0 45.312l179.2 179.2a32 32 0 0 0 54.656-22.592v-138.944a38.72 38.72 0 0 0 5.44 0.384h244.16V560.96a32 32 0 0 0 54.592 22.656l179.264-179.264a32 32 0 0 0 0-45.248l-179.2-179.2a32 32 0 0 0-54.656 22.592V345.6zM70.4 704a38.4 38.4 0 0 0 38.4-38.4v-563.2a38.4 38.4 0 0 0-76.8 0V665.6a38.4 38.4 0 0 0 38.4 38.4z m883.2 0a38.4 38.4 0 0 0 38.4-38.4v-563.2a38.4 38.4 0 1 0-76.8 0V665.6a38.4 38.4 0 0 0 38.4 38.4z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="pingtairizhi" unicode="&#59278;" d="M665.6 665.6H358.4V640a38.4 38.4 0 1 0-76.8 0v25.6H160a25.6 25.6 0 0 1-25.6-25.6v-96h755.2V640a25.6 25.6 0 0 1-25.6 25.6h-121.6V640a38.4 38.4 0 0 0-76.8 0v25.6z m76.8 76.8h121.6A102.4 102.4 0 0 0 966.4 640v-576a102.4 102.4 0 0 0-102.4-102.4h-704A102.4 102.4 0 0 0 57.6 64V640a102.4 102.4 0 0 0 102.4 102.4h121.6V768a38.4 38.4 0 1 0 76.8 0v-25.6h307.2V768a38.4 38.4 0 0 0 76.8 0v-25.6z m147.2-275.2H134.4V64c0-14.08 11.52-25.6 25.6-25.6h704a25.6 25.6 0 0 1 25.6 25.6V467.2zM256 307.20000000000005A38.4 38.4 0 1 0 256 384h512a38.4 38.4 0 0 0 0-76.8H256z m0-192A38.4 38.4 0 0 0 256 192h320a38.4 38.4 0 0 0 0-76.8H256z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="bangzhuwendang" unicode="&#58977;" d="M249.6 761.6H160a25.6 25.6 0 0 1-25.6-25.6v-704c0-14.08 11.52-25.6 25.6-25.6h729.6V761.6H518.4v-417.344L384 433.856l-134.4-89.6V761.6zM160 838.4h806.4v-908.8H160a102.4 102.4 0 0 0-102.4 102.4v704A102.4 102.4 0 0 0 160 838.4z m0-640h806.4v-268.8H160a102.4 102.4 0 0 0-102.4 102.4v64a102.4 102.4 0 0 0 102.4 102.4z m0-76.8a25.6 25.6 0 0 1-25.6-25.6v-64c0-14.08 11.52-25.6 25.6-25.6h729.6v115.2H160z m166.4 366.144l57.6 38.4 57.6-38.4V761.6H326.4v-273.856z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="quxiaoguachu" unicode="&#59279;" d="M506.944 520.128l108.608 108.608a38.4 38.4 0 0 0 54.336-54.272L561.28 465.856l108.608-108.608a38.4 38.4 0 0 0-54.336-54.336L506.944 411.52 398.336 302.912a38.4 38.4 0 0 0-54.272 54.336l108.608 108.608-108.608 108.608a38.4 38.4 0 0 0 54.272 54.272l108.608-108.608zM512 105.408l-286.272-156.16a70.4 70.4 0 0 0-104.128 61.76V725.12a102.4 102.4 0 0 0 102.4 102.4h576a102.4 102.4 0 0 0 102.4-102.4v-714.112a70.4 70.4 0 0 0-104.128-61.76L512 105.408z m313.6 619.712a25.6 25.6 0 0 1-25.6 25.6h-576a25.6 25.6 0 0 1-25.6-25.6v-703.36l279.872 152.704a70.4 70.4 0 0 0 67.456 0l279.872-152.64V725.12z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="shenqingguachumoban" unicode="&#59280;" d="M512 105.408l-286.272-156.16a70.4 70.4 0 0 0-104.128 61.76V725.12a102.4 102.4 0 0 0 102.4 102.4h576a102.4 102.4 0 0 0 102.4-102.4v-714.112a70.4 70.4 0 0 0-104.128-61.76L512 105.408z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="kuaisuguachu" unicode="&#59281;" d="M512 105.408l-286.272-156.16a70.4 70.4 0 0 0-104.128 61.76V725.12a102.4 102.4 0 0 0 102.4 102.4h576a102.4 102.4 0 0 0 102.4-102.4v-714.112a70.4 70.4 0 0 0-104.128-61.76L512 105.408z m313.6 619.712a25.6 25.6 0 0 1-25.6 25.6h-576a25.6 25.6 0 0 1-25.6-25.6v-703.36l279.872 152.704a70.4 70.4 0 0 0 67.456 0l279.872-152.64V725.12z m-150.72-79.232l-140.736-113.28a19.2 19.2 0 0 1-0.576-29.44l149.504-130.24a19.2 19.2 0 0 0-5.888-32.448l-296.704-111.68a19.2 19.2 0 0 0-18.88 32.832l155.392 126.72a19.2 19.2 0 0 1-1.6 30.912L353.024 525.824a19.2 19.2 0 0 0 3.456 33.92l299.264 118.912a19.2 19.2 0 0 0 19.2-32.768z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon_mimayuechi" unicode="&#58978;" d="M725.650286 638.464l113.810285-113.810286a43.885714 43.885714 0 1 0-62.098285-62.025143L663.625143 576.365714 468.553143 381.293714a263.314286 263.314286 0 1 0-71.899429 52.224L787.748571 824.685714a43.885714 43.885714 0 0 0 62.025143 0l144.822857-144.822857a43.885714 43.885714 0 1 0-62.025142-62.025143L818.761143 731.428571 725.650286 638.537143z m-445.513143-616.594286a175.542857 175.542857 0 1 1 0 351.085715 175.542857 175.542857 0 0 1 0-351.085715z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="icon_shuaxin_normal" unicode="&#58979;" d="M715.008 608.576a314.112 314.112 0 1 1 119.936-368.192 48.768 48.768 0 1 0 91.648-33.408 411.648 411.648 0 1 0-139.52 470.016v106.24a48.768 48.768 0 0 0 97.472 0v-223.424c0-26.944-21.76-48.768-48.768-48.768H612.352a48.768 48.768 0 0 0 0 97.536h102.656z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhibiaobinglie-hengzhou" unicode="&#58980;" d="M158.336 414.336V768h70.72v-353.664H960v-70.784H229.056v-377.216H158.336V343.552H64V414.336h94.336z m337.088 216.32L324.8 460.032a35.392 35.392 0 0 0-50.048 50.048l206.72 206.656 191.872-96 171.136 128.384a35.392 35.392 0 0 0 42.432-56.576l-206.08-154.56L495.36 630.656z m185.344-564.288l-185.344 92.672-170.624-170.56a35.392 35.392 0 1 0-50.048 49.984l206.72 206.72 191.872-96 171.136 128.384a35.392 35.392 0 0 0 42.432-56.576l-206.08-154.624z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhibiaobinglie-zongzhou" unicode="&#58981;" d="M480.64 51.2V768h67.2v-716.8h389.76v-67.2H86.4V51.2h394.24zM201.088 532.8l224-224-225.28-225.344a33.6 33.6 0 0 0-47.552 47.488l177.856 177.856-224 224 202.88 202.944a33.6 33.6 0 0 0 47.552-47.488L201.088 532.8z m716.8-224l-225.28-225.344a33.6 33.6 0 0 0-47.552 47.488l177.856 177.856-224 224 202.88 202.944a33.6 33.6 0 0 0 47.552-47.488l-155.456-155.456 224-224z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhibiaojuhe-hengzhou" unicode="&#58982;" d="M861.056 32H160.896v-64h-69.76v64H64v69.76h27.136V800h69.76v-698.24h700.16V800h69.824v-698.24H960v-69.76h-29.12v-64h-69.76v64zM608.768 453.824l-182.976 91.52-168.32-168.448a34.88 34.88 0 1 0-49.408 49.408l203.968 203.968 189.376-94.72 168.96 126.72a34.88 34.88 0 0 0 41.856-55.872L608.768 453.824z m3.2-234.304L422.592 314.24l-168.96-126.72a34.88 34.88 0 1 0-41.856 55.808l203.456 152.576 182.976-91.52 168.32 168.448a34.88 34.88 0 1 0 49.408-49.344L611.968 219.52z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="zhibiaojuhe-zongzhou" unicode="&#58983;" d="M143.168 53.888V690.56H96V761.28h47.168V832h70.72v-70.72H928v-70.784H213.888v-636.608H928v-70.72H213.888V-64H143.168v47.168H96v70.72h47.168z m337.088 440.32L309.632 323.648a35.392 35.392 0 1 0-49.984 49.984l206.656 206.72 191.872-96 171.136 128.384a35.392 35.392 0 1 0 42.432-56.64l-206.08-154.56-185.408 92.672z m188.608-330.112l-191.872 96-171.136-128.384a35.392 35.392 0 0 0-42.432 56.576l206.08 154.624 185.408-92.736 170.624 170.624a35.392 35.392 0 0 0 49.984-50.048l-206.656-206.656z"  horiz-adv-x="1024" />
+
+    
+    <glyph glyph-name="tuozhuai-heng" unicode="&#59282;" d="M896 469.333333a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m-170.666667 0a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m170.666667-170.666666a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m-170.666667 0a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m-170.666666 170.666666a42.666667 42.666667 0 1 0-85.333334 0 42.666667 42.666667 0 0 0 85.333334 0z m0-170.666666a42.666667 42.666667 0 1 0-85.333334 0 42.666667 42.666667 0 0 0 85.333334 0z m-170.666667 170.666666a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m0-170.666666a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m-170.666667 170.666666a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z m0-170.666666a42.666667 42.666667 0 1 0-85.333333 0 42.666667 42.666667 0 0 0 85.333333 0z"  horiz-adv-x="1024" />
+
+    
 
 
   </font>

src/case/loader/sort.list.js

@@ -173,4 +173,4 @@ BI.SortList = BI.inherit(BI.Widget, {
     }
 });
 BI.SortList.EVENT_CHANGE = "EVENT_CHANGE";
-BI.shortcut("bi.sort_list", BI.SortList);
+BI.shortcut("bi.sort_list", BI.SortList);

src/css/base/loader/sort.css

@@ -0,0 +1,3 @@
+.bi-sortable-holder {
+  border: 1px dashed #d4dadd;
+}

src/less/base/loader/sort.list.less

@@ -0,0 +1,5 @@
+@import "../../index";
+
+.bi-sortable-holder {
+  border: 1px dashed @color-bi-border-line;
+}