diff --git a/@rbv b/@rbv index 7fc82f58f..b13226fbd 160000 --- a/@rbv +++ b/@rbv @@ -1 +1 @@ -Subproject commit 7fc82f58f0a343da749893293530a7f435ed5665 +Subproject commit b13226fbddc16aa9bfef8b84c76a5b841d5333a3 diff --git a/pom.xml b/pom.xml index 35882f816..cd4748e27 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.rebuild rebuild - 3.9.5 + 3.9.6 rebuild Building your business-systems freely! https://getrebuild.com/ diff --git a/src/main/java/com/rebuild/core/Application.java b/src/main/java/com/rebuild/core/Application.java index d112094a6..f206fa70c 100644 --- a/src/main/java/com/rebuild/core/Application.java +++ b/src/main/java/com/rebuild/core/Application.java @@ -74,11 +74,11 @@ public class Application implements ApplicationListener /** * Rebuild Version */ - public static final String VER = "3.9.5"; + public static final String VER = "3.9.6"; /** * Rebuild Build [MAJOR]{1}[MINOR]{2}[PATCH]{2}[BUILD]{2} */ - public static final int BUILD = 3090510; + public static final int BUILD = 3090610; static { // Driver for DB diff --git a/src/main/resources/web/assets/js/file-preview.js b/src/main/resources/web/assets/js/file-preview.js index b654ab7d4..d2886cd15 100644 --- a/src/main/resources/web/assets/js/file-preview.js +++ b/src/main/resources/web/assets/js/file-preview.js @@ -27,15 +27,6 @@ class RbPreview extends React.Component { const currentUrl = this.props.urls[this.state.currentIndex] const fileName = $fileCutName(currentUrl) const downloadUrl = this._buildAbsoluteUrl(currentUrl, 'attname=' + $encode(fileName)) - // fix:3.9.5 钉钉内下载 - if ($env.isDingTalk()) { - $.get(`/filex/make-url?url=${currentUrl}`, (res) => { - if (res.data.publicUrl) { - let s = res.data.publicUrl + '&attname=' + $encode(fileName) - $(this._dlg).find('.J_downloadUrl').attr('href', s) - } - }) - } let previewContent = null if (this._isImage(fileName)) previewContent = this.renderImage() @@ -219,13 +210,6 @@ class RbPreview extends React.Component { previewUrl = `${rb.baseUrl}/filex/` + url.split('/filex/')[1] } } - - // fix:3.9.1 PC钉钉预览PDF - if ($env.isDingTalk()) { - window.open(previewUrl) - that.hide() - return - } } that.setState({ previewUrl: previewUrl, errorMsg: null }) }