cloud-web-corejs 1.0.54-dev.10 → 1.0.54-dev.101

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/filterDialog.vue

@@ -0,0 +1,379 @@
+<template>
+  <el-dialog
+    title="高级筛选"
+    :append-to-body="true"
+    :modal-append-to-body="true"
+    :close-on-click-modal="falseValue"
+    :visible.sync="showDialog"
+    :modal="falseValue"
+    custom-class="dialog-style proList-dialog"
+    width="1200px"
+    @close="dialogClose"
+    v-el-drag-dialog
+    v-el-dialog-center
+  >
+    <div class="cont">
+      <div id="containt" style="height:550px">
+        <div class="search-criteria fl" style="width:220px;height:100%;">
+          <div class="tit"><i class="iconfont icon-shaixuan"></i><b>搜索条件</b></div>
+
+          <el-form label-position="top">
+            <div style="height:468px;padding-top: 10px;overflow:auto">
+              <el-form-item label="文件名">
+                <el-input v-model="formData.fileName" size="small" clearable/>
+              </el-form-item>
+<!--              <el-form-item label="所属对象描述">
+                <base-input-batch v-model="formData.note"/>
+              </el-form-item>-->
+              <el-form-item label="创建时间">
+                <el-date-picker
+                  v-model="formData.startTime"
+                  type="date"
+                  placeholder=""
+                  size="small"
+                  clearable
+                  value-format="yyyy-MM-dd"
+                  :picker-options="$baseStartPickerOptions(formData.endTime)"
+                ></el-date-picker>
+                <span>-</span>
+                <el-date-picker
+                  v-model="formData.endTime"
+                  type="date"
+                  placeholder=""
+                  size="small"
+                  clearable
+                  value-format="yyyy-MM-dd"
+                  :picker-options="$baseEndPickerOptions(formData.startTime)"
+                ></el-date-picker>
+              </el-form-item>
+              <el-form-item label="文件类型">
+                <el-select v-model="fileTypeSn" @change="getAttributeList">
+                  <el-option v-for="(item,index) in fileTypes" :key="index" :label="item.fileTypeName"
+                             :value="item.fileTypeSn"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item v-for="(item,index) in fileAttributes" :key="index" :label="item.attributeName">
+                <el-input v-model="item.formValue" clearable></el-input>
+              </el-form-item>
+            </div>
+            <el-form-item class="btns">
+              <el-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="primary" plain>重置
+              </el-button>
+              <el-button type="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
+              </el-button>
+            </el-form-item>
+          </el-form>
+        </div>
+        <label id="labBtn" class="labBtn1" style="cursor:unset;height: 100%;">
+          <!--          <div class="icon">
+                      <i class="el-icon-more"></i>
+                      <i class="el-icon-more"></i>
+                    </div>-->
+        </label>
+        <div class="main-right fr" style="width:calc(100% - 220px);padding-left: 6px;">
+          <div style="height:100%">
+            <vxe-grid
+              ref="table-m1"
+              v-bind="vxeOption"
+              @resizable-change="$vxeTableUtil.onColumnWitchChange"
+              @custom="$vxeTableUtil.customHandle"
+            >
+              <template #form>
+                <div class="clearfix screen-btns">
+                  <div class="fl screen-breadcrumb">
+                    <el-breadcrumb separator-class="el-icon-arrow-right ">
+                      <el-breadcrumb-item><i class="iconfont icon-dingwei-mianxing"></i><span class="f-blue"
+                                                                                              @click="checkTreeNode()">搜索范围</span>
+                      </el-breadcrumb-item>
+                      <el-breadcrumb-item v-for="(treeNode,index) in treeNodeArr" :key="index">
+                        <span class="f-blue" @click="checkTreeNode(treeNode)">{{ treeNode.label }}</span>
+                      </el-breadcrumb-item>
+                    </el-breadcrumb>
+                  </div>
+                  <div class="fr">
+                    <!--                    <vxe-button icon="el-icon-brush" class="button-sty" @click="resetEvent" type="text"
+                                                    status="primary"
+                                                    plain>重置
+                                        </vxe-button>
+                                        <vxe-button status="warning" icon="el-icon-search" class="button-sty" @click="searchEvent">搜索
+                                        </vxe-button>-->
+                  </div>
+                </div>
+              </template>
+              <template #fileName="{row}">
+                <div>
+                  <el-tooltip :enterable="false" effect="dark" :content="$t2('预览', 'components.fileLibrary.preview')"
+                              placement="top">
+                    <a class="a-link img" @click="$baseFilePreview(row)">
+                      <el-image :src="getShowUrl(row,'thumbnail')"></el-image>
+                    </a>
+                  </el-tooltip>
+                  <a class="a-link underLine" @click="$baseFilePreview(row)">{{ row.fileName }}</a>
+                </div>
+              </template>
+            </vxe-grid>
+          </div>
+        </div>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+
+<script>
+import {selectDialogMixins} from '@base/mixins/selectDialog/index.js';
+
+import {treeScollx, treeScolly} from '@base/utils/global.js';
+import {encode} from "js-base64";
+
+export default {
+  name: 'productDialog',
+  props: ['visiable', 'multi', 'rows', 'treeNodeArr', 'currentFileCategory'],
+  mixins: [selectDialogMixins],
+  inject: ['current_prefix', 'storeAreaCode', 'getObjectForeignId', 'getIsPrivate'],
+  created() {
+    this.initSetting({treeScolly: false});
+    /*setTimeout(() => {
+      treeScollx({target: this, type: 'default', dragBtn: '.labBtn1'});
+      treeScolly({target: this, type: 'selectDialog', dragBtn: '.labBtn2'});
+    }, 200);*/
+
+  },
+  mounted() {
+    this.getFileTypeList();
+    this.initTableM1();
+  },
+
+  computed: {},
+  data() {
+    return {
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+      formData: {},
+      vxeOption: {},
+
+      fileTypes: [],
+      fileAttributes: [],
+      fileTypeSn: null,
+      fileAttachAttributeCDTos: []
+    };
+  },
+  methods: {
+    initTableM1() {
+      // debugger
+      let that = this;
+
+      let tableOption = {
+        vue: that,
+        tableRef: 'table-m1',
+        tableName: 'fileLigraryFilterDialog-m1',
+        path: this.current_prefix + "/file_obj/listAuthAttachPage",
+        param: () => {
+          /* let parents = this.currentFileCategory &&
+           this.currentFileCategory.id &&
+           this.currentFileCategory.id > 0
+             ? [this.currentFileCategory.id]
+             : [];*/
+          let fileAttachAttributeCDTOs = [];
+          this.fileAttributes.map(item => {
+            if (item.formValue !== "" && item.formValue !== null) {
+              fileAttachAttributeCDTOs.push({attributeSn: item.attributeSn, attributeValue: item.formValue});
+            }
+          })
+
+          let objectForeignId = this.getObjectForeignId();
+          let isPrivate = this.getIsPrivate();
+          return {
+            // parents,
+            objectForeignId: objectForeignId,
+            // privateDir: isPrivate ? 1 : 0,
+            fileAttachAttributeCDTOs,
+            storeAreaCode: this.storeAreaCode,
+            ...this.formData,
+          };
+        },
+        columns: [
+          {type: 'checkbox', width: 48, resizable: false, fixed: 'left'},
+          {
+            title: this.$t2('文件名称', 'components.fileLibrary.fileName'),
+            field: "fileName",
+            width: 250,
+            fixed: "left",
+            slots: {
+              default: 'fileName'
+            },
+          },
+          {
+            title: this.$t2('文件大小', 'components.fileLibrary.fileSize'),
+            field: "fileSize",
+            width: 150,
+            slots: {
+              default: ({row, $rowIndex}) => {
+                if (!row.dirs) {
+                  return this.formatFileSize(row.fileSize);
+                }
+              },
+            },
+          },
+          {
+            title: this.$t2('版本号', 'components.fileLibrary.fileRev'),
+            field: "rev",
+            width: 150,
+            slots: {
+              default: ({row, $rowIndex}) => {
+                if (!row.dirs) {
+                  return row.rev;
+                }
+              }
+            }
+          },
+          {title: this.$t2('分辨率', 'components.fileLibrary.widthHeight'), field: "widthHeight", width: 150},
+          {title: this.$t2('所属对象描述', 'components.fileLibrary.note'), field: "note", width: 250},
+          {
+            title: '状态',
+            field: 'status',
+            width: 150,
+            slots: {
+              default: ({row, $rowIndex}) => {
+                if (!row.dirs) {
+                  return row.status == 1 ? '已归档' : '未归档';
+                }
+              }
+            }
+          },
+          {
+            title: this.$t2('文件编码', 'components.fileLibrary.fileSn'),
+            field: "fileSn",
+            width: 150
+          },
+          // ...customColumns,
+          {title: this.$t2('创建人', 'components.fileLibrary.createBy'), field: "createBy", width: 150},
+          {
+            field: "createDate",
+            title: this.$t2('创建时间', 'components.fileLibrary.createDate'),
+            width: 150,
+          },
+          {
+            width: 47,
+            fixed: 'right',
+            title: '',
+            sortable: false,
+            slots: {
+              default: ({row, rowIndex}) => {
+                return [
+                  <div>
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      onclick={() => {
+                        this.openFileDirs(row);
+                      }}
+                    >
+                      <el-tooltip enterable={false} effect="dark" content={this.$t1('在文件夹中显示')} placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-view"/>
+                      </el-tooltip>
+                    </a>
+                  </div>
+                ];
+              }
+            }
+          }
+        ]
+      };
+      this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
+        that.vxeOption = opts;
+      });
+    },
+    openFileDirs(row) {
+      this.dialogClose();
+      this.$emit("openFileDirs", row)
+    },
+    getShowUrl(attachment, field) {
+      if (!field) field = "medium";
+      return this.$commonFileUtil.getShowUrl(
+        attachment.domain +
+        (attachment[field] ? attachment[field] : attachment.url)
+      );
+    },
+    formatFileSize(fileSize) {
+      fileSize = fileSize || 0;
+      if (fileSize < 1024) {
+        return fileSize + "B";
+      } else if (fileSize < 1024 * 1024) {
+        var temp = fileSize / 1024;
+        temp = temp.toFixed(2);
+        return temp + "KB";
+      } else if (fileSize < 1024 * 1024 * 1024) {
+        var temp = fileSize / (1024 * 1024);
+        temp = temp.toFixed(2);
+        return temp + "MB";
+      } else {
+        var temp = fileSize / (1024 * 1024 * 1024);
+        temp = temp.toFixed(2);
+        return temp + "GB";
+      }
+    },
+    searchEvent() {
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    resetEvent() {
+      this.formData = {};
+      this.clearFileAttributeFormValue();
+      this.$refs['table-m1'].commitProxy('reload');
+    },
+    clearFileAttributeFormValue() {
+      this.fileTypeSn = null;
+      this.fileAttributes = [];
+    },
+    getFileTypeList() {
+      this.$http({
+        url: this.current_prefix + `/file_type/listPage`,
+        method: `post`,
+        data: {
+          enabled: true
+        },
+        // isLoading: true,
+        // modalStrictly: true,
+        success: (res) => {
+          this.fileTypes = res.objx?.records || [];
+        },
+      });
+    },
+    getAttributeList() {
+      this.$http({
+        url: this.current_prefix + `/file_type/listAttribute`,
+        method: `post`,
+        data: {
+          stringOne: this.fileTypeSn
+        },
+        // isLoading: true,
+        // modalStrictly: true,
+        success: (res) => {
+          let rows = res.objx || [];
+          rows.forEach(row => {
+            row.formValue = null;
+          })
+          this.fileAttributes = rows;
+        },
+      });
+    },
+
+
+  }
+};
+</script>
+<style scoped lang="scss">
+.dialog-style.proList-dialog .el-dialog__body #containt {
+  height: 100%;
+
+  .main-right {
+    height: 100%
+  }
+}
+
+#labBtn.transverse {
+  margin-bottom: 0;
+  margin-left: -8px;
+}
+</style>