doway-coms 2.4.6 → 2.4.8

package/package.json

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

package/packages/BaseFileGroup/src/index.vue

@@ -1,8 +1,47 @@
 <template>
   <div style="height:300px">
     <splitpanes class="default-theme">
-      <pane>
-        <a-tree :tree-data="fileGroupData" :selectedKeys="currentSelectKey" :replaceFields="{title:'name',key:'id'}" show-icon default-expand-all @select="handleFileGroupSelect">
+      <pane size="20">
+        <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="{
+                    transform: true,
+                    line: true,
+                    rowField: 'id',
+                    parentField: 'parentId',
+                    expandRowKeys:['sys_top_folder']
+                  }"
+                >
+                  <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>
+                    </template>
+                  </vxe-column>
+                  <vxe-column width="80px">
+                    <template #default="{ row }">
+                      <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>
+                </vxe-table>
+        <!-- <a-tree :tree-data="fileGroupData" :selectedKeys="currentSelectKey" :replaceFields="{title:'name',key:'id'}" show-icon default-expand-all @select="handleFileGroupSelect">
           <a-icon slot="fileGroup" type="folder" />
           <template #title="{ name,id }">
               <div>
@@ -11,7 +50,7 @@
                   <span @click="handleEditSubFolder(id,name)"  v-if="edit===true && id!=='sys_top_folder'">编辑</span>
               </div>
           </template>
-        </a-tree>
+        </a-tree> -->
       </pane>
       <pane>
         <div class="card-view-items">
@@ -20,7 +59,8 @@
               <div @click="removeAttach(loopFileData)"  v-if="edit===true">删除</div>
               <div @click="downloadAttach(loopFileData)" v-if="loopFileData.attachType==='file' && allowDownload===true">下载</div>
             </div>
-            <div class="card-view-item" :style="{ width: itemWidth + 'px' }" v-if="edit===true">
+           
+            <div class="card-view-item" :style="{ width: itemWidth + 'px' }" v-if="edit===true && currentSelectKey.length>0">
               <a-upload
                 class="avatar-uploader"
                 :headers="uploadHeaders"
@@ -96,7 +136,6 @@
 
 <script>
 import { notification, Upload,Tree,Icon,Popconfirm,Input } from "ant-design-vue";
-import { sysRowState } from "../../utils/enum";
 import { Checkbox, Modal } from "vxe-table";
 import { attachGetAttachUrlApi, attachSearchApi } from "../../utils/api";
 import XEUtils from 'xe-utils'
@@ -120,7 +159,7 @@ export default {
       showEditFolder:false,
       currentEditInfo:{},
       currentEditFolderValue:'',
-      currentSelectKey:['1'],
+      currentSelectKey:[],
       fileGroupData:[],
       internalRows: [],
       itemWidth:200,
@@ -139,8 +178,7 @@ export default {
         if(this.currentSelectKey.length===0){
           return []
         }
-        console.debug(this.internalRows)
-        return this.internalRows.filter(p=>p.parentId==this.currentSelectKey[0] && p.sysRowState!==sysRowState.delete)
+        return this.internalRows.filter(p=>p.parentId==this.currentSelectKey[0] && p.sysRowState!=='delete')
      }
   },
   props: {
@@ -250,9 +288,9 @@ export default {
     buildTreeData(tempRows){
       this.internalRows =JSON.parse(JSON.stringify(tempRows))
       let tempTopFolder = {
-            sysRowState: sysRowState.view,
+            sysRowState: 'view',
             parentId: null,
-            sort:1,
+            sort:0,
             attachType:'folder',
             name:'文件',
             id:'sys_top_folder',
@@ -264,11 +302,15 @@ export default {
           }
           p.parentId = 'sys_top_folder'
       })
-      // console.debug(this.internalRows)
 
       // 
-      let tempFoldRows =  XEUtils.filter(this.internalRows,p=>p.attachType==='folder')
-      this.fileGroupData = XEUtils.toArrayTree(tempFoldRows,{strict:true,sortKey:'sort'})
+      this.fileGroupData = XEUtils.orderBy(XEUtils.filter(this.internalRows,p=>p.attachType==='folder'),p=>p.sort)
+      console.debug('davistest',this.fileGroupData)
+      if(this.currentSelectKey.length===0){
+          this.$refs.eisTreeView.setCurrentRow(tempTopFolder)
+          this.currentSelectKey = [tempTopFolder.id]
+      }
+      // this.fileGroupData = XEUtils.toArrayTree(tempFoldRows,{strict:true,sortKey:'sort'})
       
       // // this.internalRows.push(tempTopFolder)
       // this.fileGroupData = [tempTopFolder]
@@ -277,48 +319,47 @@ export default {
       
       // this.fileData = XEUtils.filter(tempRows,p=>p.attachType==='file')
     },
-    handleAddSubFolder(loopId){
+    handleAddSubFolder(rowInfo){
         //添加子项文件夹
-        this.currentEditInfo =XEUtils.find(this.internalRows,p=>p.id===loopId)
+        this.currentEditInfo =XEUtils.find(this.internalRows,p=>p.id===rowInfo.id)
         this.currentEditInfo['operation'] = 'add'
         this.showEditFolder = true
     },
-    handleEditSubFolder(loopId,loopName){
-      this.currentEditFolderValue = loopName
+    handleEditSubFolder(rowInfo){
+      this.currentEditFolderValue = rowInfo.name
         //添加子项文件夹
-        this.currentEditInfo =XEUtils.find(this.internalRows,p=>p.id===loopId)
+        this.currentEditInfo =XEUtils.find(this.internalRows,p=>p.id===rowInfo.id)
         this.currentEditInfo['operation'] = 'edit'
         this.showEditFolder = true
     },
+    eisCurrentChange(scope) {
+      this.currentSelectKey = [scope.row.id]
+      
+    },
     confirmEditFolder(){
+
+        let tempRowInfo = this.$refs.eisTreeView.getRowById(this.currentEditInfo.id)
         if(this.currentEditInfo.operation==='add'){
-          let tempNodeInfo =  XEUtils.findTree(this.fileGroupData,p=>p.id===this.currentEditInfo.id)
             //新增文件夹
             let tempAddRowInfo = {
-              sysRowState: sysRowState.add,
+              sysRowState: 'add',
               parentId: this.currentEditInfo.id,
-              sort:tempNodeInfo.item.children?tempNodeInfo.item.children.length+1:1,
+              sort: tempRowInfo.children.length+1,
               attachType:'folder',
               children:[],
               name:this.currentEditFolderValue,
               id:this.$store.getters.newId() + "",
             }
             this.internalRows.push(tempAddRowInfo)
-            if(tempNodeInfo.item.children){
-              tempNodeInfo.item.children.push(tempAddRowInfo)
-            }else{
-              tempNodeInfo.item['children'] = [tempAddRowInfo]
-            }
-            
+            this.$refs.eisTreeView.insertAt(tempAddRowInfo,-1)
         }else{
-          let tempRowInfo =  XEUtils.find(this.internalRows,p=>p.id===this.currentEditInfo.id)
-          if(tempRowInfo.sysRowState!==sysRowState.add){
-            tempRowInfo.sysRowState = sysRowState.update
+          let tempInternalRowInfo =  XEUtils.find(this.internalRows,p=>p.id===this.currentEditInfo.id)
+          if(tempInternalRowInfo.sysRowState!=='add'){
+            tempInternalRowInfo.sysRowState = 'update'
           }
-          tempRowInfo.name = this.currentEditFolderValue
+          tempInternalRowInfo.name = this.currentEditFolderValue
           //修改树节点名称
-          let tempNodeInfo =  XEUtils.findTree(this.fileGroupData,p=>p.id===this.currentEditInfo.id)
-          tempNodeInfo.item.name =  tempRowInfo.name
+          tempRowInfo.name =  tempInternalRowInfo.name
         }
         this.showEditFolder = false
         this.currentEditFolderValue =null
@@ -327,6 +368,17 @@ export default {
         if(loopFileData.attachType==='file'){
           return
         }
+
+        let tempParentRowInfo  = this.$refs.eisTreeView.getRowById(loopFileData.parentId)
+        let tempExpandRows = []
+        if(tempParentRowInfo){
+          tempExpandRows.push(tempParentRowInfo)
+        }
+        let tempRowInfo  = this.$refs.eisTreeView.getRowById(loopFileData.id)
+        this.$refs.eisTreeView.setCurrentRow(tempRowInfo)
+
+        tempExpandRows.push(tempRowInfo)
+        this.$refs.eisTreeView.setTreeExpand(tempExpandRows,true)
         this.currentSelectKey = [loopFileData.id]
     },
     handleFileGroupSelect(selectedKeys){
@@ -400,12 +452,11 @@ export default {
         //添加文件数据
         let addRow = {
             attachId: info.file.response.content.id,
-            sysRowState: sysRowState.add,
-            attach: info.file.response.content,
+            sysRowState: 'add',
             parentId: this.currentSelectKey[0],
             fileType: info.file.response.content.fileType,
             sort:this.internalRows.length+1,
-            attachFile:'file',
+            attachType:'file',
             name:info.file.response.content.name,
             id:this.$store.getters.newId() + "",
           }
@@ -472,7 +523,7 @@ export default {
     },
     removeAttach(attachFile) {
       //检查是否存在子项文件夹或者文件需要删除
-      let tempChild =  XEUtils.find(this.internalRows,p=>p.parentId==attachFile.id && p.sysRowState!==sysRowState.delete)
+      let tempChild =  XEUtils.find(this.internalRows,p=>p.parentId==attachFile.id && p.sysRowState!=='delete')
       if(tempChild){
         notification.error({
           message: "错误",
@@ -483,10 +534,10 @@ export default {
       // console.debug(attachFile)
       for (let i = 0; i < this.internalRows.length; i++) {
         if (this.internalRows[i].id === attachFile.id) {
-          if (this.internalRows[i].sysRowState === sysRowState.add) {
+          if (this.internalRows[i].sysRowState === 'add') {
             this.internalRows.splice(i, 1);
           } else {
-            this.$set(this.internalRows[i], "sysRowState", sysRowState.delete);
+            this.$set(this.internalRows[i], "sysRowState", 'delete');
           }
           break;
         }
@@ -501,6 +552,21 @@ export default {
           `?accessToken=${this.$store.getters.token}`
       );
     },
+    getUpdateRows(){
+      //先获取删除数据，因为前台删除一个明细后又添加相同的明细后台会
+      //报唯一索引错误，因为后台也是先添加然后再是删除的会照成问题
+      //所有就要把删除的放在数组的第一个传递过去，这样后台就先删除然后再新增了
+      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.union(tempRemoveRows,tempAddRows,tempUpdateRows)
+      XEUtils.arrayEach(tempRows,p=>{
+          if(p.parentId==='sys_top_folder'){
+              p.parentId = null
+          }
+      })
+      return tempRows
+    },
     /**
      * 查看附件
      */
@@ -611,6 +677,10 @@ export default {
     }
   }
 }
+.tree-node-icon {
+  width: 16px;
+  text-align: center;
+}
 
 .avatar-uploader .el-upload {
   border: 1px solid #d9d9d9;

package/packages/BaseGrid/src/index.vue

@@ -1603,7 +1603,7 @@ export default {
               let tmpRow = JSON.parse(JSON.stringify(this.copySaveRow))
               delete tmpRow['_X_ROW_KEY']
               delete tmpRow[childrenField]
-              tmpRow[parentField]=row.id
+              tmpRow[parentField]=row==null?null:row.id
               $table.insertAt(tmpRow, -1)
                 .then(({ row }) => {
                   pasteChildren(this.copySaveRow, childrenField,parentField)
@@ -2417,7 +2417,7 @@ export default {
       let colElId = scope.column.id
       let rowElId = scope.row._X_ROW_KEY
       //如果用了rowConfig里的keyField 
-      if(this.rowConfig.keyField){
+      if(this.rowConfig!=null&&this.rowConfig.keyField){
         rowElId=scope.row[this.rowConfig.keyField]
       }
       //延迟设置输入框自动获取焦点以及选中