cloud-web-corejs 1.0.54-dev.1 → 1.0.54-dev.11

package/src/components/fileLibrary/fileObjAuthDialog.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      title="设置文件权限"
+      title="设置权限"
       :append-to-body="true"
       :modal-append-to-body="true"
       :close-on-click-modal="false"
@@ -14,115 +14,137 @@
       v-el-dialog-center
     >
       <div class="cont">
-        <div class="grid-height" style="height: 500px">
-          <vxe-grid
-            class="is-pointer"
-            ref="table-m1"
-            :data="tableData"
-            v-bind="vxeOption"
-            @resizable-change="$vxeTableUtil.onColumnWitchChange"
-            @custom="$vxeTableUtil.customHandle"
-          >
-            <template #form>
-              <div class="clearfix screen-btns">
-                <div class="fl">
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openSaleOrgAddDialog">新增机构
-                  </vxe-button>
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openPositionAddDialog">
-                    新增岗位
-                  </vxe-button>
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openUserAddDialog">新增用户
-                  </vxe-button>
-                  <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openRoleAddDialog">新增角色
-                  </vxe-button>
-                  <!--                      <vxe-button type="text" status="primary" plain class="button-sty" icon="el-icon-delete"
-                                                    @click="deleteRows()">{{ $t2('删除', 'components.fileLibrary.delete') }}
-                                        </vxe-button>-->
-                </div>
-                <div class="fl screen-breadcrumb" style="margin-left: 30px;">
-                  <span style="font-size: 12px;">{{ $t2('文件路径', 'components.fileLibrary.filePath') }}：</span>
-                  <el-breadcrumb separator-class="el-icon-arrow-right">
-                    <el-breadcrumb-item v-for="(treeNode,index) in treeNodeArr" :key="index">{{
-                        treeNode.label
-                      }}
-                    </el-breadcrumb-item>
-                  </el-breadcrumb>
-                </div>
-              </div>
-            </template>
-            <template #saleOrg="{row,rowIndex}">
-              <el-input
-                class="search-input"
-                v-model="row.saleOrgName"
-                clearable
-                @clear="
+        <div id="containt">
+          <el-tabs v-model="activeName" class="tab-box">
+            <el-tab-pane :label="$t1('用户权限设置')" name="first">
+              <div class="grid-height" style="height: 500px">
+                <vxe-grid
+                  class="is-pointer"
+                  ref="table-m1"
+                  :data="tableData"
+                  v-bind="vxeOption"
+                  @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                  @custom="$vxeTableUtil.customHandle"
+                >
+                  <template #form>
+                    <div class="clearfix screen-btns">
+                      <div class="fl">
+                        <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
+                                    @click="openSaleOrgAddDialog">
+                          新增机构
+                        </vxe-button>
+                        <vxe-button status="primary" class="button-sty" icon="el-icon-plus"
+                                    @click="openPositionAddDialog">
+                          新增岗位
+                        </vxe-button>
+                        <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openUserAddDialog">
+                          新增用户
+                        </vxe-button>
+                        <vxe-button status="primary" class="button-sty" icon="el-icon-plus" @click="openRoleAddDialog">
+                          新增角色
+                        </vxe-button>
+                        <!--                      <vxe-button type="text" status="primary" plain class="button-sty" icon="el-icon-delete"
+                                                          @click="deleteRows()">{{ $t2('删除', 'components.fileLibrary.delete') }}
+                                              </vxe-button>-->
+                      </div>
+                      <div class="fl screen-breadcrumb" style="margin-left: 30px;">
+                        <span style="font-size: 12px;">{{ $t2('文件路径', 'components.fileLibrary.filePath') }}：</span>
+                        <el-breadcrumb separator-class="el-icon-arrow-right">
+                          <el-breadcrumb-item v-for="(treeNode,index) in treeNodeArr" :key="index">{{
+                              treeNode.label
+                            }}
+                          </el-breadcrumb-item>
+                        </el-breadcrumb>
+                      </div>
+                    </div>
+                  </template>
+                  <template #saleOrg="{row,rowIndex}">
+                    <el-input
+                      class="search-input"
+                      v-model="row.saleOrgName"
+                      clearable
+                      @clear="
                   row.saleOrgId = null;
                 "
-                v-if="!row._isParent"
-                v-el-readonly
-              >
-                <i slot="suffix" class="el-input__icon el-icon-search" @click="openSaleOrgRowDialog(row,rowIndex)"></i>
-              </el-input>
-              <template v-else>{{ row.saleOrgName }}</template>
-            </template>
-            <template #position="{row,rowIndex}">
-              <el-input
-                class="search-input"
-                v-model="row.positionName"
-                clearable
-                @clear="
+                      v-if="!row._isParent"
+                      v-el-readonly
+                    >
+                      <i slot="suffix" class="el-input__icon el-icon-search"
+                         @click="openSaleOrgRowDialog(row,rowIndex)"></i>
+                    </el-input>
+                    <template v-else>{{ row.saleOrgName }}</template>
+                  </template>
+                  <template #position="{row,rowIndex}">
+                    <el-input
+                      class="search-input"
+                      v-model="row.positionName"
+                      clearable
+                      @clear="
                   row.positionId = null;
                 "
-                v-if="!row._isParent"
-                v-el-readonly
-              >
-                <i slot="suffix" class="el-input__icon el-icon-search" @click="openPositionRowDialog(row,rowIndex)"></i>
-              </el-input>
-              <template v-else>{{ row.positionName }}</template>
-            </template>
-            <template #role="{row,rowIndex}">
-              <el-input
-                class="search-input"
-                v-model="row.roleName"
-                clearable
-                @clear="
+                      v-if="!row._isParent"
+                      v-el-readonly
+                    >
+                      <i slot="suffix" class="el-input__icon el-icon-search"
+                         @click="openPositionRowDialog(row,rowIndex)"></i>
+                    </el-input>
+                    <template v-else>{{ row.positionName }}</template>
+                  </template>
+                  <template #role="{row,rowIndex}">
+                    <el-input
+                      class="search-input"
+                      v-model="row.roleName"
+                      clearable
+                      @clear="
                   row.roleId = null;
                 "
-                v-if="!row._isParent"
-                v-el-readonly
-              >
-                <i slot="suffix" class="el-input__icon el-icon-search" @click="openRoleRowDialog(row,rowIndex)"></i>
-              </el-input>
-              <template v-else>{{ row.roleName }}</template>
-            </template>
-            <template #user="{row,rowIndex}">
-              <el-input
-                class="search-input"
-                v-model="row.nickName"
-                clearable
-                @clear="
+                      v-if="!row._isParent"
+                      v-el-readonly
+                    >
+                      <i slot="suffix" class="el-input__icon el-icon-search"
+                         @click="openRoleRowDialog(row,rowIndex)"></i>
+                    </el-input>
+                    <template v-else>{{ row.roleName }}</template>
+                  </template>
+                  <template #user="{row,rowIndex}">
+                    <el-input
+                      class="search-input"
+                      v-model="row.nickName"
+                      clearable
+                      @clear="
                   row.userId = null;
                 "
-                v-if="!row._isParent"
-                v-el-readonly
-              >
-                <i slot="suffix" class="el-input__icon el-icon-search" @click="openUserRowDialog(row,rowIndex)"></i>
-              </el-input>
-              <template v-else>{{ row.nickName }}</template>
-            </template>
-            <template #operate="{row}">
-              <a
-                href="javascript:void(0);"
-                class="a-link"
-                @click="openEditDialog(row.id)"
-              >
-                <el-tooltip :enterable="false" effect="dark" :content="$t2('查看','common.view')" placement="top"
-                            popper-class="tooltip-skin">
-                  <i class="el-icon-edit"/>
-                </el-tooltip>
-              </a>
-            </template>
-          </vxe-grid>
+                      v-if="!row._isParent"
+                      v-el-readonly
+                    >
+                      <i slot="suffix" class="el-input__icon el-icon-search"
+                         @click="openUserRowDialog(row,rowIndex)"></i>
+                    </el-input>
+                    <template v-else>{{ row.nickName }}</template>
+                  </template>
+                  <template #operate="{row}">
+                    <a
+                      href="javascript:void(0);"
+                      class="a-link"
+                      @click="openEditDialog(row.id)"
+                    >
+                      <el-tooltip :enterable="false" effect="dark" :content="$t2('查看','common.view')" placement="top"
+                                  popper-class="tooltip-skin">
+                        <i class="el-icon-edit"/>
+                      </el-tooltip>
+                    </a>
+                  </template>
+                </vxe-grid>
+              </div>
+            </el-tab-pane>
+            <el-tab-pane :label="$t1('文件操作，发系统通知')" name="second">
+              <div class="grid-height" style="height: 500px">
+                <fileObjNotifyEdit v-if="showFileObjNotifyEdit" visible-key="showFileObjNotifyEdit"
+                                   :current_prefix="current_prefix" :_dataId="fileObjId" :parent-target="_self"
+                                   @reload="$reloadHandle"></fileObjNotifyEdit>
+              </div>
+            </el-tab-pane>
+          </el-tabs>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -130,7 +152,7 @@
 				<i class="el-icon-close el-icon"></i>
 				取 消
 			</el-button>
-			<el-button type="primary" @click="saveData" class="button-sty">
+			<el-button type="primary" @click="saveData" class="button-sty" v-if="activeName=='first'">
 				<i class="el-icon-check el-icon"></i>
 				确 定
 			</el-button>

package/src/components/fileLibrary/fileObjAuthEditDialog.vue

@@ -13,7 +13,7 @@
       v-el-dialog-center
       @close="handleClose"
     >
-      <div class="cont">
+      <div class="cont" style="height: 550px;">
         <el-form ref="editForm" :model="fileObjAuth" label-width="110px" class="adSearchForm"
                  style="width: 362px;height: auto;">
           <el-form-item label="文件路径">
@@ -150,6 +150,11 @@
             <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('下载打水印')"
+                        :rules="[{ required: false, trigger: 'blur' }]">
+            <el-switch v-model="fileObjAuth.downWatermarkAuth" :active-value="1" :inactive-value="0"
+                       :disabled="fileObjAuth._isParent"/>
+          </el-form-item>
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">

package/src/components/fileLibrary/fileObjNotifyEdit.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class="detail-wrap">
+    <el-form ref="editForm" :model="fileObjNotify">
+      <div class="d-header clearfix">
+        <div class="fl">
+          <i class="el-icon-info"/>
+          {{ isEdit ? $t1('查看文件对象通知设置') : $t1('新增文件对象通知设置') }}
+        </div>
+        <div class="fr">
+          <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
+            {{ $t1('重置') }}
+          </el-button>
+          <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData">{{ $t1('保存') }}
+          </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>
+      </div>
+    </el-form>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'fileObjNotifyEdit',
+  props: {
+    _dataId: [String, Number],
+    current_prefix: String
+  },
+  components: {},
+  data() {
+    return {
+      isEdit: false,
+      tabIndex: 'first',
+      dataId: '',
+      fileObjNotify: {
+        toNotify: 0,
+        fileObjId: this._dataId
+      }
+    };
+  },
+  created() {
+    if (this._dataId && !isNaN(this._dataId)) this.dataId = this._dataId;
+  },
+  mounted() {
+    this.getData();
+  },
+  methods: {
+    getData() {
+      if (this.dataId && !isNaN(this.dataId)) {
+
+        this.$commonHttp({
+          url: this.current_prefix + `/file_obj_notify/get`,
+          method: `post`,
+          data: {
+            id: this.dataId
+          },
+          isLoading: true,
+          modalStrictly: true,
+          success: res => {
+            if (res.objx) {
+              this.fileObjNotify = res.objx;
+              this.isEdit = true;
+            }
+          }
+        });
+      }
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        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`,
+              data: this.fileObjNotify,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 500,
+                  onClose: t => {
+                    this.$baseReload();
+                  }
+                });
+              }
+            });
+          });
+        }
+      });
+    }
+  }
+};
+</script>
+<style scoped>
+.noTr th {
+  height: 0px
+}
+
+.noTr td {
+  height: 0px
+}
+</style>

package/src/components/fileLibrary/index.vue

@@ -192,7 +192,7 @@
                         href="javascript:void(0);"
                         class="a-link ico"
                         v-if="!attachment.dirs && fileObjAuth.downloadAuth"
-                        @click="$commonFileUtil.downloadFile(attachment.domain + attachment.url, attachment.fileName)"
+                        @click="downloadSingerFile(attachment)"
                       >
                         <el-tooltip effect="dark" content="下载" placement="top"
                                     popper-class="tooltip-skin">
@@ -353,7 +353,7 @@
                   href="javascript:void(0);"
                   class="a-link"
                   v-if="fileObjAuth.downloadAuth == 1"
-                  @click="$commonFileUtil.downloadFile(row.domain + row.url,row.fileName)"
+                  @click="downloadSingerFile(row)"
                 >
                   <el-tooltip :enterable="false" effect="dark" :content="$t2('下载','components.fileLibrary.download')"
                               placement="top"

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

@@ -4,6 +4,7 @@ import positionDialog from "../../../views/user/position/dialog";
 import saleOrgDialog from "../../../views/user/sale_org/dialog";
 import roleDialog from "../../../views/user/role/dialog";
 import fileObjAuthEditDialog from "../../../components/fileLibrary/fileObjAuthEditDialog.vue";
+import fileObjNotifyEdit from "@base/components/fileLibrary/fileObjNotifyEdit.vue";
 
 
 let modules = {};
@@ -14,7 +15,7 @@ modules = {
     treeNodeArr: Array
   },
   components: {
-    editView, userDialog, positionDialog, saleOrgDialog, roleDialog,fileObjAuthEditDialog
+    editView, userDialog, positionDialog, saleOrgDialog, roleDialog, fileObjAuthEditDialog, fileObjNotifyEdit
   },
   inject: ['current_prefix'],
   mounted() {
@@ -24,7 +25,7 @@ modules = {
     let that = this;
     return {
       showDialog: true,
-      activeName: 'second',
+      activeName: 'first',
       value10: '',
       dataId: '',
       showEdit: false,
@@ -50,9 +51,9 @@ modules = {
       showSaleOrgAddDialog: false,
       showPositionAddDialog: false,
       showRoleAddDialog: false,
-      showDetailDialog:false,
-      currentRow:null,
-
+      showDetailDialog: false,
+      currentRow: null,
+      showFileObjNotifyEdit: true
     };
   },
   methods: {
@@ -284,6 +285,19 @@ modules = {
               }
             }
           },
+          {
+            title: this.$t1('下载打水印 '),
+            field: 'downWatermarkAuth',
+            width: 150,
+            slots: {
+              default: ({row}) => {
+                return [
+                  <el-switch v-model={row.downWatermarkAuth} active-value={1} inactive-value={0}
+                             disabled={row._isParent}></el-switch>
+                ];
+              }
+            }
+          },
           {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},
@@ -603,6 +617,7 @@ modules = {
         deleteDirAuth: 1,
         historyAuth: 1,
         shareAuth: 1,
+        downWatermarkAuth: 0,
         fileObjId: this.fileObjId
       }
       return row;
@@ -613,7 +628,7 @@ modules = {
       this.showDetailDialog = true;
     },
     confirmDetailDialog(row) {
-      this.tableData.splice(this.operateIndex,1,row)
+      this.tableData.splice(this.operateIndex, 1, row)
       this.showDetailDialog = false;
     }
   }

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

@@ -7,6 +7,7 @@ import shareDialog from "../shareDialog";
 import recycleBinDialog from "../recycleBinDialog";
 import videoDialog from "../../../components/video/dialog";
 import userDialog from "../../../views/user/user/dialog";
+import {encode} from "js-base64";
 
 let modules;
 modules = {
@@ -1746,6 +1747,16 @@ modules = {
       } else {
         return customFileButton.visable;
       }
+    },
+    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) {
+        url += '?_w=' + encode(loginAccount)
+      }
+      this.$commonFileUtil.downloadFile(url, attachment.fileName)
     }
   },
 };