Browse Source

Pull request #1513: BI-73305 fix: single销毁的时候title没有移除

Merge in VISUAL/fineui from ~WINDY/fui:master to master

* commit 'a70612846becaaefafb9144532528f8e012af173':
  同步图标
  加字体常量
  按照comment修改代码
  popup-position
  去掉hack
  BI-73305 fix: single销毁的时候title没有移除
es6
windy 4 years ago
parent
commit
3b7c3f14df
  1. BIN
      dist/font/iconfont.eot
  2. 14
      dist/font/iconfont.svg
  3. BIN
      dist/font/iconfont.ttf
  4. BIN
      dist/font/iconfont.woff
  5. BIN
      dist/font/iconfont.woff2
  6. 5
      src/base/single/single.js
  7. 1
      src/core/widget.js
  8. 10
      src/less/base/view/popupview.less
  9. 1
      src/less/lib/constant.less

BIN
dist/font/iconfont.eot vendored

Binary file not shown.

14
dist/font/iconfont.svg vendored

@ -20,6 +20,18 @@ Created by iconfont
/> />
<missing-glyph /> <missing-glyph />
<glyph glyph-name="Tabzujian" unicode="&#59443;" d="M213.333333 469.333333h597.333334v-341.333333H213.333333zM170.666667 725.333333h170.666666a42.666667 42.666667 0 0 0 42.666667-42.666666v-128H128V682.666667a42.666667 42.666667 0 0 0 42.666667 42.666666zM469.333333 725.333333h128a42.666667 42.666667 0 0 0 42.666667-42.666666v-85.333334h-213.333333V682.666667a42.666667 42.666667 0 0 0 42.666666 42.666666zM725.333333 725.333333h128a42.666667 42.666667 0 0 0 42.666667-42.666666v-85.333334h-213.333333V682.666667a42.666667 42.666667 0 0 0 42.666666 42.666666zM341.333333 725.333333a42.666667 42.666667 0 0 0 42.666667-42.666666v-128h512v-426.666667a85.333333 85.333333 0 0 0-85.333333-85.333333H213.333333a85.333333 85.333333 0 0 0-85.333333 85.333333V682.666667a42.666667 42.666667 0 0 0 42.666667 42.666666h170.666666z m512-213.333333H170.666667v-384a42.666667 42.666667 0 0 1 37.674666-42.368L213.333333 85.333333h597.333334a42.666667 42.666667 0 0 1 42.368 37.674667L853.333333 128V512z m-42.666666-42.666667v-341.333333H213.333333v341.333333h597.333334z m-213.333334 256a42.666667 42.666667 0 0 0 42.666667-42.666666v-85.333334h-213.333333V682.666667a42.666667 42.666667 0 0 0 42.666666 42.666666h128z m256 0a42.666667 42.666667 0 0 0 42.666667-42.666666v-85.333334h-213.333333V682.666667a42.666667 42.666667 0 0 0 42.666666 42.666666h128z" horiz-adv-x="1024" />
<glyph glyph-name="zizhushujuji_shoudaodefenxiang" unicode="&#59442;" d="M704 480v-186.24c141.44 0 256-109.312 256-244.288 0-28.608-5.12-56.064-14.592-81.472-35.136 94.912-129.92 162.944-241.408 162.944v-186.24l-320 267.648L704 480zM257.92 591.616c42.24-2.752 78.976-32 90.944-72.768 8.064-27.328 4.608-53.504-10.24-77.888-3.904-6.4-2.752-9.28 2.944-13.44l85.312-61.824c-9.408-11.2-18.112-23.04-25.92-35.52-30.784 22.4-61.568 44.928-92.352 67.456-5.952 4.352-10.432 5.312-17.472 1.92-16.32-7.616-34.048-10.496-51.968-7.936-7.744 1.152-10.944-1.344-14.464-7.232a8896 8896 0 0 0-64.64-108.608c-4.032-6.656-4.224-10.624 1.152-17.408 24.064-30.272 27.136-63.36 9.024-97.28a89.6 89.6 0 0 0-89.024-45.568c-38.272 4.992-64.768 25.536-76.8 61.632-20.864 62.912 35.456 124.928 102.4 112.832 7.488-1.408 10.944 0.64 14.528 6.784 20.16 34.56 40.576 69.12 61.44 103.36 4.608 7.424 4.48 11.328-2.56 17.536a97.28 97.28 0 0 0-24.96 113.856c17.472 39.104 58.24 62.976 102.72 60.096zM885.376 800c71.936 0.192 132.48-53.76 138.24-123.2 5.76-70.464-44.416-132.032-116.8-143.68-16.64-2.688-33.024-2.368-49.28 1.28-6.4 1.408-8.768-0.448-11.52-5.12l-45.248-76.224a317.632 317.632 0 0 1-42.56 15.232l45.056 75.392c4.48 7.616 4.736 11.328-3.008 17.216a131.2 131.2 0 0 0-44.544 148.864c18.944 53.568 71.488 90.112 129.664 90.24z" horiz-adv-x="1024" />
<glyph glyph-name="shezhifenxixian" unicode="&#59440;" d="M160 832a32 32 0 0 0 32-32V640h128v-64H192v-256h128v-64H192v-192h736a32 32 0 1 0 0-64H192v-32a32 32 0 1 0-64 0V0h-32a32 32 0 1 0 0 64H128V800a32 32 0 0 0 32 32zM512 320v-64H384V320h128z m192 0v-64H576V320h128z m192 0v-64h-128V320h128zM512 640v-64H384V640h128z m192 0v-64H576V640h128z m192 0v-64h-128V640h128z" horiz-adv-x="1024" />
<glyph glyph-name="shezhizhizhou" unicode="&#59441;" d="M384 256h544a32 32 0 1 0 0-64H896v-128h-64v128h-64v-128h-64v128h-64v-128H576v128H512v-128H448v128H384v-160a32 32 0 1 0-64 0V192H160a32 32 0 1 0 0 64H320V320H192V384h128V448H192V512h128V576H192V640h128V704H192V768h128v32a32 32 0 0 0 64 0V256z" horiz-adv-x="1024" />
<glyph glyph-name="guanliyuan" unicode="&#59439;" d="M849.972205 320.354741l4.221398-0.639605c40.295168-10.361615 77.008543-32.172174 105.982688-62.873255 6.076256-6.460019 6.971704-16.43787 2.1107-23.985219a39.143878 39.143878 0 0 1-1.279212-40.423089c7.099625-12.728156 20.595308-20.147584 34.730597-19.188175a18.548569 18.548569 0 0 0 19.188176-13.815487 236.973965 236.973965 0 0 0 0-125.810469 18.740451 18.740451 0 0 0-19.188176-13.943407 36.585454 36.585454 0 0 1-34.666636-19.124215 39.079917 39.079917 0 0 1 1.279211-40.423089 19.571939 19.571939 0 0 0-2.17466-23.985219 221.943227 221.943227 0 0 0-105.982688-62.937215 18.548569 18.548569 0 0 0-21.234914 10.105772 37.033178 37.033178 0 0 1-66.902771 0 18.420648 18.420648 0 0 0-21.234914-10.105772 221.879267 221.879267 0 0 0-105.982688 62.937215 19.571939 19.571939 0 0 0-2.110699 23.985219 39.015956 39.015956 0 0 1 1.215251 40.423089 37.097139 37.097139 0 0 1-34.730598 19.188175 18.676491 18.676491 0 0 0-19.124214 13.879447 235.822674 235.822674 0 0 0 0 125.746509 18.420648 18.420648 0 0 0 19.188175 13.943407c14.071329-1.023369 27.567012 6.396058 34.666637 19.124215a39.079917 39.079917 0 0 1-1.279212 40.423089 19.571939 19.571939 0 0 0 2.17466 23.985219 222.071149 222.071149 0 0 0 105.982688 62.937215 18.484609 18.484609 0 0 0 21.234914-10.105772c6.268137-13.11192 19.252136-21.426796 33.451386-21.362835a37.097139 37.097139 0 0 1 33.451385 21.362835 18.740451 18.740451 0 0 0 12.792117 10.233693L850.036165 320.354741zM495.694528 864.019708a287.822629 287.822629 0 0 0 13.559644-575.325456L495.694528 288.374449a351.783214 351.783214 0 0 1-351.783213-351.783213 31.980292 31.980292 0 1 0-63.960585 0c0 179.089636 113.210234 331.763551 272.088326 390.287485A287.822629 287.822629 0 0 0 495.694528 864.019708z m354.405598-614.533294a63.704742 63.704742 0 0 0-101.185645 0 160.349185 160.349185 0 0 1-57.308683-34.027031c7.227546-18.868372 5.692492-40.039326-4.221399-57.564526-9.785969-17.589161-26.863445-29.54979-46.371423-32.555937-4.477241-22.386205-4.477241-45.539936 0-67.990101 19.507978-3.006147 36.585454-15.030737 46.371423-32.619898 9.913891-17.46124 11.512905-38.632193 4.221399-57.500565 16.629752-15.28658 36.13773-26.863445 57.308683-34.027031a63.704742 63.704742 0 0 0 101.185645 0c21.170953 7.163585 40.678932 18.740451 57.244723 34.027031a67.798219 67.798219 0 0 0 4.285359 57.564525c9.785969 17.5252 26.863445 29.54979 46.371423 32.555938 4.477241 22.386205 4.477241 45.603897 0 67.990101a64.280387 64.280387 0 0 0-46.371423 32.619898 67.926141 67.926141 0 0 0-4.285359 57.500565c-16.565791 15.28658-36.07377 26.863445-57.244723 34.027031zM799.507304 160.453281a63.960584 63.960584 0 1 0 0-127.921169 63.960584 63.960584 0 0 0 0 127.921169z m-303.812776 639.605843a223.862045 223.862045 0 1 1 0-447.72409 223.862045 223.862045 0 0 1 0 447.72409z" horiz-adv-x="1024" /> <glyph glyph-name="guanliyuan" unicode="&#59439;" d="M849.972205 320.354741l4.221398-0.639605c40.295168-10.361615 77.008543-32.172174 105.982688-62.873255 6.076256-6.460019 6.971704-16.43787 2.1107-23.985219a39.143878 39.143878 0 0 1-1.279212-40.423089c7.099625-12.728156 20.595308-20.147584 34.730597-19.188175a18.548569 18.548569 0 0 0 19.188176-13.815487 236.973965 236.973965 0 0 0 0-125.810469 18.740451 18.740451 0 0 0-19.188176-13.943407 36.585454 36.585454 0 0 1-34.666636-19.124215 39.079917 39.079917 0 0 1 1.279211-40.423089 19.571939 19.571939 0 0 0-2.17466-23.985219 221.943227 221.943227 0 0 0-105.982688-62.937215 18.548569 18.548569 0 0 0-21.234914 10.105772 37.033178 37.033178 0 0 1-66.902771 0 18.420648 18.420648 0 0 0-21.234914-10.105772 221.879267 221.879267 0 0 0-105.982688 62.937215 19.571939 19.571939 0 0 0-2.110699 23.985219 39.015956 39.015956 0 0 1 1.215251 40.423089 37.097139 37.097139 0 0 1-34.730598 19.188175 18.676491 18.676491 0 0 0-19.124214 13.879447 235.822674 235.822674 0 0 0 0 125.746509 18.420648 18.420648 0 0 0 19.188175 13.943407c14.071329-1.023369 27.567012 6.396058 34.666637 19.124215a39.079917 39.079917 0 0 1-1.279212 40.423089 19.571939 19.571939 0 0 0 2.17466 23.985219 222.071149 222.071149 0 0 0 105.982688 62.937215 18.484609 18.484609 0 0 0 21.234914-10.105772c6.268137-13.11192 19.252136-21.426796 33.451386-21.362835a37.097139 37.097139 0 0 1 33.451385 21.362835 18.740451 18.740451 0 0 0 12.792117 10.233693L850.036165 320.354741zM495.694528 864.019708a287.822629 287.822629 0 0 0 13.559644-575.325456L495.694528 288.374449a351.783214 351.783214 0 0 1-351.783213-351.783213 31.980292 31.980292 0 1 0-63.960585 0c0 179.089636 113.210234 331.763551 272.088326 390.287485A287.822629 287.822629 0 0 0 495.694528 864.019708z m354.405598-614.533294a63.704742 63.704742 0 0 0-101.185645 0 160.349185 160.349185 0 0 1-57.308683-34.027031c7.227546-18.868372 5.692492-40.039326-4.221399-57.564526-9.785969-17.589161-26.863445-29.54979-46.371423-32.555937-4.477241-22.386205-4.477241-45.539936 0-67.990101 19.507978-3.006147 36.585454-15.030737 46.371423-32.619898 9.913891-17.46124 11.512905-38.632193 4.221399-57.500565 16.629752-15.28658 36.13773-26.863445 57.308683-34.027031a63.704742 63.704742 0 0 0 101.185645 0c21.170953 7.163585 40.678932 18.740451 57.244723 34.027031a67.798219 67.798219 0 0 0 4.285359 57.564525c9.785969 17.5252 26.863445 29.54979 46.371423 32.555938 4.477241 22.386205 4.477241 45.603897 0 67.990101a64.280387 64.280387 0 0 0-46.371423 32.619898 67.926141 67.926141 0 0 0-4.285359 57.500565c-16.565791 15.28658-36.07377 26.863445-57.244723 34.027031zM799.507304 160.453281a63.960584 63.960584 0 1 0 0-127.921169 63.960584 63.960584 0 0 0 0 127.921169z m-303.812776 639.605843a223.862045 223.862045 0 1 1 0-447.72409 223.862045 223.862045 0 0 1 0 447.72409z" horiz-adv-x="1024" />
@ -359,7 +371,7 @@ Created by iconfont
<glyph glyph-name="queshizhitianchong" unicode="&#59330;" d="M960 704h-64V768H64v-768h832v64h64v-64a64 64 0 0 0-64-64H64a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h832a64 64 0 0 0 64-64v-64zM226.496 170.49599999999998V504L128 484.992v61.056l119.232 24.192h52.992v-399.744H226.496z m149.12 0v67.968c150.336 119.808 188.352 165.888 188.352 215.424 0 48.384-32.832 61.632-74.88 61.632-25.92 0-55.296-3.456-88.128-13.248v61.056C430.336 571.9680000000001 464.896 576 501.76 576c84.672 0 135.936-35.712 135.936-113.472 0-67.968-27.648-111.168-148.608-207.36l-24.768-19.584v-4.608h185.472v-60.48H375.616z m436.608-5.76a476.16 476.16 0 0 0-91.008 7.488v62.784c30.528-6.912 57.024-9.792 87.552-9.792 51.84 0 92.736 13.248 92.736 61.632 0 47.808-37.44 61.632-103.68 61.632h-31.104v55.872h30.528c60.48 0 96.768 17.28 96.768 59.328 0 39.744-28.224 52.992-77.184 52.992-23.616 0-55.872-4.608-78.912-11.52V564.48c19.008 6.336 54.144 11.52 86.976 11.52 86.976 0 140.544-28.8 140.544-107.712 0-46.08-22.464-73.728-66.816-88.128v-3.456c52.416-9.792 77.184-43.776 77.184-94.464 0-78.336-54.72-117.504-163.584-117.504z" horiz-adv-x="1024" /> <glyph glyph-name="queshizhitianchong" unicode="&#59330;" d="M960 704h-64V768H64v-768h832v64h64v-64a64 64 0 0 0-64-64H64a64 64 0 0 0-64 64V768a64 64 0 0 0 64 64h832a64 64 0 0 0 64-64v-64zM226.496 170.49599999999998V504L128 484.992v61.056l119.232 24.192h52.992v-399.744H226.496z m149.12 0v67.968c150.336 119.808 188.352 165.888 188.352 215.424 0 48.384-32.832 61.632-74.88 61.632-25.92 0-55.296-3.456-88.128-13.248v61.056C430.336 571.9680000000001 464.896 576 501.76 576c84.672 0 135.936-35.712 135.936-113.472 0-67.968-27.648-111.168-148.608-207.36l-24.768-19.584v-4.608h185.472v-60.48H375.616z m436.608-5.76a476.16 476.16 0 0 0-91.008 7.488v62.784c30.528-6.912 57.024-9.792 87.552-9.792 51.84 0 92.736 13.248 92.736 61.632 0 47.808-37.44 61.632-103.68 61.632h-31.104v55.872h30.528c60.48 0 96.768 17.28 96.768 59.328 0 39.744-28.224 52.992-77.184 52.992-23.616 0-55.872-4.608-78.912-11.52V564.48c19.008 6.336 54.144 11.52 86.976 11.52 86.976 0 140.544-28.8 140.544-107.712 0-46.08-22.464-73.728-66.816-88.128v-3.456c52.416-9.792 77.184-43.776 77.184-94.464 0-78.336-54.72-117.504-163.584-117.504z" horiz-adv-x="1024" />
<glyph glyph-name="xinshouyindao" unicode="&#59329;" d="M898.752 654.912C843.136 687.488 780.416 704 712.384 704a451.904 451.904 0 0 1-176.256-36.992v-485.824a25.6 25.6 0 0 0-26.112-24.96 25.6 25.6 0 0 0-26.112 24.96V666.88A451.84 451.84 0 0 1 307.648 704c-68.032 0-130.752-16.512-186.368-49.088a54.272 54.272 0 0 1-27.264-46.4v-537.984c0-19.648 11.2-37.824 29.184-47.488 17.728-9.472 40.32-9.024 57.728 1.088a246.976 246.976 0 0 0 126.72 33.024c57.216 0 118.4-17.408 172.544-49.024a59.008 59.008 0 0 1 59.648 0c54.08 31.616 115.392 49.024 172.544 49.024 46.72 0 89.344-11.072 126.784-33.024 17.28-10.112 39.872-10.56 57.728-1.024a54.016 54.016 0 0 1 29.12 47.424V608.448a54.272 54.272 0 0 1-27.264 46.4v0.064z" horiz-adv-x="1024" /> <glyph glyph-name="xinshouyindao" unicode="&#59329;" d="M512 832a448 448 0 1 0 0-896A448 448 0 0 0 512 832z m0-688a48 48 0 1 1 0-96 48 48 0 0 1 0 96z m0 550.144a206.08 206.08 0 0 1-206.72-205.376v-0.064c0-22.656 18.432-41.088 41.28-41.088a41.216 41.216 0 0 1 41.408 41.088C387.968 556.8 443.52 611.9680000000001 512 611.9680000000001c68.48 0 124.032-55.168 124.032-123.264A123.648 123.648 0 0 0 512 365.44000000000005a41.216 41.216 0 0 1-41.344-41.024v-82.304c0-22.656 18.56-40.96 41.344-40.96a41.152 41.152 0 0 1 41.344 40.96V287.36a205.824 205.824 0 0 1 165.44 201.344c0 113.472-92.608 205.44-206.784 205.44z" horiz-adv-x="1024" />
<glyph glyph-name="gou" unicode="&#59328;" d="M1222.434595 874.025514L514.490811 365.152865a110.702703 110.702703 0 0 0-126.311784-2.048l-225.28 151.109189a103.119568 103.119568 0 0 1-130.629189-12.92454 95.647135 95.647135 0 0 1-7.001946-126.920649l349.322378-439.406703a110.702703 110.702703 0 0 1 165.168433-9.132973l811.727567 816.819892a85.600865 85.600865 0 0 1 0 120.665946 99.798486 99.798486 0 0 1-129.024 10.710487z" horiz-adv-x="1383" /> <glyph glyph-name="gou" unicode="&#59328;" d="M1222.434595 874.025514L514.490811 365.152865a110.702703 110.702703 0 0 0-126.311784-2.048l-225.28 151.109189a103.119568 103.119568 0 0 1-130.629189-12.92454 95.647135 95.647135 0 0 1-7.001946-126.920649l349.322378-439.406703a110.702703 110.702703 0 0 1 165.168433-9.132973l811.727567 816.819892a85.600865 85.600865 0 0 1 0 120.665946 99.798486 99.798486 0 0 1-129.024 10.710487z" horiz-adv-x="1383" />

Before

Width:  |  Height:  |  Size: 357 KiB

After

Width:  |  Height:  |  Size: 360 KiB

BIN
dist/font/iconfont.ttf vendored

Binary file not shown.

BIN
dist/font/iconfont.woff vendored

Binary file not shown.

BIN
dist/font/iconfont.woff2 vendored

Binary file not shown.

5
src/base/single/single.js

@ -200,12 +200,11 @@ BI.Single = BI.inherit(BI.Widget, {
return this.options.value; return this.options.value;
}, },
_unMount: function () { destroyed: function () {
BI.Single.superclass._unMount.apply(this, arguments);
if (BI.isNotNull(this.showTimeout)) { if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout); clearTimeout(this.showTimeout);
this.showTimeout = null; this.showTimeout = null;
} }
BI.Tooltips.remove(this.getName()); BI.Tooltips.remove(this.getName());
} },
}); });

1
src/core/widget.js

@ -486,6 +486,7 @@
destroy: function () { destroy: function () {
this.__d(); this.__d();
this.element.destroy(); this.element.destroy();
this.fireEvent(BI.Events.UNMOUNT);
this.fireEvent(BI.Events.DESTROY); this.fireEvent(BI.Events.DESTROY);
this._purgeRef(); this._purgeRef();
this.purgeListeners(); this.purgeListeners();

10
src/less/base/view/popupview.less

@ -3,6 +3,10 @@
/**********BI.BIListView*************/ /**********BI.BIListView*************/
.bi-popup-view { .bi-popup-view {
position: fixed !important; position: fixed !important;
// -ms-device-fixed >= IE11
// 与fixed表现形式一致,区别在于浏览器缩放的时候,-ms-device-fixed的元素不受其影响,而fixed的元素受其影响
// 最重要的是-ms-device-fixed解决了IE11下的残影问题
position: -ms-device-fixed !important;
overflow-y: visible !important; overflow-y: visible !important;
overflow-x: visible !important; overflow-x: visible !important;
overflow: visible !important; overflow: visible !important;
@ -43,9 +47,3 @@
.box-shadow(0 1px 5px 0, fade(@background-color-normal-theme-dark, 80)); .box-shadow(0 1px 5px 0, fade(@background-color-normal-theme-dark, 80));
} }
} }
.hack {
.bi-popup-view {
position: -ms-page !important;
}
}

1
src/less/lib/constant.less

@ -9,6 +9,7 @@
@font-size-15: 15px; @font-size-15: 15px;
@font-size-16: 16px; @font-size-16: 16px;
@font-size-18: 18px; @font-size-18: 18px;
@font-size-20: 20px;
@font-size-22: 22px; @font-size-22: 22px;
@font-size-24: 24px; @font-size-24: 24px;
@font-size-30: 30px; @font-size-30: 30px;

Loading…
Cancel
Save