doway-coms 2.11.78 → 2.11.80

package/package.json

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

package/packages/BaseFileGroup/src/index.vue

@@ -13,13 +13,18 @@
           }">
           <vxe-column title="菜单权限" tree-node>
             <template #default="{ row }">
-              <span>
-                <a-icon type="folder-open" v-if="$refs.eisTreeView.isTreeExpandByRow(row)" />
-                <a-icon v-else type="folder" />
-                <span>{{ row.name }}</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>
+              <div class="folder-header">
+                <div class="folder-content">
+                  <a-icon type="folder-open" v-if="$refs.eisTreeView.isTreeExpandByRow(row)" />
+                  <a-icon v-else type="folder" />
+                  <span class="folder-name">{{ row.name }}</span>
+                </div>
+                <div class="folder-actions" v-if="edit === true">
+                  <a-button size="small" type="primary" @click="handleAddSubFolder(row)">添加</a-button>
+                  <a-button size="small" type="default" @click="handleEditSubFolder(row)"
+                    v-if="row.id !== 'sys_top_folder'">编辑</a-button>
+                </div>
+              </div>
             </template>
           </vxe-column>
         </vxe-table>
@@ -38,10 +43,14 @@
         <div class="card-view-items">
           <div class="card-view-item" :style="{ width: itemWidth + 'px' }" v-for="loopFileData in currentFolderData"
             @dblclick="panelFolderDblClick(loopFileData)" :key="loopFileData.id">
-            {{ loopFileData.name }}
-            <div @click="removeAttach(loopFileData)" v-if="edit === true">删除</div>
-            <div @click="downloadAttach(loopFileData)"
-              v-if="loopFileData.attachType === 'file' && allowDownload === true">下载
+            <div class="card-content">
+              <div class="card-name">{{ loopFileData.name }}</div>
+              <div class="card-actions">
+                <a-button class="download-btn" size="small" type="primary" @click="downloadAttach(loopFileData)"
+                  v-if="loopFileData.attachType === 'file' && allowDownload === true">下载</a-button>
+                <a-button class="delete-btn" size="small" type="danger" @click="removeAttach(loopFileData)"
+                  v-if="edit === true">删除</a-button>
+              </div>
             </div>
           </div>
 
@@ -82,7 +91,7 @@
 </template>
 
 <script>
-import { notification, Upload, Tree, Icon, Popconfirm, Input } from "ant-design-vue";
+import { notification, Upload, Tree, Icon, Popconfirm, Input, Button } from "ant-design-vue";
 import { Checkbox, Modal } from "vxe-table";
 import { attachGetAttachUrlApi, attachSearchApi } from "../../utils/api";
 import XEUtils from 'xe-utils'
@@ -99,7 +108,8 @@ export default {
     'a-tree': Tree,
     'a-icon': Icon,
     'a-popconfirm': Popconfirm,
-    'a-input': Input
+    'a-input': Input,
+    'a-button': Button
   },
   data() {
     return {
@@ -506,7 +516,7 @@ export default {
       let tempRemoveRows = XEUtils.filter(this.internalRows, p => p.sysRowState === 'delete' && p.id !== 'sys_top_folder')
       let tempAddRows = XEUtils.filter(this.internalRows, p => p.sysRowState === 'add' && p.id !== 'sys_top_folder')
       let tempUpdateRows = XEUtils.filter(this.internalRows, p => p.sysRowState === 'update' && p.id !== 'sys_top_folder')
-      let tempRows = XEUtils.clone(XEUtils.union(tempRemoveRows, tempAddRows, tempUpdateRows),true)
+      let tempRows = XEUtils.clone(XEUtils.union(tempRemoveRows, tempAddRows, tempUpdateRows), true)
       XEUtils.arrayEach(tempRows, p => {
         if (p.parentId === 'sys_top_folder') {
           p.parentId = null
@@ -667,6 +677,28 @@ export default {
   align-items: center;
 }
 
+.folder-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+
+  .folder-content {
+    display: flex;
+    align-items: center;
+    gap: 4px;
+
+    .folder-name {
+      margin-left: 4px;
+    }
+  }
+
+  .folder-actions {
+    display: flex;
+    gap: 6px;
+  }
+}
+
 .card-view-items {
   // margin-top: 100px;
   // margin-left: 100px;
@@ -688,11 +720,7 @@ export default {
 
   .card-view-item {
     cursor: pointer;
-    // height: 100px;
-    // margin-top: 4px;
-    // margin-right: 8px;
-    // margin-bottom: 4px;
-    // margin-left: 8px;
+    position: relative;
     flex-grow: 1;
     flex-shrink: 1;
     flex-basis: auto;
@@ -702,19 +730,45 @@ export default {
     margin-bottom: 4px;
     margin-left: 8px;
     padding: 8px 8px 8px 8px;
-    //border-color: #9ad4dc;
     min-width: 150px;
+    min-height: 80px;
     border-radius: 6px;
 
+    .card-content {
+      position: relative;
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+
+      .card-name {
+        flex: 1;
+        word-wrap: break-word;
+        margin-bottom: 8px;
+      }
+
+      .card-actions {
+        position: absolute;
+        bottom: 4px;
+        left: 4px;
+        right: 4px;
+        display: flex;
+        justify-content: space-between;
+
+        .download-btn {
+          // 固定在左下角
+        }
+
+        .delete-btn {
+          // 固定在右下角
+        }
+      }
+    }
+
     .card-view-icon {
       float: left;
       width: 64px;
       height: 64px;
     }
-
-    // .card-view-desc {
-    //   padding-left: 85px;
-    // }
   }
 
   .card-view-item:hover {

package/packages/BaseGrid/src/index.vue

@@ -3132,6 +3132,7 @@ export default {
                 operator: 'and',
               },
             };
+            this.$emit('beforeExport',searchParam)
             this.$refs.exportCmpView.show(this.moduleCode,this.dataCode,this.dataName,pagerBtnInfo.field,searchParam,this.columns
       )
       }