新增字体图标文件/操作按钮管理添加顶部按钮分类/动态表格管理添加默认按钮数据请求

zkqy-ui/src/api/tablelist/commonTable.js

@@ -236,3 +236,14 @@ export function btnCommonApi(data) {
     baseURL: process.env.VUE_APP_BASE_API3
   })
 }
+
+// 动态表格添加默认按钮数据
+
+export function insertByDefaultBtn(data) {
+  return request({
+    url: '/system/btn/insertByDefaultBtn',
+    method: 'post',
+    data: data,
+    baseURL: process.env.VUE_APP_BASE_API3
+  })
+}

zkqy-ui/src/assets/icons/svg/a-051_biaoqian.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M457.93 894.08L105.09 541.23l360.12-360.12h352.85v352.85L457.94 894.08zM161.66 541.23l296.28 296.28 320.12-320.12V221.11H481.77L161.66 541.23z" fill="#333333" /><path d="M611.38 464.25c-19.59 0-39.18-7.46-54.09-22.37-29.83-29.83-29.83-78.36 0-108.19s78.36-29.83 108.19 0 29.83 78.36 0 108.19c-14.91 14.91-34.5 22.37-54.09 22.37z m0-112.95c-9.35 0-18.69 3.56-25.81 10.67-14.23 14.23-14.23 37.39 0 51.62 14.23 14.23 37.39 14.23 51.62 0 14.23-14.23 14.23-37.39 0-51.62-7.11-7.11-16.46-10.67-25.81-10.67z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_chima.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M900 682H146V377h754v305z m-714-40h674V417H186v225z" fill="#333333" /><path d="M505.63 517h40v134.18h-40zM751.63 517h40v134.18h-40zM259.63 517h40v134.18h-40zM382.63 569h40v82.18h-40zM628.63 566h40v88.88h-40z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_diannao.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M854.38 694h-684V239h684v455z m-644-40h604V279h-604v375zM420.88 746h183v40h-183z" fill="#333333" /><path d="M625.65 584.89L439.22 398.46 309.03 528.64l-28.28-28.28 158.47-158.47 186.43 186.43 90.07-90.06L744 466.54 625.65 584.89z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_duanxiantixing.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M509.43 859c-46.9 0-92.41-9.19-135.27-27.32-41.38-17.5-78.54-42.56-110.45-74.46s-56.96-69.07-74.46-110.45c-18.13-42.85-27.32-88.37-27.32-135.27s9.19-92.41 27.32-135.27c17.5-41.38 42.56-78.54 74.46-110.45s69.07-56.96 110.45-74.46C417.01 173.19 462.53 164 509.43 164s92.41 9.19 135.27 27.32c41.38 17.5 78.54 42.56 110.45 74.46s56.96 69.07 74.46 110.45c18.13 42.85 27.32 88.37 27.32 135.27s-9.19 92.41-27.32 135.27c-17.5 41.38-42.56 78.54-74.46 110.45s-69.07 56.96-110.45 74.46C601.85 849.81 556.33 859 509.43 859z m0-655c-82.14 0-159.36 31.99-217.44 90.06-58.08 58.08-90.06 135.3-90.06 217.44s31.99 159.36 90.06 217.44C350.07 787.02 427.29 819 509.43 819s159.36-31.99 217.44-90.06 90.06-135.3 90.06-217.44-31.99-159.36-90.06-217.44S591.57 204 509.43 204z" fill="#333333" /><path d="M509.43 735c-19.57 0-35.5-15.92-35.5-35.5s15.93-35.5 35.5-35.5 35.5 15.92 35.5 35.5-15.92 35.5-35.5 35.5z m0-40c-2.48 0-4.5 2.02-4.5 4.5s2.02 4.5 4.5 4.5 4.5-2.02 4.5-4.5-2.02-4.5-4.5-4.5zM489.43 315.9h40v299.19h-40z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_duihua.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M289.66 849.32L291.08 722H139V245h746v477H590.57L289.66 849.32zM179 682h152.53l-1.19 106.68L582.46 682H845V285H179v397z" fill="#333333" /><path d="M281 399h299.19v40H281zM455.5 541.5h299.19v40H455.5zM638.23 399h116.09v40H638.23zM281.23 542h116.09v40H281.23z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_fuzhi.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M673.23 731.07H197.76V181h475.46v550.07z m-435.46-40h395.46V221H237.76v470.07z" fill="#333333" /><path d="M827.24 854H351.77V711.07h40V814h395.47V343.93H653.02v-40h174.22V854z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_gouwu.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M855.32 825H173.78l73.07-428.4h542.39L855.32 825z m-634.14-40h587.5l-53.74-348.4H280.61L221.18 785zM692.16 358.42h-40c0-75.77-61.64-137.42-137.42-137.42s-137.42 61.64-137.42 137.42h-40c0-97.83 79.59-177.42 177.42-177.42s177.42 79.59 177.42 177.42z" fill="#333333" /><path d="M331.48 498.91H698v40H331.48z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_huishou.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M823 407H203.04V261.72H823V407z m-579.96-40H783v-65.28H243.04V367z" fill="#333333" /><path d="M648.34 301.72H377.69V160h270.65v141.72z m-230.65-40h190.65V200H417.69v61.72zM745.41 869.59H280.63V367h464.78v502.59z m-424.78-40h384.78V407H320.63v422.59z" fill="#333333" /><path d="M415.7 490.9h40v253.9h-40zM569.96 490.9h40v253.9h-40z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_jiesuo.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M808 850.53H215.48v-397H808v397z m-552.52-40H768v-317H255.48v317z" fill="#333333" /><path d="M491.74 583.38h40v137.29h-40zM359.48 411.68h-40v-99.4c0-106.01 86.25-192.26 192.26-192.26S704 206.27 704 312.28h-40c0-83.96-68.3-152.26-152.26-152.26s-152.26 68.3-152.26 152.26v99.4z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_rili.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M816.14 799H206.9V264.78h609.24V799zM246.9 759h529.24V304.78H246.9V759z" fill="#333333" /><path d="M226.9 392.75h569.24v40H226.9zM347.53 223h40v123.56h-40zM636.57 223h40v123.56h-40zM550.25 687.99h-40V550.66l-29.6 3.16-4.24-39.77 73.84-7.88v181.82z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_shoubiao.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M720.19 745.84H304.48V261.61h415.7v484.23z m-375.7-40h335.7V301.61H344.48v404.23zM404.23 795h216.21v40H404.23zM404.23 176h216.21v40H404.23z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_shouji.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M756.83 879H273.47V151h483.35v728z m-443.35-40h403.35V191H313.47v648z" fill="#333333" /><path d="M428.09 754.85h169.23v40H428.09z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_sousuo.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M341.74 473.35h276.59v40H341.74z" fill="#333333" /><path d="M460.03 355.06h40v276.59h-40z" fill="#333333" /><path d="M480.03 787.94c-78.81 0-152.9-30.69-208.63-86.42-55.73-55.73-86.42-129.82-86.42-208.63s30.69-152.9 86.42-208.63 129.82-86.42 208.63-86.42 152.9 30.69 208.63 86.42c55.73 55.73 86.42 129.82 86.42 208.63s-30.69 152.9-86.42 208.63-129.82 86.42-208.63 86.42z m0-550.09c-68.13 0-132.17 26.53-180.35 74.7s-74.7 112.22-74.7 180.34 26.53 132.17 74.7 180.34 112.22 74.7 180.35 74.7 132.17-26.53 180.34-74.7c48.17-48.17 74.7-112.22 74.7-180.34s-26.53-132.17-74.7-180.34c-48.17-48.17-112.22-74.7-180.34-74.7z" fill="#333333" /><path d="M661.025 701.542l28.339-28.23 166.803 167.446-28.338 28.23z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/a-051_suoding.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M806 850.53H213.48v-397H806v397z m-552.52-40H766v-317H253.48v317z" fill="#333333" /><path d="M489.74 583.38h40v137.29h-40zM702 411.68h-40v-99.4c0-83.96-68.3-152.26-152.26-152.26s-152.26 68.3-152.26 152.26v99.4h-40v-99.4c0-106.01 86.25-192.26 192.26-192.26S702 206.27 702 312.28v99.4z" fill="#333333" /></svg>

zkqy-ui/src/assets/icons/svg/guankan.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512.3 276.9c-228.4 0-374 178.5-393.8 255.9 19.3 78.2 165.5 256 393.8 256s373.8-176.5 393.9-256c-19.7-78.2-165.6-255.9-393.9-255.9z m0 452.9c-182.3 0-303.2-131.1-331.5-196.7C209.6 467.4 331.2 336 512.3 336c181.9 0 303 131.2 331.5 196.9-28.6 65.6-149.8 196.9-331.5 196.9z" fill="#666666" /><path d="M512.3 434.4c-54.4 0-98.4 44.1-98.4 98.5s44.1 98.4 98.4 98.4c54.4 0 98.5-44.1 98.5-98.4 0-54.4-44.1-98.5-98.5-98.5z m0 137.9c-21.7 0-39.4-17.7-39.4-39.4s17.6-39.4 39.4-39.4 39.4 17.7 39.4 39.4-17.7 39.4-39.4 39.4z" fill="#666666" /></svg>

zkqy-ui/src/assets/icons/svg/icon_atianjia_solid.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512 85.333333c235.648 0 426.666667 191.018667 426.666667 426.666667s-191.018667 426.666667-426.666667 426.666667S85.333333 747.648 85.333333 512 276.352 85.333333 512 85.333333z m0 192a21.333333 21.333333 0 0 0-21.333333 21.333334l-0.042667 191.957333L298.666667 490.666667l-3.84 0.341333A21.333333 21.333333 0 0 0 298.666667 533.333333l191.957333-0.042666L490.666667 725.333333l0.341333 3.84A21.333333 21.333333 0 0 0 533.333333 725.333333l-0.042666-192.042666L725.333333 533.333333l3.84-0.341333A21.333333 21.333333 0 0 0 725.333333 490.666667l-192.042666-0.042667L533.333333 298.666667l-0.341333-3.84A21.333333 21.333333 0 0 0 512 277.333333z" /></svg>

zkqy-ui/src/assets/icons/svg/icon_bzhengque_outline.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M768 85.333333a170.666667 170.666667 0 0 1 170.666667 170.666667v512a170.666667 170.666667 0 0 1-170.666667 170.666667H256a170.666667 170.666667 0 0 1-170.666667-170.666667V256a170.666667 170.666667 0 0 1 170.666667-170.666667h512z m0 42.666667H256a128 128 0 0 0-127.786667 120.490667L128 256v512a128 128 0 0 0 120.490667 127.786667L256 896h512a128 128 0 0 0 127.786667-120.490667L896 768V256a128 128 0 0 0-120.490667-127.786667L768 128zM709.632 369.578667a21.333333 21.333333 0 0 1 33.749333 25.813333l-2.346666 3.029333-274.261334 298.666667a21.333333 21.333333 0 0 1-28.416 2.730667l-2.986666-2.730667-152.405334-165.930667a21.333333 21.333333 0 0 1 28.586667-31.445333l2.816 2.56 136.661333 148.821333 258.56-281.514666z" /></svg>

zkqy-ui/src/assets/icons/svg/icon_bzhengque_solid.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M768 85.333333a170.666667 170.666667 0 0 1 170.666667 170.666667v512a170.666667 170.666667 0 0 1-170.666667 170.666667H256a170.666667 170.666667 0 0 1-170.666667-170.666667V256a170.666667 170.666667 0 0 1 170.666667-170.666667h512z m-28.245333 282.965334a21.333333 21.333333 0 0 0-30.122667 1.28L450.986667 651.093333l-136.661334-148.778666-2.816-2.56a21.333333 21.333333 0 0 0-28.586666 31.402666l152.362666 165.973334 3.029334 2.688a21.333333 21.333333 0 0 0 28.416-2.730667l274.261333-298.666667 2.346667-3.029333a21.333333 21.333333 0 0 0-3.626667-27.093333z" /></svg>

zkqy-ui/src/assets/icons/svg/icon_chahao_outline.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M768.426667 255.573333a21.333333 21.333333 0 0 1 2.474666 27.178667l-2.474666 2.986667-226.261334 226.218666 226.261334 226.304a21.333333 21.333333 0 0 1-27.178667 32.64l-2.986667-2.474666L512 542.122667 285.738667 768.426667a21.333333 21.333333 0 0 1-32.64-27.178667l2.474666-2.986667L481.834667 512 255.573333 285.738667a21.333333 21.333333 0 0 1 27.178667-32.64l2.986667 2.474666L512 481.706667l226.261333-226.176a21.333333 21.333333 0 0 1 30.165334 0z" /></svg>

zkqy-ui/src/assets/icons/svg/icon_duihao_outline.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M795.562667 368.896a21.333333 21.333333 0 0 1 32.64 27.221333l-2.432 2.986667-384 384a21.333333 21.333333 0 0 1-27.221334 2.432l-2.986666-2.432-213.333334-213.333333a21.333333 21.333333 0 0 1 27.221334-32.64l2.986666 2.432L426.666667 737.834667l368.896-368.938667z" /></svg>

zkqy-ui/src/assets/icons/svg/icon_jiahao.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M512 149.333333a21.333333 21.333333 0 0 1 20.992 17.493334L533.333333 170.666667l-0.042666 319.957333L853.333333 490.666667a21.333333 21.333333 0 0 1 3.84 42.325333L853.333333 533.333333l-320.042666-0.042666L533.333333 853.333333a21.333333 21.333333 0 0 1-42.325333 3.84L490.666667 853.333333l-0.042667-320.042666L170.666667 533.333333a21.333333 21.333333 0 0 1-3.84-42.325333L170.666667 490.666667l319.957333-0.042667L490.666667 170.666667a21.333333 21.333333 0 0 1 21.333333-21.333334z" /></svg>

zkqy-ui/src/assets/icons/svg/icon_jianhao_outline.svg

@@ -0,0 +1 @@
+<?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 class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M853.333333 490.666667a21.333333 21.333333 0 0 1 3.84 42.325333L853.333333 533.333333H170.666667a21.333333 21.333333 0 0 1-3.84-42.325333L170.666667 490.666667h682.666666z" /></svg>

zkqy-ui/src/views/system/excuteBtnMange/index.vue

@@ -60,6 +60,16 @@
           >展开/折叠</el-button
         >
       </el-col>
+      <el-col :span="1.5">
+        <el-radio-group
+          v-model="queryParams.btnGroupType"
+          size="mini"
+          @input="handleClick"
+        >
+          <el-radio-button label="right">操作列按钮</el-radio-button>
+          <el-radio-button label="top">顶部按钮</el-radio-button>
+        </el-radio-group>
+      </el-col>
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -179,6 +189,10 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
+    <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane label="操作列按钮" name="right"> </el-tab-pane>
+      <el-tab-pane label="顶部按钮" name="top">顶部按钮管理</el-tab-pane>
+    </el-tabs> -->
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="680px" append-to-body>
@@ -252,6 +266,29 @@
               </el-popover>
             </el-form-item>
           </el-col>
+          <el-col
+            :span="12"
+            v-if="
+              queryParams.btnGroupType == 'top' &&
+              btnGroupFormData.btnType != 'DIRECTORY'
+            "
+          >
+            <el-form-item label="按钮样式" prop="btnStyle">
+              <el-select
+                v-model="btnGroupFormData.btnStyle"
+                clearable
+                filterable
+              >
+                <el-option
+                  v-for="item in btnStyleOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="排序" prop="btnSort">
               <el-input-number
@@ -794,6 +831,9 @@ export default {
   components: { Treeselect, IconSelect },
   data() {
     return {
+      // 顶部按钮 start
+      activeName: "right",
+      // 顶部按钮 end
       // 记录编辑状态
       editType: true, //true:新增   false:修改
       // 遮罩层
@@ -819,6 +859,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         btnName: "",
+        btnGroupType: "right",
       },
       // btnGroupName: "",
       // 分页数据
@@ -896,71 +937,37 @@ export default {
         btnHasPermi: "", //权限字符
         btnSort: 0, //按钮顺序
         btnKey: "",
+
+        btnStyle: "", //top 类型的按钮参数
       },
-      conditionBtnData: [],
-      btnTypeOptions: [
-        // {
-        //   value: 0,
-        //   label: "操作按钮",
-        // },
-        // {
-        //   value: 1,
-        //   label: "其它",
-        // },
-        // {
-        //   value: 2,
-        //   label: "表单",
-        // },
-        // {
-        //   value: 3,
-        //   label: "内链",
-        // },
-        // {
-        //   value: 4,
-        //   label: "流程",
-        // },
-        // {
-        //   value: 5,
-        //   label: "脚本",
-        // },
-        {
-          // value: "6",
-          value: "DIRECTORY",
-          label: "目录",
-        },
-        {
-          // value: "7",
-          value: "OUTLINK",
-          label: "外链",
-        },
+      btnStyleOptions: [
         {
-          // value: "3",
-          value: "INNERLINK",
-          label: "内链",
+          value: "primary",
+          label: "primary",
         },
         {
-          value: "INSERT",
-          label: "新增",
+          value: "success",
+          label: "success",
         },
         {
-          // value: "8",
-          value: "UPDATE",
-          label: "修改",
+          value: "warning",
+          label: "warning",
         },
         {
-          value: "DELETE",
-          label: "删除",
+          value: "danger",
+          label: "danger",
         },
-
         {
-          value: "EXECUTE",
-          label: "执行脚本",
+          value: "info",
+          label: "info",
         },
         {
-          value: "INITIATED",
-          label: "发起流程",
+          value: "text",
+          label: "text",
         },
       ],
+      conditionBtnData: [],
+
       formOptions: [],
       groupFormOptions: [], //表单组选项
       tableOptions: [],
@@ -1053,8 +1060,99 @@ export default {
         return this.groupFormOptions;
       }
     },
+    btnTypeOptions() {
+      if (this.queryParams.btnGroupType == "right") {
+        return [
+          {
+            value: "DIRECTORY",
+            label: "目录",
+          },
+          {
+            value: "OUTLINK",
+            label: "外链",
+          },
+          {
+            value: "INNERLINK",
+            label: "内链",
+          },
+          {
+            value: "INSERT",
+            label: "新增",
+          },
+          {
+            value: "UPDATE",
+            label: "修改",
+          },
+          {
+            value: "DELETE",
+            label: "删除",
+          },
+
+          {
+            value: "EXECUTE",
+            label: "执行脚本",
+          },
+          {
+            value: "INITIATED",
+            label: "发起流程",
+          },
+          {
+            value: "PRINT",
+            label: "打印",
+          },
+        ];
+      } else {
+        return [
+          {
+            value: "OUTLINK",
+            label: "外链",
+          },
+          {
+            value: "INNERLINK",
+            label: "内链",
+          },
+          {
+            value: "INSERT",
+            label: "新增",
+          },
+          {
+            value: "UPDATE",
+            label: "修改",
+          },
+          {
+            value: "DELETE",
+            label: "删除",
+          },
+
+          {
+            value: "EXECUTE",
+            label: "执行脚本",
+          },
+          {
+            value: "INITIATED",
+            label: "发起流程",
+          },
+          {
+            value: "PRINT",
+            label: "打印",
+          },
+          {
+            value: "IMPORT",
+            label: "导入",
+          },
+          {
+            value: "EXPORT",
+            label: "导出",
+          },
+        ];
+      }
+    },
   },
   methods: {
+    // tab切换回调
+    handleClick(value) {
+      this.getList();
+    },
     // 自定义字段校验
     checkBtnFormKey(rule, value, callback) {
       let { btnType } = this.btnGroupFormData;
@@ -1347,7 +1445,16 @@ export default {
         if (btnShowCondition) {
           this.btnHidenCondtionData = JSON.parse(btnShowCondition);
         }
-        this.btnGroupFormData = response.data;
+        if (this.queryParams.btnGroupType == "top") {
+          let temp = response.data.btnIcon.split("@");
+          response.data.btnIcon = temp[0];
+          this.btnGroupFormData = response.data;
+          this.btnGroupFormData.btnStyle = temp[1];
+        } else {
+          this.btnGroupFormData = response.data;
+        }
+        console.log(this.btnGroupFormData);
+
         this.open = true;
         this.title = "修改按钮";
       });
@@ -1400,6 +1507,10 @@ export default {
           }
           this.btnGroupFormData.btnShowCondition = this.getHidenConditions();
           console.log(this.btnGroupFormData.btnShowCondition);
+          this.btnGroupFormData.btnGroupType = this.queryParams.btnGroupType; //添加按钮组类型
+          if (this.btnGroupFormData.btnGroupType == "top") {
+            this.btnGroupFormData.btnIcon += `@${this.btnGroupFormData.btnStyle}`;
+          }
           if (this.editType) {
             // 新增按钮组
             this.btnGroupFormData.btnKey = uuidv4();

zkqy-ui/src/views/tableMange/index.vue

@@ -711,6 +711,7 @@ import {
   addTableData,
   addStatistic,
   updateStatistic,
+  insertByDefaultBtn,
 } from "@/api/tablelist/commonTable";
 import { getDicts } from "@/api/system/dict/data";
 import {
@@ -732,6 +733,7 @@ import { listBtn } from "@/api/system/btn";
 import StyleFormPanel from "./components/StyleFormPanel.vue";
 import DataFilterPanel from "./components/DataFilterPanel.vue";
 import ClassificationQueryPanel from "./components/ClassificationQueryPanel.vue";
+
 export default {
   name: "tableMange",
   dicts: ["sys_time_format", "table_statistic_type"],
@@ -745,6 +747,8 @@ export default {
   },
   data() {
     return {
+      menuList: [], //路由数组
+      btnTemplate: [], //按钮模板
       isNeedNewMenu: false, //是否需要新菜单
       filterDataEcho: "", //数据过滤回显数据
       classificationDataEcho: "", //分类查询回显数据
@@ -903,6 +907,13 @@ export default {
     };
   },
   computed: {
+    ...mapState({
+      databaseName: (state) => state.user.dataSource.databaseName,
+      databaseType: (state) => state.user.dataSource.databaseType,
+      username: (state) => state.user.dataSource.username,
+      tenantId: (state) => state.user.tenant.tenantId,
+      tenantName: (state) => state.user.tenant.tenantName,
+    }),
     // 数据字段
     dataArr() {
       return this.tableFieldList.filter((item) => item.isShow);
@@ -922,6 +933,7 @@ export default {
       databaseType: (state) => state.user.dataSource.databaseType,
       username: (state) => state.user.dataSource.username,
       tenantId: (state) => state.user.tenant.tenantId,
+      tenantCode: (state) => state.user.tenant.tenantCode,
     }),
     searchArr() {
       if (!this.templateInfo?.where?.length) return [];
@@ -972,6 +984,51 @@ export default {
     },
   },
   methods: {
+    // 获取按钮模板数据
+    async getBtnTemplate() {
+      try {
+        let res = await getDicts("drag_table_btn_template");
+        if (res.code == 200) {
+          this.btnTemplate = res.data.map((item) => JSON.parse(item.remark));
+        } else {
+          console.log(res);
+          this.$message.error("获取按钮模板数据失败");
+        }
+      } catch (error) {
+        console.log(error);
+        this.$message.error("获取按钮模板数据失败");
+      }
+    },
+    // 格式化按钮模板数据
+    formateBtnTemplate() {
+      let res = {
+        hasPermiName: "",
+        dragTableBtnTop: {},
+        dragTableBtnRight: {},
+      };
+      let moduleName = this.menuList.find(
+        (item) => item.menuId == this.formData.routePath
+      )?.menuName;
+      res.hasPermiName =
+        this.tenantCode + ":" + moduleName + ":" + this.formData.menuName;
+      let primaryKey = this.tableName + "." + this.formData.primaryKey;
+      this.btnTemplate.forEach((item) => {
+        item.children.forEach((i) => {
+          if (i.btnType == "UPDATE" || i.btnType == "DELETE") {
+            let btnParams = { commonFieldData: [], conditionData: [] };
+            btnParams.conditionData.push({
+              fieldName: primaryKey,
+              fieldValue: "",
+            });
+            i.btnParams = JSON.stringify(btnParams);
+          }
+        });
+      });
+
+      res.dragTableBtnTop = this.btnTemplate[0];
+      res.dragTableBtnRight = this.btnTemplate[1];
+      return res;
+    },
     // 字段描述验证规则
     // blurval(value){
     //   this.isInputInvalid = value == '' ?  true : false;
@@ -1180,7 +1237,10 @@ export default {
     // 获取路由表单数据
     async getMenuList() {
       let res = await getMenuList();
-      this.menus = this.handleTree(res.data, "menuId");
+      if (res.code == 200) {
+        this.menuList = res.data;
+        this.menus = this.handleTree(res.data, "menuId");
+      }
     },
     // 校验字段合法性(递归版)
     validateField(tableFieldList, validateParams) {
@@ -1639,6 +1699,9 @@ export default {
           this.tableKey = uuidv4();
           // 表单
           let result;
+          let btnTemplate = this.formateBtnTemplate();
+          console.log(btnTemplate);
+
           // if (this.tId && this.menuId) {
           if (this.menuId && !this.isNeedNewMenu) {
             //原菜单存在,仅需要修改菜单数据
@@ -1658,7 +1721,6 @@ export default {
             };
             result = await updateMenu(payLoad);
           } else if (this.isNeedNewMenu) {
-            console.log(111);
             //给旧表格新增菜单
             let tableKeyObj = {
               tableKey: this.editData.tableKey,
@@ -1810,6 +1872,12 @@ export default {
                   dtTableName: this.tableName,
                 });
               }
+              if (res.code == 200) {
+                // 新增默认按钮数据
+                btnTemplate.tableKey = data.tableKey;
+                btnTemplate.menuID = result.data;
+                await insertByDefaultBtn(btnTemplate);
+              }
             }
 
             // 关闭当前页面
@@ -2021,6 +2089,7 @@ export default {
   },
   created() {},
   async mounted() {
+    this.getBtnTemplate();
     this.getAllTable();
     this.initDragTable();
     await this.getMenuList();