fix: 修改预览未生效bug;修改字体路径问题

app/web/page/editor/component/BasicPageFormModal/index.ts

@@ -56,12 +56,12 @@ export default class DynamicForm extends Vue {
   }
 
   preview() {
-    this.formCustom.pageName = this.formCustom.pageName ?? '未命名';
+    this.formCustom.pageName = this.formCustom.pageName || '未命名';
     this.handleSubmit('preview');
   }
 
   autoSave() {
-    this.formCustom.pageName = this.formCustom.pageName ?? '未命名';
+    this.formCustom.pageName = this.formCustom.pageName || '未命名';
     this.handleSubmit('autoSave');
   }
 

app/web/page/editor/view/dashboard/index.ts

@@ -45,6 +45,7 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
   isDragIn: boolean = false;
   isDraging: boolean = false;
   showSubmitPopup: boolean = false;
+  inTheSave: boolean = false;
 
   async created() {
     const { pageId, templateId } = this.$route.params;
@@ -95,10 +96,13 @@ export default class DashBoard extends Mixins(ContextMenuMixin, GoodsTabsMixin,
     } catch (e) {
       this.showSubmitPopup = false;
       this.$Notice.error({ title: e?.message || '出现未知错误！' });
+    } finally {
+      this.inTheSave = false;
     }
   }
 
   async preview() {
+    this.inTheSave = true;
     (this.$refs.basicPageForm as any).preview();
   }
 

app/web/page/editor/view/dashboard/index.vue

@@ -26,9 +26,20 @@
     </Row>
     <BasicPageFormModal ref="basicPageForm" v-model="showSubmitPopup" @submit="save" />
     <RecordModal ref="recordModal" v-model="showRecordModal" @ok="recover" @cancel="cancel" />
+    <Spin size="large" fix v-if="inTheSave"></Spin>
   </Row>
 </template>
 <style lang="less" scoped>
+  @font-face {
+    font-weight: normal;
+    font-family: 'cr-icon';
+    font-style: normal;
+    font-display: auto;
+    src:
+      url('https://misc.lkbang.net/fonts/cr-icon.b0d72989.woff2') format('woff2'),
+      url('https://misc.lkbang.net/fonts/cr-icon.71b60fa6.woff') format('woff'),
+      url('https://misc.lkbang.net/fonts/cr-icon.2dca9b1b.ttf') format('truetype');
+  }
   .dashboard {
     min-width: 1280px;
   	height: 100% !important;
@@ -88,6 +99,10 @@
   			}
   		}
   	}
+
+    /deep/ .ivu-spin-fix {
+      z-index: 10001;
+    }
   }
 </style>
 <script lang="ts" src="./index.ts"></script>

package-lock.json

@@ -1456,9 +1456,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.0.50",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.50.tgz",
-      "integrity": "sha512-rws0modT35uFdnFhkJKngXyqSk64TnZe0ou9mPSJKTW5+hC+CdMeeA+yMFCTiETi9kFx/ru8KCD9sQa5gMs4zg==",
+      "version": "0.0.51",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.0.51.tgz",
+      "integrity": "sha512-Xp1yZ0jvejk1iO6tIa3bTmTM61oFvrPLFRlKbA0XUulbZmSlIOK9W49TZTUb2D/jxGZaGYrNd/raD8/Cr99/xg==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.20.5",

package.json

@@ -25,7 +25,7 @@
     "@easy-team/easywebpack-vue": "^4.0.0",
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/cherry-ui": "^2.20.6",
-    "@qg/citrus-ui": "0.0.50",
+    "@qg/citrus-ui": "0.0.51",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",