cloud-web-corejs 1.0.56 → 1.0.58

package/src/layout/components/notify_message/unreadDialog.vue

@@ -32,12 +32,13 @@
       </div>
     </el-dialog>
     <systemNoticeInfoDialog v-if="showSystemNoticeInfoDialog" :visiable.sync="showSystemNoticeInfoDialog"
-                            :appendToTop="true"></systemNoticeInfoDialog>
+                            :appendToTop="true" :queryParam="systemNoticeInfoDialogParam"></systemNoticeInfoDialog>
   </div>
 </template>
 
 <script>
 import systemNoticeInfoDialog from "@base/views/user/system_notice/infoDialog.vue";
+import settingConfig from "@/settings";
 
 export default {
   name: 'notifyMessageDialog',
@@ -55,7 +56,8 @@ export default {
       tableDatas: [],
       currentIndex: 0,
       currentRow: {},
-      showSystemNoticeInfoDialog: false
+      showSystemNoticeInfoDialog: false,
+      systemNoticeInfoDialogParam: {}
     };
   },
 
@@ -72,9 +74,9 @@ export default {
             this.checkLine(0, () => {
               this.showDialog = true;
             });
-          }/* else {
+          } else {
             this.initSystemNoticeInfoDialog();
-          } */
+          }
         }
       });
     },
@@ -115,14 +117,18 @@ export default {
 
     },
     initSystemNoticeInfoDialog() {
+      if (!settingConfig.systemNoticeAutoTip) return
+      let userFlag = this.$store.getters.userFlag
+      if (userFlag == 6 || userFlag == 7 || userFlag == 8) return;
       this.$http({
         url: USER_PREFIX + '/system_notice/listPage',
-        data: {publish: true, important: true, size: 1},
+        data: {publish: true, important: true, readed: 0, size: 1},
         method: 'post',
         success: res => {
           this.systemNotices = res.objx && res.objx.records ? res.objx.records : [];
           let rows = res?.objx?.records || []
           if (rows.length > 0) {
+            this.systemNoticeInfoDialogParam = {publish: true, important: true, readed: 0};
             this.showSystemNoticeInfoDialog = true;
           }
         }

package/src/views/user/file_type/edit.vue

@@ -55,6 +55,30 @@
                   </el-radio-group>
                 </el-form-item>
               </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('文件操作，是否发系统通知') }}
+              </th>
+              <td>
+                <el-form-item prop="toNotify" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-radio-group v-model="fileStoreArea.toNotify">
+                    <el-radio :label="1">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="0">{{ $t1('否') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
+              <th>
+                <em class="f-red">*</em>
+                {{ $t1('文件下载，是否打水印') }}
+              </th>
+              <td>
+                <el-form-item prop="toDownWatermark" :rules="[{ required: true, trigger: 'blur' }]">
+                  <el-radio-group v-model="fileStoreArea.toDownWatermark">
+                    <el-radio :label="1">{{ $t1('是') }}</el-radio>
+                    <el-radio :label="0">{{ $t1('否') }}</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </td>
             </tr>
             <tr>
               <th>{{ $t1('备注') }}</th>
@@ -94,7 +118,12 @@ export default {
       tabIndex: 0,
       isEdit: false,
       dataId: '',
-      fileStoreArea: {storeAreaType: 0, hasAuth: 0},
+      fileStoreArea: {
+        storeAreaType: 0,
+        hasAuth: 0,
+        toNotify: 0,
+        toDownWatermark: 0
+      },
     };
   },
   created() {

package/src/views/user/file_type/list.vue

@@ -154,6 +154,34 @@ export default {
               }
             }
           },
+          {
+            field: 'toNotify',
+            title: this.$t1('文件操作，是否发系统通知'),
+            width: 220,
+            slots: {
+              default: ({row}) => {
+                if (row.toNotify == 1) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
+          {
+            field: 'toDownWatermark',
+            title: this.$t1('文件下载，是否打水印'),
+            width: 200,
+            slots: {
+              default: ({row}) => {
+                if (row.toDownWatermark == 1) {
+                  return [<div class="txt-status">{this.$t1('是')}</div>];
+                } else {
+                  return [<div class="txt-status s-3">{this.$t1('否')}</div>];
+                }
+              }
+            }
+          },
           {
             title: this.$t1('备注'),
             field: 'note',

package/src/views/user/home/index.vue

@@ -21,6 +21,7 @@ export default {
       flag: 0,
       homeContent: null,
       showHomeContent: false,
+      userInfo: {}
     };
   },
   created() {
@@ -33,6 +34,7 @@ export default {
         method: 'post',
         success: res => {
           let userInfo = res.objx;
+          this.userInfo = userInfo;
           let flag = userInfo.flag;
           if (flag !== 6 && flag !== 7 && flag !== 8) {
             this.initHome();
@@ -72,8 +74,8 @@ export default {
           if (menuUrl) {
             url = menuUrl + '.vue';
           } else {
-            let homeConfig = corejsConfig.homeConfig || {}
-            url = homeConfig.url ? homeConfig.url : '@base/views/user/home/default.vue'
+            let defaultHomePage = this.userInfo.defaultHomePage;
+            url = defaultHomePage ? defaultHomePage : '@base/views/user/home/default.vue'
           }
           if (url.startsWith(str1)) {
             let a = url.slice(str1.length);

package/src/views/user/outLink/view.vue

@@ -55,6 +55,25 @@ export default {
 
       delete queryParam.urlmobile;
       delete queryParam.url;
+
+      if(purl.indexOf('.html')>=0){
+        let eUrl = purl;
+        let pstr = Object.keys(queryParam).map(key=>{
+          return key+"="+queryParam[key]
+        }).join("&")
+
+        if(pstr){
+          if(purl.indexOf('.html?')>=0){
+            eUrl = eUrl+'&'+pstr
+          }else{
+            eUrl = eUrl+'?'+pstr
+          }
+        }
+
+        location.href = eUrl;
+        return
+      }
+
       delete queryParam.dataId;
       delete queryParam.showWfContent;
       delete queryParam.access_token;
@@ -62,6 +81,8 @@ export default {
       delete queryParam.thirdparty_info;
       delete queryParam.i18nLang;
 
+
+
       let url = purl + '.vue';
       this.queryParam = queryParam;
       this.showWfContent = true;

package/src/views/user/system_notice/infoDialog.vue

@@ -51,6 +51,9 @@ export default {
     },
     param: {
       default: null
+    },
+    queryParam: {
+      default: null
     }
   },
   created() {
@@ -102,7 +105,8 @@ export default {
         url: url,
         data: {
           publish: true,
-          current: pageNumber
+          current: pageNumber,
+          ...this.queryParam
         },
         success: res => {
           let page = res.objx;
@@ -121,9 +125,11 @@ export default {
             });
             this.currentRow = currentRow;
             this.currentIndex = currentIndex;
+            this.handleRead(this.currentIndex)
           } else {
             this.currentIndex = 0;
             this.currentRow = page.records.length > 0 ? page.records[0] : {};
+            this.handleRead(this.currentIndex)
           }
         }
       });
@@ -132,6 +138,24 @@ export default {
       this.flag = 0;
       this.currentIndex = index;
       this.currentRow = item;
+      this.handleRead(index)
+    },
+    handleRead(index, callback) {
+      let row = this.page.records[index];
+      if (row.readed !== 1) {
+        this.$http({
+          url: USER_PREFIX + `/system_notice/read`,
+          method: `post`,
+          data: {id: row.id},
+          isLoading: true,
+          success: res => {
+            row.readed = 1;
+            callback && callback()
+          }
+        });
+      } else {
+        callback && callback()
+      }
     },
     initAttachfo() {
       let id = this.currentRow && this.currentRow.id ? this.currentRow.id : '';