Jelajahi Sumber

Добавил компонент MessageBox

Book Pauk 6 tahun lalu
induk
melakukan
711c8d1aff
2 mengubah file dengan 12 tambahan dan 10 penghapusan
  1. 2 4
      client/components/Reader/LoaderPage/LoaderPage.vue
  2. 10 6
      client/element.js

+ 2 - 4
client/components/Reader/LoaderPage/LoaderPage.vue

@@ -13,7 +13,6 @@
             <el-button size="mini" @click="loadFle">
                 Загрузить файл с диска
             </el-button>
-            <span class="bottom-span"><pre>{{ loadState }}</pre></span>
         </div>
         <div class="part bottom">
             <span v-if="config.mode == 'omnireader'" class="bottom-span clickable" @click="openComments">Комментарии</span>
@@ -34,7 +33,6 @@ export default @Component({
 })
 class LoaderPage extends Vue {
     bookUrl = null;
-    loadState = null;
 
     created() {
         this.commit = this.$store.commit;
@@ -59,7 +57,7 @@ class LoaderPage extends Vue {
 
     async submitUrl() {
         if (this.bookUrl) {
-            const loading = this.$loading({ target: this.$refs.main, customClass: 'loading'});
+            const loading = this.$loading({target: this.$refs.main, customClass: 'loading'});
             try {
                 const book = await readerApi.loadBook(this.bookUrl, (state) => {
                     const progress = state.progress || 0;
@@ -67,8 +65,8 @@ class LoaderPage extends Vue {
                 });
                 loading.close();
             } catch (e) {
-                this.loadState = e.message;
                 loading.close();
+                this.$alert(e.message, 'Ошибка', {type: 'error'});
             }
         }
     }

+ 10 - 6
client/element.js

@@ -56,6 +56,9 @@ import './theme/notification.css';
 import Loading from 'element-ui/lib/loading';
 import './theme/loading.css';
 
+import MessageBox from 'element-ui/lib/message-box';
+import './theme/message-box.css';
+
 const components = {
     ElMenu, ElMenuItem, ElButton, ElCheckbox, ElTabs, ElTabPane, ElTooltip,
     ElContainer, ElAside, ElMain, ElHeader,
@@ -69,12 +72,13 @@ for (let [name, comp] of Object.entries(components)) {
 //Vue.use(Loading.directive);
 
 Vue.prototype.$loading = Loading.service;
-//Vue.prototype.$msgbox = MessageBox;
-//Vue.prototype.$alert = MessageBox.alert;
-//Vue.prototype.$confirm = MessageBox.confirm;
-//Vue.prototype.$prompt = MessageBox.prompt;
+Vue.prototype.$msgbox = MessageBox;
+Vue.prototype.$alert = MessageBox.alert;
+Vue.prototype.$confirm = MessageBox.confirm;
+Vue.prototype.$prompt = MessageBox.prompt;
 Vue.prototype.$notify = Notification;
 //Vue.prototype.$message = Message;
 
-import locale from 'element-ui/lib/locale/lang/ru-RU';
-Vue.prototype.$ELEMENT = { locale };
+import lang from 'element-ui/lib/locale/lang/ru-RU';
+import locale from 'element-ui/lib/locale';
+locale.use(lang);