cloud-web-corejs 1.0.54-dev.29 → 1.0.54-dev.30

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.29",
+  "version": "1.0.54-dev.30",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

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">
-    <el-form ref="editForm" :model="fileObjNotify">
+  <div class="detail-wrap" style="margin: -6px -8px;">
+    <el-form ref="editForm" :model="fileObjNotify" label-position=top>
       <div class="d-header clearfix">
         <div class="fl">
           <i class="el-icon-info"/>
-          {{ isEdit ? $t1('查看文件对象通知设置') : $t1('新增文件对象通知设置') }}
+          <!--{{ isEdit ? $t1('查看文件对象通知设置') : $t1('新增文件对象通知设置') }}-->
+          文件操作 - 发系统通知设置
         </div>
         <div class="fr">
           <el-button type="primary" plain class="button-sty" @click="$baseReload()" icon="el-icon-refresh-right">
@@ -15,68 +16,29 @@
         </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-item d-i-left">
+            <div class="d-i-tit">
+              <em class="f-red">*</em>
+              {{ $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">
+          <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>
     </el-form>
@@ -159,7 +121,7 @@ export default {
   }
 };
 </script>
-<style scoped>
+<style scoped lang="scss">
 .noTr th {
   height: 0px
 }
@@ -167,4 +129,23 @@ 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;
+  }
+  .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__label{font-size:14px;}
+      .el-form-item__content{
+        .el-input{width:360px !important;
+          .el-input__inner{height:38px !important}
+        }
+      }
+    }
+  }
+}
+
 </style>

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');
@@ -77,6 +82,8 @@ modules = {
         0: this.$t2('否', 'components.fileLibrary.auThLaebl0'),
         1: this.$t2('是', 'components.fileLibrary.auThLaebl1')
       };
+      let a = this.fileStoreArea.toDownWatermark;
+      debugger
       let tableOption = {
         vue: this,
         tableRef: 'table-m1',
@@ -285,7 +292,7 @@ modules = {
               }
             }
           },
-          {
+          ...(this.fileStoreArea.toDownWatermark ? [{
             title: this.$t1('下载打水印 '),
             field: 'downWatermarkAuth',
             width: 150,
@@ -297,7 +304,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: {
@@ -1403,6 +1407,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 +1754,13 @@ 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) {
+      debugger
+      if (this.fileStoreArea.toDownWatermark && fileObjAuth.downWatermarkAuth) {
+        let loginAccount = this.$store.getters.loginAccount;
         url += '?_w=' + encode(loginAccount)
       }
       this.$commonFileUtil.downloadFile(url, attachment.fileName)