doway-coms 2.5.1 → 2.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseFileGroup/src/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="height:300px">
     <splitpanes class="default-theme">
-      <pane size="20">
+      <pane>
         <vxe-table :size="'mini'" :height="'100%'" show-overflow highlight-current-row highlight-hover-row
           ref="eisTreeView" row-id="id" row-key @current-change="eisCurrentChange" border="inner" :show-header="false"
           :data="fileGroupData" :tree-config="{
@@ -17,16 +17,8 @@
                 <a-icon type="folder-open" v-if="$refs.eisTreeView.isTreeExpandByRow(row)" />
                 <a-icon v-else type="folder" />
                 <span>{{ row.name }}</span>
-              </span>
-            </template>
-          </vxe-column>
-          <vxe-column width="80px">
-            <template #default="{ row }">
-              <span>
-                <span class="button" @click="handleAddSubFolder(row)" v-if="edit === true"><a-icon type="file-add" /></span>
-                {{ ' ' }}
-                <span class="button1" @click="handleEditSubFolder(row)"
-                  v-if="edit === true && row.id !== 'sys_top_folder'"><a-icon type="edit" /></span>
+                <span @click="handleAddSubFolder(row)" v-if="edit === true">添加</span>
+                <span @click="handleEditSubFolder(row)" v-if="edit === true && row.id !== 'sys_top_folder'">编辑</span>
               </span>
             </template>
           </vxe-column>
@@ -47,10 +39,9 @@
           <div class="card-view-item" :style="{ width: itemWidth + 'px' }" v-for="loopFileData in currentFolderData"
             @dblclick="panelFolderDblClick(loopFileData)" :key="loopFileData.id">
             {{ loopFileData.name }}
-            <!-- <button  style="position: absolute; padding: 1px 2px; right:2px;bottom:2px"> -->
-              <div style="position: absolute; padding: 1px 2px; right:2px;bottom:2px" @click="removeAttach(loopFileData)" v-if="edit === true"><a-icon type="delete" /></div>
-            <!-- </button> -->
-            <div @click="downloadAttach(loopFileData)" v-if="loopFileData.attachType === 'file' && allowDownload === true">下载
+            <div @click="removeAttach(loopFileData)" v-if="edit === true">删除</div>
+            <div @click="downloadAttach(loopFileData)"
+              v-if="loopFileData.attachType === 'file' && allowDownload === true">下载
             </div>
           </div>
 
@@ -77,7 +68,7 @@
     </splitpanes>
     <VxeModal v-model="showEditFolder" transfer :height="200" :width="400" destroy-on-close :z-index="999" show-footer>
       <template #title>
-        <span>添加文件夹名称</span>
+        <span>文件夹修改</span>
       </template>
       <template #default>
         <a-input v-model="currentEditFolderValue"></a-input>
@@ -412,7 +403,7 @@ export default {
           parentId: this.currentSelectKey[0],
           fileType: info.file.response.content.fileType,
           sort: this.internalRows.length + 1,
-          attachType: 'file',
+          attachFile: 'file',
           name: info.file.response.content.name,
           id: this.$store.getters.newId() + "",
         }
@@ -546,47 +537,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
-.button {
-  display: inline-block;
-  padding: 1px 6px;
-  background-color: #4CAF50;
-  color: white;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  transition: background-color 0.3s ease;
-}
-
-.button:hover {
-  background-color: #45a049;
-}
-
-.button:active {
-  background-color: #408E43;
-  transform: translateY(2px);
-}
-
-.button1 {
-  display: inline-block;
-  padding: 1px 6px;
-  background-color: #3a61b6;
-  color: white;
-  border: none;
-  border-radius: 4px;
-  cursor: pointer;
-  transition: background-color 0.3s ease;
-}
-
-.button1:hover {
-  background-color: #3a61b6;
-}
-
-.button1:active {
-  background-color: #3a61b6;
-  transform: translateY(2px);
-}
-
 .file-card {
   display: flex;
   flex-flow: row wrap;
@@ -755,7 +705,6 @@ export default {
     //border-color: #9ad4dc;
     min-width: 150px;
     border-radius: 6px;
-    position: relative;
 
     .card-view-icon {
       float: left;

package/packages/BaseForm/src/index.vue

@@ -275,7 +275,12 @@
             pullDownChange(col, rowInfo)
           }
         "
+         @confirmMultiSelect="
+              (pulldownView, selectRows) =>
+                pulldownMultiSelect(col, pulldownView, selectRows)
+            "
         :dataSource="col.dataSource"
+        :isMultiSelect="col.isMultiSelect"
       />
       <BaseTreeSelect
         v-if="
@@ -663,6 +668,23 @@ export default {
       )
       col.controlType = controlType
     },
+    pulldownMultiSelect(col,pulldownView,selectRows){
+           //第一行选中
+          //  pulldownView.setLinkValue(selectRows[0], this.row)
+
+      // this.cellValueChange(scope)
+      // let vm = this
+      // for (let i = 1; i < selectRows.length; i++) {
+      //   let tempSelectRow = selectRows[i]
+      //   this.$emit('defaultRow', (newRow) => {
+      //     pulldownView.setLinkValue(tempSelectRow, newRow)
+      //     vm.insertAt(newRow, -1, false, (insertRow) => {
+      //       vm.cellValueChange({ row: insertRow, column: scope.column })
+      //     })
+      //   })
+      // }
+      this.$emit('selectRows', selectRows)
+    }
   },
 }
 </script>