Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi into main

陈鑫涛
2 parents e1f1415b 2ecb99fe
Showing 16 changed files with 146 additions and 23 deletions
src/assets/index/AS.svg
src/assets/index/attendanceSystem.svg
src/assets/index/crm.svg
src/assets/index/default-app.svg
src/assets/index/financialSystem.svg
src/assets/index/kaoqin.svg
src/assets/index/oa.svg
src/assets/index/工作计划.svg
src/assets/index/建议提案管理.svg
src/assets/index/考勤管理.svg
src/assets/index/财务系统.svg
src/components/Common/CommonListSelect/index.js
src/components/Common/CommonView/index.js
src/components/Common/InstructSetSetting/index.js
src/components/Common/PersonCenter/MenuSearchPopovor.js
src/components/IndexCenter/IndexCenter.js
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755673720950" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="44153" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M0 0m219.428571 0l585.142858 0q219.428571 0 219.428571 219.428571l0 585.142858q0 219.428571-219.428571 219.428571l-585.142858 0q-219.428571 0-219.428571-219.428571l0-585.142858q0-219.428571 219.428571-219.428571Z" fill="#007AFF" p-id="44154"></path><path d="M768 457.142857v256a36.571429 36.571429 0 0 1-36.571429 36.571429H292.571429a36.571429 36.571429 0 0 1-36.571429-36.571429V457.142857h512z m-140.928 41.929143l-135.68 135.68-97.243429-64.822857a18.285714 18.285714 0 1 0-20.297142 30.427428l109.714285 73.142858a18.285714 18.285714 0 0 0 23.076572-2.285715l146.285714-146.285714a18.285714 18.285714 0 0 0-25.856-25.856zM329.142857 310.857143v18.285714a54.857143 54.857143 0 0 0 109.622857 3.218286L438.857143 329.142857v-18.285714h146.285714v18.285714a54.857143 54.857143 0 0 0 51.638857 54.765714L640 384a54.857143 54.857143 0 0 0 54.765714-51.638857L694.857143 329.142857v-18.285714h36.571428a36.571429 36.571429 0 0 1 36.571429 36.571428v73.142858H256v-73.142858a36.571429 36.571429 0 0 1 36.571429-36.571428h36.571428z" fill="#FFFFFF" p-id="44155"></path><path d="M365.714286 256m18.285714 0l0 0q18.285714 0 18.285714 18.285714l0 54.857143q0 18.285714-18.285714 18.285714l0 0q-18.285714 0-18.285714-18.285714l0-54.857143q0-18.285714 18.285714-18.285714Z" fill="#FFFFFF" p-id="44156"></path><path d="M621.714286 256m18.285714 0l0 0q18.285714 0 18.285714 18.285714l0 54.857143q0 18.285714-18.285714 18.285714l0 0q-18.285714 0-18.285714-18.285714l0-54.857143q0-18.285714 18.285714-18.285714Z" fill="#FFFFFF" p-id="44157"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755673225977" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="23957" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M173.820116 0h668.629521c60.369545 0 82.308721 6.257819 104.321518 18.110863 22.086419 11.779423 39.387447 29.154073 51.240492 51.240492 11.779423 22.086419 18.110863 43.951974 18.110864 104.321519v668.62952c0 60.369545-6.257819 82.308721-18.110864 104.321519-11.779423 22.086419-29.154073 39.387447-51.240492 51.240491-22.086419 11.779423-43.951974 18.110863-104.321518 18.110864H173.820116c-60.369545 0-82.308721-6.257819-104.321518-18.110864-22.086419-11.779423-39.387447-29.154073-51.240492-51.240491-11.779423-22.086419-18.110863-43.951974-18.110863-104.321519V173.672874c0-60.369545 6.257819-82.308721 18.110863-104.321519 11.779423-22.086419 29.154073-39.387447 51.240492-51.240492 22.012797-11.853045 43.951974-18.110863 104.321518-18.110863z" fill="#36ab60" p-id="23958"></path><path d="M451.88813 498.784959h88.05119v88.05119H451.88813zM676.50701 530.515781c-79.511108 0-144.003451 63.608886-144.003451 142.015673 0 78.480408 64.492343 142.015673 144.003451 142.015674s144.003451-63.608886 144.003451-142.015674c0-78.406787-64.492343-142.015673-144.003451-142.015673z m19.730534 219.980732a19.656913 19.656913 0 1 1-39.313826 0V659.13236a19.656913 19.656913 0 1 1 39.313826 0v91.364153z m0-151.586455a19.656913 19.656913 0 1 1-39.313826 0v-4.343662a19.656913 19.656913 0 1 1 39.313826 0v4.343662z" fill="#ffffff" p-id="23959"></path><path d="M531.178374 770.816018H241.183694l-0.073621-0.073621V451.520023l0.073621-0.073621h509.533683v63.461643c16.712057 7.656625 32.025307 17.816378 45.35078 30.03753V318.633403c0.073621-24.884032-20.319505-45.277159-45.203537-45.277159h-90.554317v-50.872385c0-12.589259-10.086131-22.67539-22.67539-22.67539s-22.67539 10.086131-22.67539 22.67539v50.872385H377.088791v-50.872385c0-12.589259-10.086131-22.67539-22.67539-22.67539s-22.67539 10.086131-22.67539 22.67539v50.872385H241.110073c-24.957653 0-45.277159 20.319505-45.277159 45.277159v452.182615c0 24.957653 20.319505 45.277159 45.277159 45.277159h336.155295a176.190725 176.190725 0 0 1-46.086994-45.277159z" fill="#ffffff" p-id="23960"></path><path d="M300.375297 632.923143h88.051189v88.05119H300.375297zM300.375297 498.784959h88.051189v88.05119H300.375297z" fill="#ffffff" p-id="23961"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755673378385" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="38904" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M535.405714 454.948571c-4.388571-1.462857-13.165714-2.925714-27.794285-2.925714h-36.571429v55.588572h36.571429c10.24 0 17.554286-1.462857 24.868571-2.925715 5.851429-1.462857 11.702857-4.388571 14.628571-8.777143 2.925714-4.388571 5.851429-10.24 5.851429-16.091428 0-5.851429-1.462857-10.24-4.388571-14.628572-4.388571-5.851429-7.314286-8.777143-13.165715-10.24z" fill="#4EA8EC" p-id="38905"></path><path d="M848.457143 0H175.542857C78.994286 0 0 78.994286 0 175.542857v672.914286c0 96.548571 78.994286 175.542857 175.542857 175.542857h672.914286c96.548571 0 175.542857-78.994286 175.542857-175.542857V175.542857c0-96.548571-78.994286-175.542857-175.542857-175.542857zM519.314286 248.685714c95.085714 0 182.857143 51.2 231.131428 136.045715h-39.497143c-43.885714-62.902857-114.102857-100.937143-190.171428-100.937143s-147.748571 38.034286-190.171429 100.937143h-39.497143C336.457143 299.885714 424.228571 248.685714 519.314286 248.685714z m42.422857 299.885715c5.851429 7.314286 11.702857 16.091429 17.554286 23.405714 4.388571 8.777143 8.777143 16.091429 11.702857 23.405714 2.925714 7.314286 4.388571 11.702857 4.388571 14.628572 0 2.925714-1.462857 5.851429-2.925714 7.314285-1.462857 2.925714-4.388571 4.388571-7.314286 5.851429-2.925714 1.462857-5.851429 2.925714-10.24 2.925714-4.388571 0-7.314286-1.462857-11.702857-2.925714-2.925714-2.925714-5.851429-4.388571-7.314286-8.777143-2.925714-4.388571-5.851429-10.24-8.777143-14.628571l-16.091428-27.794286c-4.388571-8.777143-10.24-16.091429-16.091429-23.405714-4.388571-4.388571-8.777143-8.777143-13.165714-10.24-5.851429-1.462857-11.702857-2.925714-17.554286-2.925715h-14.628571V599.771429c0 8.777143-1.462857 14.628571-5.851429 19.017142-4.388571 4.388571-8.777143 5.851429-14.628571 5.851429s-11.702857-1.462857-14.628572-5.851429c-2.925714-4.388571-5.851429-10.24-5.851428-19.017142V446.171429c0-8.777143 1.462857-14.628571 5.851428-19.017143 4.388571-4.388571 10.24-5.851429 19.017143-5.851429h65.828572c8.777143 0 16.091429 0 23.405714 1.462857l17.554286 4.388572c13.165714 5.851429 21.942857 16.091429 27.794285 27.794285 2.925714 5.851429 4.388571 13.165714 4.388572 20.48 0 14.628571-4.388571 26.331429-13.165714 36.571429-8.777143 8.777143-20.48 14.628571-38.034286 19.017143 7.314286 4.388571 14.628571 10.24 20.48 17.554286zM263.314286 612.937143c-7.314286-4.388571-13.165714-10.24-19.017143-16.091429-5.851429-5.851429-10.24-13.165714-13.165714-20.48-4.388571-7.314286-5.851429-16.091429-8.777143-24.868571-1.462857-10.24-2.925714-20.48-2.925715-29.257143 0-16.091429 2.925714-30.72 7.314286-43.885714 4.388571-13.165714 11.702857-23.405714 20.48-32.182857 8.777143-8.777143 19.017143-16.091429 30.72-20.48 11.702857-4.388571 23.405714-7.314286 36.571429-7.314286 16.091429 0 30.72 2.925714 42.422857 10.24 13.165714 5.851429 21.942857 14.628571 29.257143 23.405714 7.314286 10.24 10.24 19.017143 10.24 27.794286 0 4.388571-1.462857 8.777143-4.388572 11.702857-2.925714 2.925714-7.314286 5.851429-11.702857 5.851429-5.851429 0-8.777143-1.462857-11.702857-4.388572l-8.777143-13.165714c-5.851429-10.24-11.702857-17.554286-19.017143-21.942857-7.314286-4.388571-16.091429-7.314286-26.331428-7.314286-16.091429 0-29.257143 5.851429-39.497143 19.017143-10.24 13.165714-14.628571 30.72-14.628572 54.125714 0 16.091429 1.462857 29.257143 5.851429 39.497143 4.388571 10.24 10.24 17.554286 19.017143 23.405714 7.314286 4.388571 17.554286 7.314286 27.794286 7.314286 11.702857 0 21.942857-2.925714 29.257142-8.777143 7.314286-5.851429 14.628571-14.628571 17.554286-24.868571 1.462857-4.388571 2.925714-8.777143 5.851429-13.165715 2.925714-2.925714 7.314286-4.388571 11.702857-4.388571 4.388571 0 8.777143 1.462857 11.702857 4.388571 2.925714 2.925714 5.851429 7.314286 5.851429 13.165715s-1.462857 13.165714-4.388572 20.48c-2.925714 7.314286-7.314286 14.628571-14.628571 21.942857s-16.091429 13.165714-24.868572 17.554286c-11.702857 4.388571-23.405714 7.314286-36.571428 7.314285-10.24 0-19.017143-1.462857-27.794286-2.925714-8.777143-4.388571-16.091429-7.314286-23.405714-11.702857zM519.314286 789.942857C424.228571 789.942857 336.457143 738.742857 288.182857 655.36h39.497143c43.885714 62.902857 114.102857 100.937143 190.171429 100.937143 78.994286 0 149.211429-39.497143 190.171428-100.937143h39.497143C702.171429 738.742857 614.4 789.942857 519.314286 789.942857zM819.2 602.697143c0 7.314286-1.462857 13.165714-4.388571 17.554286-2.925714 4.388571-8.777143 5.851429-13.165715 5.851428-4.388571 0-10.24-1.462857-13.165714-5.851428-2.925714-4.388571-5.851429-10.24-5.851429-17.554286v-138.971429l-32.182857 127.268572-4.388571 17.554285c-1.462857 4.388571-4.388571 7.314286-7.314286 10.24-2.925714 2.925714-8.777143 4.388571-14.628571 4.388572-4.388571 0-8.777143-1.462857-11.702857-2.925714-2.925714-1.462857-5.851429-4.388571-7.314286-7.314286-1.462857-2.925714-2.925714-7.314286-4.388572-10.24-1.462857-4.388571-1.462857-8.777143-2.925714-11.702857l-32.182857-127.268572v138.971429c0 7.314286-1.462857 13.165714-4.388571 17.554286-2.925714 4.388571-8.777143 5.851429-13.165715 5.851428-4.388571 0-10.24-1.462857-13.165714-5.851428-2.925714-4.388571-5.851429-10.24-5.851429-17.554286V443.245714c0-8.777143 2.925714-14.628571 7.314286-17.554285 4.388571-2.925714 10.24-4.388571 17.554286-4.388572h11.702857c7.314286 0 13.165714 0 16.091429 1.462857 2.925714 1.462857 5.851429 4.388571 7.314285 7.314286 1.462857 2.925714 2.925714 8.777143 5.851429 17.554286l29.257143 109.714285 29.257143-109.714285c1.462857-7.314286 4.388571-13.165714 5.851428-17.554286 1.462857-2.925714 4.388571-5.851429 7.314286-7.314286 2.925714-1.462857 8.777143-1.462857 16.091428-1.462857h11.702858c7.314286 0 13.165714 1.462857 17.554285 4.388572 4.388571 2.925714 7.314286 8.777143 7.314286 17.554285v159.451429z" fill="#4EA8EC" p-id="38906"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755671693574" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8416" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M0 0m273.066667 0l477.866666 0q273.066667 0 273.066667 273.066667l0 477.866666q0 273.066667-273.066667 273.066667l-477.866666 0q-273.066667 0-273.066667-273.066667l0-477.866666q0-273.066667 273.066667-273.066667Z" fill="#5193F3" p-id="8417"></path><path d="M273.066667 802.133333a17.066667 17.066667 0 0 1-17.066667-17.066666v-153.6a34.133333 34.133333 0 0 1 34.133333-34.133334h157.4912a70.126933 70.126933 0 0 0 64.375467 34.133334 70.126933 70.126933 0 0 0 64.375467-34.133334H733.866667a34.133333 34.133333 0 0 1 34.133333 34.133334v153.6a17.066667 17.066667 0 0 1-17.066667 17.066666z m188.757333-238.933333H307.2V256a17.066667 17.066667 0 0 1 17.066667-17.066667h307.2a17.066667 17.066667 0 0 1 17.066666 17.066667v307.2h-86.357333a49.954133 49.954133 0 0 1-50.176 34.133333 49.9712 49.9712 0 0 1-50.176-34.133333z m-69.290667-102.4a17.066667 17.066667 0 0 0 17.066667 17.066667h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066667 17.066667 17.066667 0 0 0-17.066667-17.066667h-136.533333a17.066667 17.066667 0 0 0-17.066667 17.066667z m0-68.266667a17.066667 17.066667 0 0 0 17.066667 17.066667h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066667 17.066667 17.066667 0 0 0-17.066667-17.066666h-136.533333a17.066667 17.066667 0 0 0-17.066667 17.066666z m0-68.266666a17.066667 17.066667 0 0 0 17.066667 17.066666h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066666 17.066667 17.066667 0 0 0-17.066667-17.066667h-136.533333a17.066667 17.066667 0 0 0-17.066667 17.066667z m336.452267 238.933333H682.666667V323.1744l102.024533 37.137067a16.930133 16.930133 0 0 1 9.6256 8.823466 16.964267 16.964267 0 0 1 0.580267 13.056L729.002667 563.2z" fill="#FFFFFF" p-id="8418"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755673065760" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10017" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M21.333333 21.333333m256 0l469.333334 0q256 0 256 256l0 469.333334q0 256-256 256l-469.333334 0q-256 0-256-256l0-469.333334q0-256 256-256Z" fill="#4D6DF0" p-id="10018"></path><path d="M275.157333 460.714667h409.6v244.053333a42.666667 42.666667 0 0 1-42.666666 42.666667h-324.266667a42.666667 42.666667 0 0 1-42.666667-42.666667v-244.053333z" fill="#FFFFFF" p-id="10019"></path><path d="M380.970667 481.194667h365.226666v223.573333a42.666667 42.666667 0 0 1-42.666666 42.666667h-365.226667a42.666667 42.666667 0 0 1-42.666667-42.666667v-138.24a85.333333 85.333333 0 0 1 85.333334-85.333333z" fill="#FFFFFF" opacity=".5" p-id="10020"></path><path d="M225.002667 464.576L460.373333 249.941333a21.333333 21.333333 0 0 1 28.373334-0.32L735.146667 464.213333a21.333333 21.333333 0 0 1-14.016 37.44H239.36a21.333333 21.333333 0 0 1-14.378667-37.098666z" fill="#FFFFFF" p-id="10021"></path><path d="M286.442667 444.096L521.813333 229.461333a21.333333 21.333333 0 0 1 28.373334-0.32L796.586667 443.733333a21.333333 21.333333 0 0 1-14.016 37.44H300.8a21.333333 21.333333 0 0 1-14.378667-37.098666z" fill="#FFFFFF" opacity=".5" p-id="10022"></path><path d="M368.64 512m20.48 0l163.84 0q20.48 0 20.48 20.48l0 0q0 20.48-20.48 20.48l-163.84 0q-20.48 0-20.48-20.48l0 0q0-20.48 20.48-20.48Z" fill="#4D6DF0" p-id="10023"></path><path d="M491.52 512v163.84a20.48 20.48 0 1 1-40.96 0V512a20.48 20.48 0 1 1 40.96 0z" fill="#4D6DF0" p-id="10024"></path><path d="M412.074667 424.085333l72.426666 72.405334A20.48 20.48 0 1 1 455.530667 525.44L383.125333 453.034667A20.48 20.48 0 1 1 412.074667 424.106667z" fill="#4D6DF0" p-id="10025"></path><path d="M532.8 424.085333L460.394667 496.490667A20.48 20.48 0 1 0 489.365333 525.44l72.405334-72.426667A20.48 20.48 0 1 0 532.8 424.106667z" fill="#4D6DF0" p-id="10026"></path><path d="M368.64 593.92m20.48 0l163.84 0q20.48 0 20.48 20.48l0 0q0 20.48-20.48 20.48l-163.84 0q-20.48 0-20.48-20.48l0 0q0-20.48 20.48-20.48Z" fill="#4D6DF0" p-id="10027"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755673581977" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="40950" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M810.581333 0A213.333333 213.333333 0 0 1 1024 213.418667v597.162666A213.333333 213.333333 0 0 1 810.581333 1024H213.418667A213.333333 213.333333 0 0 1 0 810.581333V213.418667A213.333333 213.333333 0 0 1 213.418667 0h597.162666zM594.709333 315.904a132.736 132.736 0 0 0-255.061333 51.498667 132.501333 132.501333 0 0 0 55.530667 107.989333c-87.68 31.04-150.357333 113.408-150.357334 210.133333 1.92 62.314667 154.346667 88.298667 282.261334 77.866667-33.536-29.546667-56.149333-72.810667-54.72-121.024 2.133333-69.546667 38.592-120.426667 109.418666-152.682667a625.792 625.792 0 0 0-34.666666-12.565333 132.736 132.736 0 0 0 47.594666-161.216z m38.869334 203.2a123.264 123.264 0 1 0 0 246.528 123.264 123.264 0 0 0 0-246.528z m0 33.194667c7.850667 0 14.208 6.357333 14.208 14.208v75.861333a14.229333 14.229333 0 0 1-6.336 11.84l-56.874667 37.909333a14.229333 14.229333 0 1 1-15.786667-23.658666l50.56-33.706667v-68.245333c0-7.850667 6.357333-14.208 14.229334-14.208z" fill="#15BC83" p-id="40951"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755673511220" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="39912" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M0 273.066667C0 122.257067 122.257067 0 273.066667 0h477.866666c150.8096 0 273.066667 122.257067 273.066667 273.066667v477.866666c0 150.8096-122.257067 273.066667-273.066667 273.066667H273.066667c-150.8096 0-273.066667-122.257067-273.066667-273.066667V273.066667z" fill="#009CE9" p-id="39913"></path><path d="M328.093867 265.954133h367.812266a76.096 76.096 0 0 1 76.096 76.091734v228.283733a76.0832 76.0832 0 0 1-76.096 76.091733h-158.510933v82.244267h76.091733a12.740267 12.740267 0 0 1 0 25.3952H410.513067a12.7488 12.7488 0 0 1-11.690667-12.6976 12.736 12.736 0 0 1 11.690667-12.6976h76.091733v-82.244267H328.093867a76.087467 76.087467 0 0 1-76.096-76.091733V342.045867a76.091733 76.091733 0 0 1 76.096-76.091734z m351.778133 356.893867c36.488533 0 66.129067-26.952533 66.129067-60.1472v-27.387733H277.998933v27.387733c0 33.194667 29.294933 60.1472 65.7792 60.1472h336.093867z m-232.699733-287.995733c-37.0048 0-62.485333 26.436267-62.485334 71.936 0 45.239467 25.565867 72.9728 62.485334 72.9728 36.919467 0 62.4-27.648 62.4-72.9728 0-45.329067-25.390933-71.936-62.4-71.936z m0 24.008533c20.714667 0 33.975467 17.851733 33.975466 47.927467 0 29.8112-13.175467 48.878933-33.975466 48.878933s-33.9712-18.807467-33.9712-48.878933c0-30.075733 13.2608-47.927467 33.9712-47.927467z m108.16 82.4192h44.9792l9.796266 36.053333h29.205334l-44.893867-139.707733h-32.8448l-44.718933 139.707733h28.3392l10.1376-36.053333z m34.666666-37.0048l4.2496 15.338667h-33.28l4.16-15.338667c4.0704-14.472533 8.2304-30.336 11.869867-45.674667h0.695467c1.5872 5.794133 3.127467 11.712 4.663466 17.621334 2.4832 9.565867 4.9664 19.106133 7.6416 28.053333z" fill="#FFFFFF" p-id="39914"></path><path d="M690.5344 735.168v5.9776c0 8.785067-4.3904 13.175467-13.175467 13.175467H346.7264c-8.7808 0-13.1712-4.3904-13.1712-13.175467v-5.9776c0-8.785067 4.3904-13.175467 13.1712-13.175467h330.632533c8.785067 0 13.175467 4.3904 13.175467 13.175467z" fill="#FFFFFF" p-id="39915"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755671719477" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8814" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M0 0m273.066667 0l477.866666 0q273.066667 0 273.066667 273.066667l0 477.866666q0 273.066667-273.066667 273.066667l-477.866666 0q-273.066667 0-273.066667-273.066667l0-477.866666q0-273.066667 273.066667-273.066667Z" fill="#A46EFF" p-id="8815"></path><path d="M733.866667 819.2h-443.733334a17.066667 17.066667 0 0 1-17.066666-17.066667V221.866667a17.066667 17.066667 0 0 1 17.066666-17.066667h443.733334a17.066667 17.066667 0 0 1 17.066666 17.066667v580.266666a17.066667 17.066667 0 0 1-17.066666 17.066667z m-221.866667-187.733333a17.066667 17.066667 0 0 0-17.066667 17.066666 17.066667 17.066667 0 0 0 17.066667 17.066667h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066667 17.066667 17.066667 0 0 0-17.066667-17.066666z m-119.466667 0a17.066667 17.066667 0 0 0-17.066666 17.066666 17.066667 17.066667 0 0 0 17.066666 17.066667h51.2a17.066667 17.066667 0 0 0 17.066667-17.066667 17.066667 17.066667 0 0 0-17.066667-17.066666z m119.466667-85.333334a17.066667 17.066667 0 0 0-17.066667 17.066667 17.066667 17.066667 0 0 0 17.066667 17.066667h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066667 17.066667 17.066667 0 0 0-17.066667-17.066667z m-119.466667 0a17.066667 17.066667 0 0 0-17.066666 17.066667 17.066667 17.066667 0 0 0 17.066666 17.066667h51.2a17.066667 17.066667 0 0 0 17.066667-17.066667 17.066667 17.066667 0 0 0-17.066667-17.066667z m119.466667-85.333333a17.066667 17.066667 0 0 0-17.066667 17.066667 17.066667 17.066667 0 0 0 17.066667 17.066666h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066666 17.066667 17.066667 0 0 0-17.066667-17.066667z m-119.466667 0a17.066667 17.066667 0 0 0-17.066666 17.066667 17.066667 17.066667 0 0 0 17.066666 17.066666h51.2a17.066667 17.066667 0 0 0 17.066667-17.066666 17.066667 17.066667 0 0 0-17.066667-17.066667z m-9.984-96.3584a16.9472 16.9472 0 0 0-12.066133 5.000533 16.930133 16.930133 0 0 0-5.0176 12.066134 16.930133 16.930133 0 0 0 5.0176 12.066133l12.049067 12.049067 24.132266 24.149333 60.347734-60.347733a16.913067 16.913067 0 0 0 5.000533-12.049067 16.964267 16.964267 0 0 0-5.000533-12.0832 16.930133 16.930133 0 0 0-12.066134-5.000533 16.930133 16.930133 0 0 0-12.066133 5.000533l-36.215467 36.1984-12.066133-12.049067a16.9472 16.9472 0 0 0-12.066133-5.000533zM512 375.466667a17.066667 17.066667 0 0 0-17.066667 17.066666 17.066667 17.066667 0 0 0 17.066667 17.066667h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066667 17.066667 17.066667 0 0 0-17.066667-17.066666z" fill="#FFFFFF" p-id="8816"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755671693574" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8416" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M0 0m273.066667 0l477.866666 0q273.066667 0 273.066667 273.066667l0 477.866666q0 273.066667-273.066667 273.066667l-477.866666 0q-273.066667 0-273.066667-273.066667l0-477.866666q0-273.066667 273.066667-273.066667Z" fill="#5193F3" p-id="8417"></path><path d="M273.066667 802.133333a17.066667 17.066667 0 0 1-17.066667-17.066666v-153.6a34.133333 34.133333 0 0 1 34.133333-34.133334h157.4912a70.126933 70.126933 0 0 0 64.375467 34.133334 70.126933 70.126933 0 0 0 64.375467-34.133334H733.866667a34.133333 34.133333 0 0 1 34.133333 34.133334v153.6a17.066667 17.066667 0 0 1-17.066667 17.066666z m188.757333-238.933333H307.2V256a17.066667 17.066667 0 0 1 17.066667-17.066667h307.2a17.066667 17.066667 0 0 1 17.066666 17.066667v307.2h-86.357333a49.954133 49.954133 0 0 1-50.176 34.133333 49.9712 49.9712 0 0 1-50.176-34.133333z m-69.290667-102.4a17.066667 17.066667 0 0 0 17.066667 17.066667h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066667 17.066667 17.066667 0 0 0-17.066667-17.066667h-136.533333a17.066667 17.066667 0 0 0-17.066667 17.066667z m0-68.266667a17.066667 17.066667 0 0 0 17.066667 17.066667h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066667 17.066667 17.066667 0 0 0-17.066667-17.066666h-136.533333a17.066667 17.066667 0 0 0-17.066667 17.066666z m0-68.266666a17.066667 17.066667 0 0 0 17.066667 17.066666h136.533333a17.066667 17.066667 0 0 0 17.066667-17.066666 17.066667 17.066667 0 0 0-17.066667-17.066667h-136.533333a17.066667 17.066667 0 0 0-17.066667 17.066667z m336.452267 238.933333H682.666667V323.1744l102.024533 37.137067a16.930133 16.930133 0 0 1 9.6256 8.823466 16.964267 16.964267 0 0 1 0.580267 13.056L729.002667 563.2z" fill="#FFFFFF" p-id="8418"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755673191559" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17499" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M173.17647031 32h677.64705938c77.97176438 0 141.17647031 63.20470594 141.17647031 141.17647031v677.64705938c0 77.97176438-63.20470594 141.17647031-141.17647031 141.17647031H173.17647031C95.20470594 992 32 928.79529406 32 850.82352969V173.17647031C32 95.20470594 95.20470594 32 173.17647031 32z m180.80470594 242.79529406v-3.82588218c-1.1576475 0-1.60941188 0-2.07529406 0.22588218-15.8823525 0-31.90588219-0.11294156-47.78823469 0.11294157-4.95529406 0-10.02352969 0.56470594-14.86588313 1.69411687-23.60470594 5.29411781-45.71294156 23.90117625-45.48705843 55.12941188 0.56470594 78.48 0.24 157.05882375 0.24 235.53882375v176.32941187c0 16.8 6.6776475 30.33882375 20.03294156 40.82823562 12.42352969 9.68470594 26.82352969 13.52470594 42.60705844 13.52470594 137.16705844 0 274.33411781 0 411.51529406-0.11294156 6.09882375 0 12.31058813-0.56470594 18.18352969-1.92 23.39294156-5.29411781 44.80941188-24.24 44.58352875-53.78823563-0.46588219-70.68705844-0.12705844-141.48705844-0.12705844-212.18823468V325.42117625c0-12.62117625-3.7976475-24.01411781-12.42352969-33.6-12.90352969-14.2023525-29.49176438-20.51294156-48.60705843-20.75294063-15.43058812-0.09882375-30.98823563 0-46.41882375 1e-8-0.80470594 0-1.60941188 0-2.76705844 0.12705843v3.48705844c0 11.29411781-0.11294156 22.56 0 33.82588312 0 9.24705844-3.91058812 16.57411781-11.50588219 21.8823525-9.91058813 6.7623525-20.61176437 7.89176438-31.79294156 3.93882375-11.29411781-3.95294156-19.58117625-13.97647031-19.00235344-26.72470593 0.46588219-11.15294156 0.11294156-22.43294156 0.11294156-33.6 0-1.0023525-0.11294156-2.03294156-0.11294156-2.92235344H416.05647031v38.66823562c0 8.32941187-3.67058812 14.88-10.3623525 19.72235344-11.74588219 8.56941188-24.5223525 9.24705844-37.31294156 2.59764656-8.28705844-4.2776475-13.82117625-11.26588219-14.16-20.85176437-0.35294156-12.18352969-0.24-24.25411781-0.24-36.42352969z m385.51058813 92.58352969v3.72705844c0 117.74117625 0 235.60941188 0.11294156 353.33647031 0 12.70588219-8.23058813 19.77882375-16.92705844 21.19058906-2.62588219 0.38117625-5.36470594 0.50823562-8.00470594 0.50823469H308.42352969c-6.97411781 0-13.49647031-1.41176437-18.63529407-7.18588219a18.84705844 18.84705844 0 0 1-4.68705937-12.32470593V367.37882375h454.40470594z m-344.21647032-89.40705938c-0.11294156-11.85882375-0.11294156-23.84470594 0-35.83058812 0-4.34823563-1.59529406-7.6376475-4.77176437-9.51529406a21.48705844 21.48705844 0 0 0-8.68235344-2.93647031c-8.89411781-0.59294156-14.10352969 5.28-14.10352875 15.03529406v67.31294156c0 1.17176437 0 2.34352969 0.22588219 3.52941094 0.94588219 5.98588219 5.81647031 9.98117625 12.70588219 10.44705937 9.43058812 0.59294156 14.62588219-4.81411781 14.62588218-15.14823562v-32.89411781z m227.25176438-0.12705843c0 11.7176475 0.11294156 23.42117625 0.11294156 35.23764656-0.09882375 5.39294156 2.21647031 8.78117625 6.32470594 11.12470594 3.17647031 1.86352969 6.77647031 2.21647031 10.24941187 1.52470594 5.78823563-1.05882375 10.96941188-5.28 10.87058813-13.69411688-0.22588219-22.82823562-0.11294156-45.54352969-0.11294156-68.24470594 0-1.17176437 0-2.34352969-0.21176438-3.52941187-0.96-5.49176437-4.85647031-9.12-11.19529406-10.2776475-9.38823563-1.8776475-16.0376475 4.32-16.0376475 14.73882375v33.12zM490.6823525 628.8376475a97.93411781 97.93411781 0 0 1-3.444705-3.89647125c-21.3176475-24.49411781-42.7623525-48.98823563-64.19294156-73.49647031-4.37647031-4.91294156-9.7976475-7.90588219-16.70117625-7.08705844-12.09882375 1.4823525-19.94823562 14.18823563-17.52 27.69882281 1.27058812 6.86117625 5.76 11.67529406 10.13647031 16.71529406 25.58117625 29.18117625 51.1623525 58.6023525 76.74352969 87.7976475 8.86588219 10.19294156 21.09176438 10.06588219 29.84470593 0l144.84705844-165.86823562c6.33882375-7.34117625 8.06117625-15.67058813 5.29411781-24.84705844-2.30117625-7.66588219-7.25647031-13.04470594-15.3176475-14.76705937-7.4823525-1.59529406-13.4823525 1.60941188-18.32470593 7.21411781-35.7176475 40.98352969-71.3223525 81.85411781-107.04 122.72470594-8.07529406 9.14823562-16.02352969 18.31058812-24.32470594 27.81176531z" fill="#6CB9FF" p-id="17500"></path></svg>
 \ No newline at end of file
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1755673065760" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10017" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M21.333333 21.333333m256 0l469.333334 0q256 0 256 256l0 469.333334q0 256-256 256l-469.333334 0q-256 0-256-256l0-469.333334q0-256 256-256Z" fill="#4D6DF0" p-id="10018"></path><path d="M275.157333 460.714667h409.6v244.053333a42.666667 42.666667 0 0 1-42.666666 42.666667h-324.266667a42.666667 42.666667 0 0 1-42.666667-42.666667v-244.053333z" fill="#FFFFFF" p-id="10019"></path><path d="M380.970667 481.194667h365.226666v223.573333a42.666667 42.666667 0 0 1-42.666666 42.666667h-365.226667a42.666667 42.666667 0 0 1-42.666667-42.666667v-138.24a85.333333 85.333333 0 0 1 85.333334-85.333333z" fill="#FFFFFF" opacity=".5" p-id="10020"></path><path d="M225.002667 464.576L460.373333 249.941333a21.333333 21.333333 0 0 1 28.373334-0.32L735.146667 464.213333a21.333333 21.333333 0 0 1-14.016 37.44H239.36a21.333333 21.333333 0 0 1-14.378667-37.098666z" fill="#FFFFFF" p-id="10021"></path><path d="M286.442667 444.096L521.813333 229.461333a21.333333 21.333333 0 0 1 28.373334-0.32L796.586667 443.733333a21.333333 21.333333 0 0 1-14.016 37.44H300.8a21.333333 21.333333 0 0 1-14.378667-37.098666z" fill="#FFFFFF" opacity=".5" p-id="10022"></path><path d="M368.64 512m20.48 0l163.84 0q20.48 0 20.48 20.48l0 0q0 20.48-20.48 20.48l-163.84 0q-20.48 0-20.48-20.48l0 0q0-20.48 20.48-20.48Z" fill="#4D6DF0" p-id="10023"></path><path d="M491.52 512v163.84a20.48 20.48 0 1 1-40.96 0V512a20.48 20.48 0 1 1 40.96 0z" fill="#4D6DF0" p-id="10024"></path><path d="M412.074667 424.085333l72.426666 72.405334A20.48 20.48 0 1 1 455.530667 525.44L383.125333 453.034667A20.48 20.48 0 1 1 412.074667 424.106667z" fill="#4D6DF0" p-id="10025"></path><path d="M532.8 424.085333L460.394667 496.490667A20.48 20.48 0 1 0 489.365333 525.44l72.405334-72.426667A20.48 20.48 0 1 0 532.8 424.106667z" fill="#4D6DF0" p-id="10026"></path><path d="M368.64 593.92m20.48 0l163.84 0q20.48 0 20.48 20.48l0 0q0 20.48-20.48 20.48l-163.84 0q-20.48 0-20.48-20.48l0 0q0-20.48 20.48-20.48Z" fill="#4D6DF0" p-id="10027"></path></svg>
 \ No newline at end of file
@@ -351,7 +351,7 @@ class CommonList extends Component {
     const { userinfo } = app;
     const BtnSure = commonFunc.showLocalMessage(this.props, 'BtnSure', '确定');
     const FriendlyReminder = commonFunc.showLocalMessage(this.props, 'FriendlyReminder', '温馨提示');
-    
+
     const onSendSocketMessage = this.props.handleSendSocketMessage;
     const returnData = await commonBusiness.saveData({ token, value: params, sModelsId });
     this.props.onSaveState({
@@ -854,9 +854,10 @@ const CommonListComponent = Form.create({
     },
   };
   const upInvoiceName = commonUtils.isNotEmptyArr(btnUploadApi) ? btnUploadApi[0].showName :  '发票上传（金税）';
-  
+
   const BtnSure = commonFunc.showLocalMessage(props, 'BtnSure', '确定');
   const BtnCancel = commonFunc.showLocalMessage(props, 'BtnCancel', '取消');
+  const BtnClose = commonFunc.showLocalMessage(props, 'BtnClose', '关闭');
  
   return (
     <Form >
@@ -941,7 +942,7 @@ const CommonListComponent = Form.create({
             {
               props.readOnly ?
                 <div style={{ textAlign: 'right', marginRight: '9px', marginBottom: '9px' }}>
-                  <Button type="primary" onClick={props.onCancel}>关闭</Button>
+                  <Button type="primary" onClick={props.onCancel}>{BtnClose}</Button>
                 </div> :
                 <div style={{ textAlign: 'right', marginRight: '9px', marginBottom: '9px' }}>
                   {
@@ -431,6 +431,7 @@ export default class CommonView extends Component {
                   app,
                   iColValue,
                   slaveData: this.props.slaveData,
+                  slave0Data: this.props.slave0Data,
                   record: masterData,
                   name: 'master',
                   form: this.props.form,
@@ -12,7 +12,7 @@ const InstructSetSetting = (props = {}) =&gt; {
   const { instructSetSettingVisible } = props;
   if (!instructSetSettingVisible) return "";
  
-  const { onCancelInstructSetSettingModal, showConfig, dataValue, instructSetSettingId } = props;
+  const { onCancelInstructSetSettingModal, showConfig, dataValue, instructSetSettingId, slave0Data } = props;
   const { showName, sName } = showConfig;
  
   const instructSet = commonUtils.convertStrToObj(dataValue, {});
@@ -44,6 +44,7 @@ const InstructSetSetting = (props = {}) =&gt; {
         {
           command: "initData",
           value: instructSet.change || instructSet.blur || (instructSet ? [instructSet] : []),
+          slave0Data,
         },
         IFRAMEURL
       );
@@ -16,14 +16,43 @@ const MenuSearchPopovor = props =&gt; {
     []
   );
  
+  const { modelCenter, kpiData } = app;
+
   const popovorRef = useRef(null);
-  const handleTabClick = useCallback(e => {
+  const handleTabClick = useCallback(option => {
+    const { data, type } = option;
+    if (type === 1) {
+      const record = data;
+      const newsId = record.sId;
+      const newKey = new Date().getTime().toString();
+      const route = record.sName;
+      const title = record.sMenuName;
+      const pane = {
+        title, route, formId: newsId, key: newKey, sModelsType: record.sModelType, fromKey: "1", sSrcModelsId: '1',
+        currentIndex: 0,
+      };
+      onAddPane(pane);
+      return;
+    } else if (type === 2) {
+      const record = data;
+      const newsId = record.sResultModelId;
+      const newKey = new Date().getTime().toString();
+      const route = record.sResultModelName;
+      const title = record.sResultModelMenuName;
+      const pane = {
+        title, route, formId: newsId, key: newKey, sModelsType: record.sResultModelType, fromKey: "1",
+        currentIndex: 0,
+      };
+      onAddPane(pane);
+      return
+    }
+
     const paneKey = new Date().getTime().toString();
-    const formId = e.sId;
-    const route = e.sName;
-    const title = e.sMenuName;
-    const sModelsType = e.sModelType;
-    const { sProcName } = e;
+    const formId = data.sId;
+    const route = data.sName;
+    const title = data.sMenuName;
+    const sModelsType = data.sModelType;
+    const { sProcName } = data;
     for (const each of app.panes) {
       /* 解决导航栏打开页签，Modal不消失问题 */
       each.notCurrentPane = true;
@@ -139,10 +168,33 @@ const MenuSearchPopovor = props =&gt; {
       });
     }
  
-    return [...commonlyUsedOption, ...options];
+    const columnWorkMatters = commonFunc.showMessage(app.commonConst, 'columnWorkMatters');
+    const columnContent = commonFunc.showMessage(app.commonConst, 'columnContent');
+    const { model = {} } = kpiData || modelCenter || {};
+    const modelOptions = [{ label: renderTitle('', columnWorkMatters), options: [] }, { label: renderTitle('', columnContent), options: [] }];
+    Object.keys(model).filter((_, index) => index === 0).forEach(key => {
+      const value = model[key];
+      value.forEach(item => {
+        const { sId, sMenuUnMemo, sResultModelId, sMenuWorkFruit } = item;
+        modelOptions[0].options.push({
+          label: sMenuUnMemo,
+          value: sId,
+          data: item,
+          type: 1
+        });
+        modelOptions[1].options.push({
+          label: sMenuWorkFruit,
+          value: `${sId},${sResultModelId}`,
+          data: item,
+          type: 2
+        });
+      });
+    });
+
+    return [...commonlyUsedOption, ...options, ...modelOptions];
   }, [menuPanel.panelMenus]);
  
-  const searchTitle = commonFunc.showMessage(app.commonConst, 'btnSearch') || '搜索122';
+  const searchTitle = commonFunc.showMessage(app.commonConst, 'btnSearch') || '搜索';
  
   return (
     <div ref={popovorRef}>
@@ -157,18 +209,23 @@ const MenuSearchPopovor = props =&gt; {
         }}
         filterOption={(inputValue, option) => {
           let result = false;
-          const { data } = option;
+          const { data, value } = option;
           if (commonUtils.isNotEmptyObject(data)) {
-            const { sMenuName, parentMenu, grandParentMenu } = data;
+            const { sMenuName, parentMenu = {}, grandParentMenu = {}, sMenuUnMemo, sMenuWorkFruit } = data;
             const { sMenuName: sMenuName1 } = parentMenu;
             const { sMenuName: sMenuName2 } = grandParentMenu;
+            const bMenuWorkFruit = value.includes(',');
             const result0 =
-              sMenuName.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;
+              sMenuName && sMenuName.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;
             const result1 =
-              sMenuName1.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;
+              sMenuName1 && sMenuName1.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;
             const result2 =
-              sMenuName2.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;
-            result = result0 || result1 || result2;
+              sMenuName2 && sMenuName2.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;
+            const result3 =
+              !bMenuWorkFruit && sMenuUnMemo && sMenuUnMemo.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;
+            const result4 =
+              bMenuWorkFruit && sMenuWorkFruit && sMenuWorkFruit.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;
+            result = result0 || result1 || result2 || result3 || result4;
           }
           return result;
         }}
@@ -176,7 +233,7 @@ const MenuSearchPopovor = props =&gt; {
           // popovorRef.current.animate([{ width: '250px' }, { width: 0 }], {
           //   duration: 2000, iterations: 1
           // });
-          handleTabClick(option.data);
+          handleTabClick(option);
           onSetMenuSearchPopoverVisible(false);
         }}
       >
@@ -14,6 +14,11 @@ import styles from &#39;./index.less&#39;;
 import commonConfig from '../../utils/config';
 import * as commonServices from '../../services/services';
 import file_single from "@/assets/file_single.svg";
+import defaultApp from "@/assets/index/default-app.svg";
+import kaoqin from "@/assets/index/kaoqin.svg";
+import OASys from "@/assets/index/oa.svg";
+import caiwu from "@/assets/index/financialSystem.svg";
+import crm from "@/assets/index/crm.svg";
  
 const { Sider, Content, Footer } = Layout;
 const { TabPane } = Tabs;
@@ -99,7 +104,10 @@ class IndexCenter extends Component {
  
   componentWillReceiveProps(nextProps) {
     const { dispatch } = nextProps;
-    const { modelCenter, comParameter, dataCode, kpiData, logoImageInfo, userinfo } = nextProps.app;
+    const { modelCenter, comParameter:comParameterAll = [], dataCode, kpiData, logoImageInfo, userinfo, token } = nextProps.app;
+    console.log('1-comParameterAll', comParameterAll);
+    const comParameter =  comParameterAll.filter(item => item.sDisplayType ? item.sDisplayType !== 'LargeScreen' : !item.sFormUrl?.includes('http'));
+    const commonThirdApp = comParameterAll.filter(item => item.sDisplayType ? item.sDisplayType === 'LargeScreen' : item.sFormUrl?.includes('http'));
     const { modelCenter: modelCenterOld } = this.props;
  
     const { sUserNo } = userinfo;
@@ -130,6 +138,39 @@ class IndexCenter extends Component {
           </div>
         </Menu.Item>);
     });
+    const getIconSrc = (formName) => {
+      if (formName.includes('考勤')) return kaoqin;
+      if (formName.includes('财务')) return caiwu;
+      if (formName.includes('CRM')) return crm;
+      if (formName.includes('OA')) return OASys;
+      return defaultApp;
+    };
+    const comThirdAppList = [];
+    commonThirdApp.forEach((child) => {
+      const dataUrl = child.sTitleLogoPath ? `${commonConfig.file_host}file/download?savePathStr=${child.sTitleLogoPath}&sModelsId=100&token=${token}` : '';
+      comThirdAppList.push(
+        <Menu.Item
+          key={child.sFormId}
+          style={{ height: '40px', lineHeight: '40px', marginBottom: '10px' }}
+          data-sname={child.sFormUrl}
+          data-smodelstype={child.sModelType}
+          data-sformname={child.sFormName}
+          data-sprocname={child.sProcName}
+        >
+          <div className={styles.comParameter} style={{ display: "flex", alignItems: "center" }}>
+            {child.sTitleLogoPath ? (
+              <img src={dataUrl} style={{ width: 30, height: 30, marginRight: 15 }} />
+            ) : (
+              <img src={getIconSrc(child.sFormName)}  style={{ width: 30, height: 30, marginRight: 15 }} />
+            )}
+            <div className={styles.comParameterTitle} style={{ flex: 1, textAlign: "left" }}>
+              {child.sFormName}
+            </div>
+            <CloseOutlined className={styles.comParameterClose} onClick={e => this.handleDelCommonMenu(e, child)} />
+          </div>
+        </Menu.Item>
+      );
+    });
     const columnNo = commonFunc.showMessage(nextProps.app.commonConst, 'columnNo');/* 编号 */
     let sChildFlow = commonFunc.showMessage(nextProps.app.commonConst, 'sChildFlow');/* 子流程 */
     const sNotShowChildFlow = commonFunc.showMessage(nextProps.app.commonConst, 'sNotShowChildFlow');/* 是否显示子流程 */
@@ -390,7 +431,7 @@ class IndexCenter extends Component {
         tabsPanes, tableTreeData, ...addState
       });
     }
-    this.setState({ comParameterList, dToDayNumSum, dTobeDoneSum, logoImageInfo });
+    this.setState({ comParameterList, comThirdAppList,  dToDayNumSum, dTobeDoneSum, logoImageInfo });
   }
   componentDidMount() {
     if (this.kpiTable && this.kpiTable.querySelector('.ant-table-body')) {
@@ -682,7 +723,7 @@ class IndexCenter extends Component {
   };
   render() {
     const {
-      comParameterList, dToDayNumSum, dTobeDoneSum, tabsPanes, loadings, tableTreeData, columns, tableData, logoImageInfo = [],
+      comParameterList, comThirdAppList, dToDayNumSum, dTobeDoneSum, tabsPanes, loadings, tableTreeData, columns, tableData, logoImageInfo = [],
     } = this.state;
     const { app } = this.props;
     const KPIMonitor = commonFunc.showMessage(app.commonConst, 'KPIMonitor');/* KPI监控 */
@@ -693,6 +734,7 @@ class IndexCenter extends Component {
     const TodayAffair = commonFunc.showMessage(app.commonConst, 'TodayAffair');/* 今日事务:  */
     const unclearedTotal = commonFunc.showMessage(app.commonConst, 'unclearedTotal');/* 未清总数: */
     const CommonOperation = commonFunc.showMessage(app.commonConst, 'CommonOperation');/* 常用操作 */
+    const CommonThirdAppTitle = commonFunc.showMessage(app.commonConst, 'thirdAppList') || '第三方应用列表';/* 第三方应用 */
     const Copyright = commonFunc.showMessage(app.commonConst, 'Copyright');/* Copyright */
     const AddrOne = commonFunc.showMessage(app.commonConst, 'AddrOne');/* 小羚羊软件 */
     const AddrTwo = commonFunc.showMessage(app.commonConst, 'AddrTwo');/*  印刷智慧工厂 */
@@ -851,7 +893,7 @@ class IndexCenter extends Component {
                   </Card>
                 </Content>
                 <Sider width={230} style={{ background: '#888888' }} className={styles.commonOpt} id="commonOpt">
-                  <Card title={CommonOperation}>
+                  <Card title={CommonOperation} style={{ height: '60%' }}>
                     <Menu
                       onClick={this.handleTabClick}
                       mode="inline"
@@ -859,6 +901,16 @@ class IndexCenter extends Component {
                       {comParameterList}
                     </Menu>
                   </Card>
+                  <Card title={CommonThirdAppTitle}
+                  headStyle={{ fontWeight: 'bold', fontSize: '16px' }}
+                  style={{ height: '40%', color: '#888888', fontWeight:'bold', fontSize: '16px' }}>
+                    <Menu
+                      onClick={this.handleTabClick}
+                      mode="inline"
+                    >
+                      {comThirdAppList}
+                      </Menu>
+                  </Card>
                 </Sider>
               </Layout>
               <CommonChar {...this.props} indexCenter />