cloud-web-corejs 1.0.54-dev.731 → 1.0.54-dev.734

package/package.json

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

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

@@ -1,17 +1,17 @@
 <template>
   <div class="workbenches">
     <div class="workbenches-head">
-      <span class="f-blue">欢迎您</span>
+      <span class="f-blue">{{ $t1("欢迎您") }}</span>
 
       <el-link
         class="fr"
         icon="iconfont icon-tuichudenglu"
         :underline="false"
         @click="logout"
-        >退出登录</el-link
+        >{{ $t1("退出登录") }}</el-link
       >
       <!-- <el-link class="fr" icon="el-icon-set-up" :underline="false" @click="openCompanyDialog" style="margin-right:10px">切换组织</el-link> -->
-      <span class="fr">您好，{{ userInfo.nickName }}</span>
+      <span class="fr">{{ $t1("您好") }}，{{ userInfo.nickName }}</span>
     </div>
     <div class="workbenches-box">
       <el-row>
@@ -19,7 +19,7 @@
           <div class="w-box" style="margin-right: 16px">
             <div class="w-b-head">
               <div class="tit fl">
-                <b>应用场景</b>
+                <b>{{ $t1("应用场景") }}</b>
               </div>
               <!-- <div class="fr">
                 <el-link icon="iconfont icon-shuaxin" :underline="false">刷新</el-link>
@@ -83,12 +83,12 @@
           <div class="w-box" style="height: 60%">
             <div class="w-b-head">
               <div class="tit fl">
-                <b>待办事项</b>
+                <b>{{ $t1("待办事项") }}</b>
                 <i class="nums">{{ unDoWfRows.length }}</i>
               </div>
               <div class="fr">
                 <el-link :underline="false" @click="toWfManageList"
-                  >查看更多 +</el-link
+                  >{{ $t1("查看更多") }} +</el-link
                 >
               </div>
             </div>
@@ -101,8 +101,8 @@
               >
                 <p class="name">{{ item.name }}</p>
                 <p class="info">
-                  <span>单据类型：{{ item.objTypeName }}</span>
-                  <span>启动人：{{ item.starterName }}</span>
+                  <span>{{ $t1("单据类型") }}：{{ item.objTypeName }}</span>
+                  <span>{{ $t1("启动人") }}：{{ item.starterName }}</span>
                 </p>
               </div>
             </div>
@@ -110,12 +110,12 @@
           <div class="w-box" style="margin-top: 16px; height: calc(40% - 16px)">
             <div class="w-b-head">
               <div class="tit fl">
-                <b>通知公告</b>
+                <b>{{ $t1("通知公告") }}</b>
                 <i class="nums">{{ systemNotices.length }}</i>
               </div>
               <div class="fr">
                 <el-link :underline="false" @click="openSystemNoticeDialog()"
-                  >查看更多 +</el-link
+                  >{{ $t1("查看更多") }} +</el-link
                 >
               </div>
             </div>
@@ -161,7 +161,7 @@
       :option.sync="wfContentOption"
     ></wfContentDialog>
     <el-dialog
-      title="切换组织"
+      :title="$t1('切换组织')"
       width="355px"
       custom-class="dialog-style list-dialog"
       v-if="showCompanyDialog"
@@ -175,7 +175,7 @@
     >
       <div class="cont">
         <el-input
-          placeholder="搜索"
+          :placeholder="$t1('搜索')"
           class="search-btn"
           v-model="filterText"
         ></el-input>
@@ -480,13 +480,13 @@ export default {
     openRoutePath(row) {
       let menuCode = row.menuCode;
       if (menuCode === "todo") {
-        this.$message.error("功能正在完善，敬请期待。");
+        this.$message.error(this.$t1("功能正在完善，敬请期待。"));
         return;
       }
       let routes = this.flattenTree(this.sidebarRouters);
       let route = routes.find((item) => item.menuCode === menuCode);
       if (!route) {
-        this.$message.error("菜单没有访问权限");
+        this.$message.error(this.$t1("菜单没有访问权限"));
         return;
       }
       this.rourteTo(route);

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

@@ -12,8 +12,19 @@
     @close="dialogClose"
     v-el-drag-dialog
     v-el-dialog-center
-    :fullscreen="true"
+    :fullscreen="isFullscreen"
+    ref="dialog"
   >
+    <el-button class="isFullIcon" v-if="!isFullscreen" @click="changeFullscreen(true)">
+      <el-tooltip effect="dark" :content="$t1('全屏')" placement="top">
+        <i class="iconfont icon-quanping"></i>
+      </el-tooltip>
+    </el-button>
+    <el-button class="isFullIcon" v-else @click="changeFullscreen(false)">
+      <el-tooltip effect="dark" :content="$t1('缩小')" placement="top">
+        <i class="iconfont icon-suoxiao"></i>
+      </el-tooltip>
+    </el-button>
     <div class="n-list">
       <div class="item" v-for="(item, index) in page.records" :key="index" :class="{ on: currentIndex == index }"
            @click="checkLine(item, index)">
@@ -70,6 +81,7 @@ export default {
     var that = this;
     return {
       showDialog: true,
+      isFullscreen: true,
       falseValue: false,
       selectMulti: true,
       page: {
@@ -90,6 +102,23 @@ export default {
     }
   },
   methods: {
+    changeFullscreen(val) {
+      this.isFullscreen = val;
+      // 退出全屏后，el-dialog-center 指令只在 bind 时设置过 margin-top，
+      // 需要在此重新计算，使弹框恢复垂直居中
+      this.$nextTick(() => {
+        let wrapper = this.$refs.dialog && this.$refs.dialog.$el;
+        let dialogEl = wrapper && wrapper.querySelector('.el-dialog');
+        if (!dialogEl) return;
+        if (val) {
+          dialogEl.style['margin-top'] = '';
+        } else {
+          let autoTop = (document.body.offsetHeight - dialogEl.offsetHeight) / 2;
+          if (autoTop < 0) autoTop = 0;
+          dialogEl.style['margin-top'] = autoTop + 'px';
+        }
+      });
+    },
     dialogClose() {
       this.$emit('update:visiable', false);
     },
@@ -178,4 +207,33 @@ export default {
 };
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+::v-deep .dialog-style.news-box {
+  .isFullIcon {
+    position: absolute;
+    top: 0;
+    right: 58px;
+    height: 42px;
+    padding: 0 14px;
+    border: none !important;
+    background: none !important;
+    box-shadow: none !important;
+    color: #464646;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    > span {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      line-height: 1;
+    }
+    .iconfont {
+      font-size: 18px;
+      line-height: 1;
+      position: relative;
+      top: 1px;
+    }
+  }
+}
+</style>