Sfoglia il codice sorgente

feat: 移除常用功能数量限制

zhangyuhan 2 anni fa
parent
commit
e1d999411f

+ 8 - 4
src/components/work-desktop/Transfer.vue

@@ -6,7 +6,7 @@
     @left-check-change="leftChange"
     @change="onChange"
     :data="transferData">
-  </el-transfer>
+    </el-transfer>
   </div>
 </template>
 
@@ -58,9 +58,13 @@ export default {
   },
   methods: {
     allData () {
-      const allData = this.left
+      const allData = this.left.map(s => {
+        return Object.assign(s, {
+          name: s.name.replace('<br>', ' ')
+        })
+      })
       const rightData = this.right.map(s => {
-        return s.name.replace('<br>', '')
+        return s.name.replace('<br>', ' ')
       })
       // console.log(rightData)
       const data = []
@@ -85,7 +89,7 @@ export default {
     rightData () {
       const data = []
       this.right.forEach(v => {
-        v.name = v.name.replace('<br>', '')
+        v.name = v.name.replace('<br>', ' ')
         this.transferData.forEach(s => {
           if (v.name === s.label) {
             data.push(s.key)

+ 1 - 2
src/store/workspace/common-use.js

@@ -20,7 +20,7 @@ export default {
   namespaced: true,
   state: () => ({
     platform: 'PC',
-    maxCount: 8,
+    maxCount: Infinity,
     dialogShow: false,
     menuInfoList: [], // 请求回来的原始数组
     allFunctionsContainsUsable: [], // 全部功能,包含可用的和不可用的(扁平化后)
@@ -129,7 +129,6 @@ export default {
           platform: state.platform
         })
         if (code === 0 && data) {
-          console.log(data)
           commit('setCommonList', data)
         } else {
           commit('setCommonList', [])

+ 2 - 1
src/views/workspace/components/CommonUse.vue

@@ -32,7 +32,7 @@
         <div class="transfer-content">
           <Transfer :maxCount="maxCount" submitKey="id" :left="allFunctions" :right="transferCommonList" @onSave="onTransferSave"></Transfer>
         </div>
-        <p class="more-tips">最多可选择 <em style="color:#2CB7CA;">{{ maxCount }}</em> 个常用功能</p>
+        <!-- <p class="more-tips">最多可选择 <em style="color:#2CB7CA;">{{ maxCount }}</em> 个常用功能</p> -->
       </SelectorCard>
     </el-dialog>
   </WorkspaceCard>
@@ -196,6 +196,7 @@ $main: #2cb7ca;
 .common-lists{
   padding: 0 20px;
   display: flex;
+  flex-wrap: wrap;
   .list-item,
   .list-add{
     width: 120px;