diff --git a/src/components/office/Drawio.vue b/src/components/office/Drawio.vue
index 0bfd07c..ea08b45 100644
--- a/src/components/office/Drawio.vue
+++ b/src/components/office/Drawio.vue
@@ -255,16 +255,21 @@ export default {
const payload = $J.jsonParse(event.data)
switch (payload.event) {
case "init":
- console.log('init')
this.ready = true
this.$emit('onReady')
this.updateContent()
- let helpMenu = doc.querySelector('.geMenubarContainer .geMenubar').childNodes[5]
- doc.addEventListener('click', this.$refs.historyPopover.onGlobalClick)
- helpMenu.style.display = 'none'
- let elementTheme = doc.querySelector('.geToolbarContainer').querySelector('[title="主题"][class="geButton geAdaptiveAsset"]');
- if (elementTheme) {
- elementTheme.addEventListener('click', this.onSwitchTheme)
+ let menuBar = doc.querySelector('.geMenubarContainer .geMenubar')
+ if (menuBar) {
+ let helpMenu = menuBar.childNodes[5]
+ doc.addEventListener('click', this.$refs.historyPopover.onGlobalClick)
+ helpMenu.style.display = 'none'
+ }
+ let toolbar = doc.querySelector('.geToolbarContainer')
+ if (toolbar) {
+ let elementTheme = toolbar.querySelector('[title="主题"][class="geButton geAdaptiveAsset"]');
+ if (elementTheme) {
+ elementTheme.addEventListener('click', this.onSwitchTheme)
+ }
}
break
case "load":
diff --git a/src/components/preview/SimTextPreview.vue b/src/components/preview/SimTextPreview.vue
index 01cdcce..5fb3a55 100644
--- a/src/components/preview/SimTextPreview.vue
+++ b/src/components/preview/SimTextPreview.vue
@@ -86,6 +86,7 @@
{
this.onDialogDblClick()
@@ -375,7 +378,7 @@
if(value.endsWith('.md')){
this.previewMode = false
}
- this.hasHistoryVersion = this.editableVersionMap.get(value)
+ this.hasHistoryVersion = this.editableVersionMap.get(value) || false
if (this.hasHistoryVersion) {
let currentIndex = this.editableTabs.findIndex(editable => editable.name === value)
const tab = this.editableTabs[currentIndex]
@@ -479,7 +482,14 @@
url = "/api/public/s/preview/text/stream"
}
const abortController = new AbortController();
- const response = await fetch(`${url}?${queryString}`, { signal: abortController.signal })
+ let headers = new Headers();
+ if (this.shareId) {
+ headers.append('share-token', this.$store.state.user.shareToken);
+ } else {
+ headers.append('jmal-token', this.$store.state.user.token);
+ headers.append('name', this.$store.state.user.name);
+ }
+ const response = await fetch(`${url}?${queryString}`, { signal: abortController.signal , headers: headers})
let result = "";
// 创建一个节流函数,限制更新频率为每 1500 毫秒一次
const throttledUpdateContent = _.throttle(text => {
@@ -728,7 +738,6 @@
}
}
this.editableTabsValue = row.path
-
// 加载历史版本
this.$refs.historyPopover.loadHistoryPathList(row.path)
}).catch(() => {
diff --git a/src/views/public/share/shareList.vue b/src/views/public/share/shareList.vue
index 7a2ad86..b2d3a6c 100644
--- a/src/views/public/share/shareList.vue
+++ b/src/views/public/share/shareList.vue
@@ -1178,8 +1178,12 @@ export default {
}
.share-code {
- > > > .el-input {
+ text-align: center;
+ >>>.el-input {
width: 200px;
+ .el-input__inner {
+ text-align: center;
+ }
::placeholder {
text-align: center;
}
diff --git a/src/views/share/index.vue b/src/views/share/index.vue
index 075142c..de61b82 100644
--- a/src/views/share/index.vue
+++ b/src/views/share/index.vue
@@ -138,7 +138,7 @@
header-align="left"
>
- {{scope.row.expireDate?scope.row.expireDate:'永久有效'}}
+ {{expireInfo(scope.row)}}
@@ -265,9 +265,20 @@
shareDialogObject: {},
}
},
- mounted() {
- },
methods: {
+ expireInfo(row) {
+ if (row.expireDate) {
+ let currentTime = new Date();
+ let targetTime = new Date(row.expireDate);
+ if (currentTime > targetTime) {
+ return '已过期'
+ } else {
+ return row.expireDate
+ }
+ } else {
+ return '永久有效'
+ }
+ },
// 请求之前的准备
beforeLoadData(onLoad){
if (onLoad) {