Merge branch release/21.7.5 of zentao/zentaopms (#11347)

This commit is contained in:
刘刚
2025-09-09 09:05:22 +08:00
committed by Gitfox
+6 -4
View File
@@ -3,9 +3,10 @@ window.setDocAppOptions = function(_, options)
{
options = window._setDocAppOptions(_, options);
const onSwitchView = options.onSwitchView;
const initLibID = options.libID;
options = $.extend(options,
{
docFetcher: {url: options.docFetcher, dataFilter: (data) => $.extend(data, {lib: options.libID})},
docFetcher: {url: options.docFetcher, dataFilter: (data) => $.extend(data, {lib: initLibID || options.libID})},
viewModeUrl: function(options)
{
const lib = this.getLib(options.libID);
@@ -15,7 +16,7 @@ window.setDocAppOptions = function(_, options)
onSwitchView: function(mode, location, info)
{
onSwitchView.call(this, mode, location, info);
trySwitchView(this, location.libID);
trySwitchView(this, location.libID, mode);
},
formatDataItem: function(type, item)
{
@@ -32,11 +33,12 @@ window.setDocAppOptions = function(_, options)
* Try to switch view.
* @param {Object} docApp - 文档应用实例。
* @param {number} libID - 库ID。
* @param {string} mode - 模式。
*/
function trySwitchView(docApp, libID)
function trySwitchView(docApp, libID, mode)
{
if(window._trySwitchViewTimer) clearTimeout(window._trySwitchViewTimer);
if(libID === window._currentLibID) return;
if(libID === window._currentLibID || mode !== 'list') return;
window._currentLibID = libID;
window._trySwitchViewTimer = setTimeout(() => {