cloud-web-corejs 1.0.54-dev.9 → 1.0.54-dev.91

package/src/components/fileLibrary/fileObjAuthDialog.vue

@@ -137,7 +137,7 @@
                 </vxe-grid>
               </div>
             </el-tab-pane>
-            <el-tab-pane :label="$t1('文件操作，发系统通知')" name="second">
+            <el-tab-pane :label="$t1('文件操作，发系统通知')" name="second" v-if="fileStoreArea.toNotify">
               <div class="grid-height" style="height: 500px">
                 <fileObjNotifyEdit v-if="showFileObjNotifyEdit" visible-key="showFileObjNotifyEdit"
                                    :current_prefix="current_prefix" :_dataId="fileObjId" :parent-target="_self"

package/src/components/fileLibrary/fileObjAuthEditDialog.vue

@@ -150,7 +150,7 @@
             <el-switch v-model="fileObjAuth.shareAuth" :active-value="1" :inactive-value="0"
                        :disabled="fileObjAuth._isParent"/>
           </el-form-item>
-          <el-form-item prop="downWatermarkAuth" :label="$t1('下载打水印')"
+          <el-form-item v-if="fileStoreArea.toDownWatermark" prop="downWatermarkAuth" :label="$t1('下载打水印')"
                         :rules="[{ required: false, trigger: 'blur' }]">
             <el-switch v-model="fileObjAuth.downWatermarkAuth" :active-value="1" :inactive-value="0"
                        :disabled="fileObjAuth._isParent"/>

package/src/components/fileLibrary/fileObjNotifyEdit.vue

@@ -1,10 +1,11 @@
 <template>
-  <div class="detail-wrap">
+  <div class="detail-wrap" style="margin: -6px -8px;">
     <el-form ref="editForm" :model="fileObjNotify">
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ isEdit ? $t1('查看文件对象通知设置') : $t1('新增文件对象通知设置') }}
+          <!--{{ isEdit ? $t1('查看文件对象通知设置') : $t1('新增文件对象通知设置') }}-->
+          {{ $t1('文件操作 - 发系统通知设置') }}
         </div>
         <div class="fr">
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
@@ -14,71 +15,47 @@
           </el-button>
         </div>
       </div>
-      <div class="d-cont">
-        <div class="d-item">
-          <div class="title first"><b>{{ $t1('基本信息') }}</b></div>
-          <table class="table-detail">
-            <tbody>
-            <tr class="noTr">
-              <th class="no"></th>
-              <td></td>
-              <th class="no"></th>
-              <td></td>
-              <th class="no"></th>
-              <td></td>
-              <th class="no"></th>
-              <td></td>
-            </tr>
-            <tr>
-              <th style="width: 215px;">
-                <em class="f-red">*</em>
-                {{ $t1('文件夹内文件操作是否通知') }}
-              </th>
-              <td colspan="7">
-                <el-form-item prop="toNotify" :rules="[{ required: true, trigger: 'blur' }]">
-                  <el-radio-group v-model="fileObjNotify.toNotify">
-                    <el-radio :label="0">{{ $t1('不通知') }}</el-radio>
-                    <el-radio :label="1">{{ $t1('针对当前文件夹中的文件操作') }}</el-radio>
-                    <el-radio :label="2">{{ $t1('针对当前文件夹与下级所有文件夹的文件操作') }}</el-radio>
-                  </el-radio-group>
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <th>
-                {{ $t1('新增文件-通知模板编码') }}
-              </th>
-              <td colspan="3">
-                <el-form-item prop="addNtCode" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="fileObjNotify.addNtCode" clearable/>
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <th>
-                {{ $t1('删除文件-通知模板编码') }}
-              </th>
-              <td colspan="3">
-                <el-form-item prop="deleteNtCode" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="fileObjNotify.deleteNtCode" clearable/>
-                </el-form-item>
-              </td>
-            </tr>
-            <tr>
-              <th>
-                {{ $t1('替换文件-通知模板编码') }}
-              </th>
-              <td colspan="3">
-                <el-form-item prop="replaceNtCode" :rules="[{ required: false, trigger: 'blur' }]">
-                  <el-input type="text" autocomplete="off" v-model="fileObjNotify.replaceNtCode" clearable/>
-                </el-form-item>
-              </td>
-            </tr>
-
-            </tbody>
-          </table>
+      <div class="d-cont" style="height: 470px;">
+        <div class="d-item d-i-left">
+          <div class="d-i-tit">
+            {{ $t1('文件操作，是否发系统通知') }}
+          </div>
+          <el-form-item prop="toNotify" :rules="[{ required: true, trigger: 'blur' }]">
+            <el-radio-group v-model="fileObjNotify.toNotify">
+              <div>
+                <el-radio :label="0">{{ $t1('不发系统通知') }}</el-radio>
+              </div>
+              <div>
+                <el-radio :label="1">{{ $t1('针对当前文件夹中的文件操作') }}</el-radio>
+              </div>
+              <div>
+                <el-radio :label="2">{{ $t1('当前文件夹与下级所有文件夹的文件进行了操作，发系统通知') }}</el-radio>
+              </div>
+            </el-radio-group>
+          </el-form-item>
+        </div>
+        <div class="d-item d-i-right">
+          <div class="d-i-tit">
+            {{ $t1('不同的文件操作类型，设置对应的系统通知模板') }}
+          </div>
+          <el-form-item prop="addNtCode" :rules="[{ required: false, trigger: 'blur' }]"
+                        :label="$t1('新增文件-通知模板编码')">
+            <el-input type="text" autocomplete="off" v-model="fileObjNotify.addNtCode" clearable/>
+          </el-form-item>
+          <el-form-item prop="deleteNtCode" :rules="[{ required: false, trigger: 'blur' }]"
+                        :label="$t1('删除文件-通知模板编码')">
+            <el-input type="text" autocomplete="off" v-model="fileObjNotify.deleteNtCode" clearable/>
+          </el-form-item>
+          <el-form-item prop="replaceNtCode" :rules="[{ required: false, trigger: 'blur' }]"
+                        :label=" $t1('替换文件-通知模板编码')">
+            <el-input type="text" autocomplete="off" v-model="fileObjNotify.replaceNtCode" clearable/>
+          </el-form-item>
         </div>
       </div>
+      <div class="tips">{{
+          $t1('注：删除文件发通知，包括从当前文件夹移动、删除文件。 新增文件发通知，包括上传、复制、移动、从回收站还原文件到当前文件夹下。')
+        }}
+      </div>
     </el-form>
   </div>
 </template>
@@ -134,8 +111,6 @@ export default {
         if (valid) {
           this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
             var url = this.current_prefix + `/file_obj_notify/save`;
-            debugger
-            let a = 1;
             this.$http({
               url: url,
               method: `post`,
@@ -159,7 +134,7 @@ export default {
   }
 };
 </script>
-<style scoped>
+<style scoped lang="scss">
 .noTr th {
   height: 0px
 }
@@ -167,4 +142,51 @@ export default {
 .noTr td {
   height: 0px
 }
+
+.d-cont {
+  display: flex;
+  margin: -11px -12px;
+
+  .d-i-left, .d-i-right {
+    border: none !important;
+    padding: 24px 18px 24px 14px !important
+  }
+
+  .d-i-left {
+    width: 420px;
+  }
+
+  .d-i-tit {
+    background: #f7f7f7;
+    line-height: 36px;
+    padding: 0 10px;
+    margin-bottom: 16px;
+    font-size: 13px
+  }
+
+  .d-i-right {
+    border-left: solid 1px #e9e9e9 !important;
+    flex: 1;
+    padding-left: 32px !important;
+
+    ::v-deep .el-form-item {
+      margin-bottom: 16px;
+
+      .el-form-item__content {
+        .el-input {
+          width: 360px !important;
+        }
+      }
+    }
+  }
+}
+
+.tips {
+  margin-top: -40px;
+  background: #FFF;
+  position: relative;
+  line-height: 40px;
+  border-top: solid 1px #e9e9e9;
+  padding-left: 12px;
+}
 </style>

package/src/components/fileLibrary/index.vue

@@ -504,7 +504,7 @@
     </div>
     <propertiesDialog v-if="showPropertiesDialog" :visiable.sync="showPropertiesDialog"
                       :editAttachment.sync="editAttachment" :isEdit="isEdit"
-                      :treeNodeArr.sync="treeNodeArr"></propertiesDialog>
+                      :treeNodeArr.sync="treeNodeArr" :option="option"></propertiesDialog>
     <el-image-viewer v-if="showViewer" :on-close="() => {showViewer = false;}" :initial-index.sync="chooseIndex"
                      :url-list="imageDTOs"/>
     <categoryMoveDialog :checkRows.sync="checkRows" v-if="showCategoryMoveDialog"
@@ -522,7 +522,7 @@
                           :formData.sync="advancedFormData" @confirm="searchEvent">
       <template #form>
         <vxe-form :model="advancedFormData" title-width="102px" :inline="true" class="adSearchForm">
-          <vxe-form-item title="属性名称:">
+<!--          <vxe-form-item title="属性名称:">
             <template v-slot>
               <el-input v-model="advancedFormData.attributeName" clearable/>
             </template>
@@ -531,7 +531,7 @@
             <template v-slot>
               <el-input v-model="advancedFormData.attributeValue" clearable/>
             </template>
-          </vxe-form-item>
+          </vxe-form-item>-->
           <!--          <vxe-form-item title="状态:">
                       <template v-slot>
                         <el-select v-model="advancedFormData.status" clearable>

package/src/components/fileLibrary/mixins/fileObjAuthDialogMixin.js

@@ -17,7 +17,7 @@ modules = {
   components: {
     editView, userDialog, positionDialog, saleOrgDialog, roleDialog, fileObjAuthEditDialog, fileObjNotifyEdit
   },
-  inject: ['current_prefix'],
+  inject: ['current_prefix', 'getFileStoreArea'],
   mounted() {
     this.initTableList();
   },
@@ -56,6 +56,11 @@ modules = {
       showFileObjNotifyEdit: true
     };
   },
+  computed: {
+    fileStoreArea() {
+      return this.getFileStoreArea();
+    }
+  },
   methods: {
     searchEvent() {
       this.$refs['table-m1'].commitProxy('reload');
@@ -285,7 +290,7 @@ modules = {
               }
             }
           },
-          {
+          ...(this.fileStoreArea.toDownWatermark ? [{
             title: this.$t1('下载打水印 '),
             field: 'downWatermarkAuth',
             width: 150,
@@ -297,7 +302,7 @@ modules = {
                 ];
               }
             }
-          },
+          }] : []),
           {title: this.$t2('创建人', 'system.label.createBy'), field: 'createBy', width: 150},
           {title: this.$t2('创建时间', 'system.label.createDate'), field: 'createDate', width: 150},
           {title: this.$t2('更新人', 'system.label.modifyBy'), field: 'modifyBy', width: 150},

package/src/components/fileLibrary/mixins/fileObjAuthEditDialogMixin.js

@@ -14,7 +14,7 @@ modules = {
   components: {
     userDialog, positionDialog, saleOrgDialog, roleDialog
   },
-  inject: ['current_prefix'],
+  inject: ['current_prefix', 'getFileStoreArea'],
   data() {
     return {
       isEdit: false,
@@ -56,6 +56,9 @@ modules = {
       let prevTitle = this.currentRow ? this.$t2('查看', 'system.button.check') : this.$t2('新增', 'system.button.add')
       let title = prevTitle + this.$t2('文件权限', 'components.fileLibrary.fileAuth')
       return title;
+    },
+    fileStoreArea(){
+      return this.getFileStoreArea();
     }
   },
   mounted() {

package/src/components/fileLibrary/mixins/fileObjAuthEditMixin.js

@@ -13,7 +13,7 @@ modules = {
   components: {
     userDialog, positionDialog, saleOrgDialog, roleDialog
   },
-  inject: ['current_prefix'],
+  inject: ['current_prefix', 'getFileStoreArea'],
   data() {
     return {
       isEdit: false,

package/src/components/fileLibrary/mixins/indexMixins.js

@@ -44,6 +44,9 @@ modules = {
       getObjectForeignId: () => {
         return this.objectForeignId;
       },
+      getFileStoreArea: () => {
+        return this.fileStoreArea;
+      }
     };
   },
   async created() {
@@ -73,6 +76,7 @@ modules = {
       billDialogContent: null,
       checkBillDatas: [],
       title: "",
+      fileStoreArea: {},
       folderStatus: false,
       filterText: "",
       defaultProps: {
@@ -1004,36 +1008,44 @@ modules = {
           rows.forEach((value) => {
             value.leaf = !value.hasChild;
           });
+          let items = [];
           if (node.level === 0) {
+            let item = {
+              parent: null,
+              fileName: this.title,
+              leaf: rows.length == 0,
+              allFileBtn: true,
+              id: 0,
+              children: rows,
+            };
+            items.push(item);
             setTimeout(() => {
               this.$refs.tree.setCurrentKey(node.childNodes[0].data);
               this.handleNodeData(node.childNodes[0]);
               node.childNodes[0].expand();
+              if (this.option.treeExpandAll) {
+                //默认全部展开树分类
+                node.childNodes[0].childNodes.forEach(item => {
+                  if (!item.data.leaf) item.expand();
+                })
+              }
             }, 200);
             this.$nextTick(() => {
               callback && callback();
             });
             this.searchEvent();
           } else {
+            items = rows;
             this.$nextTick(() => {
+              if (this.option.treeExpandAll) {
+                //默认全部展开树分类
+                node.childNodes.forEach(item => {
+                  if (!item.data.leaf) item.expand();
+                })
+              }
               callback && callback();
             });
           }
-          let items = [];
-          if (node.level === 0) {
-            let item = {
-              parent: null,
-              fileName: this.title,
-              leaf: rows.length == 0,
-              allFileBtn: true,
-              id: 0,
-              children: rows,
-            };
-            items.push(item);
-          } else {
-            items = rows;
-          }
-
           resolve(items);
         },
       });
@@ -1403,6 +1415,7 @@ modules = {
         success: (res) => {
           let fileStoreArea = res.objx;
           if (fileStoreArea) {
+            this.fileStoreArea = fileStoreArea;
             this.title = fileStoreArea.storeAreaName;
             this.$nextTick(() => {
               treeScollx({target: this, type: "default"});
@@ -1749,11 +1762,12 @@ modules = {
       }
     },
     downloadSingerFile(attachment) {
+
       let fileObjAuth = this.fileObjAuth;
       if (attachment.dirs || !fileObjAuth.downloadAuth) return
       let url = attachment.domain + attachment.url;
-      let loginAccount = this.$store.getters.loginAccount;
-      if (fileObjAuth.downWatermarkAuth) {
+      if (this.fileStoreArea.toDownWatermark && fileObjAuth.downWatermarkAuth) {
+        let loginAccount = this.$store.getters.loginAccount;
         url += '?_w=' + encode(loginAccount)
       }
       this.$commonFileUtil.downloadFile(url, attachment.fileName)

package/src/components/fileLibrary/mixins/propertiesDialogMixins.js

@@ -8,7 +8,8 @@ modules = {
     },
     treeNodeArr: {
       type: Array
-    }
+    },
+    option:Object
   },
   inject: ['current_prefix', 'getTitle'],
   components: {},

package/src/components/fileLibrary/propertiesDialog.vue

@@ -58,6 +58,10 @@
                     <th>{{ $t2('所属对象描述', 'components.fileLibrary.note') }}</th>
                     <td colspan="3">{{ attachmentDTO.note }}</td>
                   </tr>
+                  <tr>
+                    <th>{{ $t1('文件类型名') }}</th>
+                    <td colspan="3">{{ attachmentDTO.fileTypeName }}</td>
+                  </tr>
                   <tr>
                     <th>{{ $t2('文件大小', 'components.fileLibrary.fileSize') }}</th>
                     <td>{{ formatFileSize(attachmentDTO.fileSize) }}</td>