Merge branch 'master' of github.com:gcpaas/DataRoom

data-room-ui/packages/BigScreenDesign/CloseDialog/index.vue

@@ -1,67 +0,0 @@
-<template>
-  <el-dialog
-    title="提示"
-    :visible.sync="backDialog"
-    width="40%"
-    :modal="true"
-    :modal-append-to-body="false"
-    :appen-to-body="true"
-    class="bs-dialog-wrap bs-el-dialog"
-  >
-    <span style="color:#fff">确定返回主页面吗？未保存的配置将会丢失!</span>
-    <span
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button
-        class="bs-el-button-default"
-        @click="backDialog = false"
-      >留在页面</el-button>
-      <el-button
-        class="bs-el-button-default"
-        @click="goBack"
-      >离开页面</el-button>
-      <el-button
-        type="primary"
-        @click="goBackSave"
-      >保存后离开页面</el-button>
-    </span>
-  </el-dialog>
-</template>
-<script>
-import { pageMixins } from 'data-room-ui/js/mixins/page'
-export default {
-  name: 'ComponentDialog',
-  mixins: [pageMixins],
-  props: {},
-  data () {
-    return {
-      backDialog: false
-    }
-  },
-  computed: {},
-  mounted () {},
-  methods: {
-    init () {
-      this.backDialog = true
-    },
-    // 点击确定
-    confirm () {
-      this.backDialog = false
-    },
-    goBack () {
-      this.$emit('back')
-    },
-    goBackSave () {
-      this.$emit('backSave')
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-@import '../../assets/style/bsTheme.scss';
-/deep/.el-dialog__body{
-  min-height: 100px !important;
-}
-</style>

data-room-ui/packages/BigScreenDesign/PageDesignTop.vue

@@ -10,16 +10,21 @@
       <span class="logo-text name-span">{{ pageInfo.name }}</span>
     </div>
     <div class="head-btn-group">
-      <span style="margin-right:8px;font-size:12px">缩放比例</span>
+      <span style="margin-right:8px;font-size:12px">缩放</span>
       <el-input-number
         class="bs-el-input-number"
-        style="margin-right:20px"
+        style="margin-right:10px"
         :value="zoom"
         :min="1"
-        :max="100"
         label="描述文字"
         @change="changeZoom"
       />
+       <CusBtn
+        :loading="saveAndPreviewLoading"
+        @click.native="changeZoom('auto')"
+      >
+        自适应
+      </CusBtn>
       <el-dropdown
         trigger="click"
         class="align-list-dropdown"
@@ -107,11 +112,6 @@
       :page-info="pageInfo"
       @replaceItByTemplate="replaceItByTemplate"
     />
-    <CloseDialog
-      ref="CloseDialog"
-      @back="backManagement"
-      @backSave="backSave"
-    />
     <AssignDialog ref="AssignDialog" />
     <HistoryList ref="HistoryList" />
   </div>
@@ -127,7 +127,6 @@ import cloneDeep from 'lodash/cloneDeep'
 import uniqBy from 'lodash/uniqBy'
 import { stringifyObjectFunctions } from 'data-room-ui/js/utils/evalFunctions'
 import AssignDialog from 'data-room-ui/BigScreenDesign/AssignDialog/index.vue'
-import CloseDialog from 'data-room-ui/BigScreenDesign/CloseDialog/index.vue'
 import HistoryList from 'data-room-ui/BigScreenDesign/HistoryList/index.vue'
 import CusBtn from './BtnLoading'
 import icons from 'data-room-ui/assets/images/alignIcon/export'
@@ -146,7 +145,6 @@ export default {
     AssignDialog,
     CusBtn,
     HistoryList,
-    CloseDialog
   },
   props: {
     code: {
@@ -340,11 +338,21 @@ export default {
       }
     },
     goBackManage () {
-      this.$refs.CloseDialog.init()
-    },
-    async backSave () {
-      await this.save()
-      this.backManagement()
+       this.$confirm('确定返回主页面吗？未保存的配置将会丢失。', '提示', {
+        distinguishCancelAndClose: true,
+        confirmButtonText: '保存后离开页面',
+        cancelButtonText: '离开页面',
+        cancelButtonClass: 'cancel-btn',
+        type: 'warning',
+        customClass: 'bs-el-message-box'
+      }).then( async() => {
+        await this.save()
+        await this.backManagement()
+      }).catch((action) => {
+        if (action === 'cancel') {
+          this.backManagement()
+        }
+      })
     },
     backManagement () {
       this.$router.push({ path: this.pageInfo.type === 'component' ? (window.BS_CONFIG?.routers?.componentUrl || '/big-screen-components') : (window.BS_CONFIG?.routers?.pageManagementUrl || '/home') })
@@ -648,5 +656,9 @@ export default {
   background: var(--bs-el-background-1);
   color: var(--bs-el-text);
   border: 0 !important;
+  width: 100px;
 }
+// .bs-el-input-number{
+
+// }
 </style>