Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'main' into feature/doctemplate

Browse Source
This commit is contained in:
daitingting
2025-03-31 06:58:16 +00:00
parent 350bb7326f bafca3c6f8
commit 4e2fa41081
259 changed files with 13277 additions and 1823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/js/batchmovedoc.ui.js
+1 -1
View File
@@ -15,5 +15,5 @@ window.toggleDocAcl = function(e)
const $this = $(e instanceof Event ? e.target : e);
const $form = $this.closest('form,.modal-body').first();
const aclType = $form.find('[name="acl"]:checked').val();
$form.find('#whiteListBox').toggleClass('hidden', type === 'mine' || aclType !== 'private');
$form.find('#whiteListBox,#readListBox').toggleClass('hidden', type === 'mine' || aclType !== 'private');
};
module/doc/js/common.ui.js
+11 -9
View File
@@ -48,7 +48,7 @@ function toggleAcl(type)
}
else if(type == 'doc')
{
$('#whiteListBox').toggleClass('hidden', acl == 'open');
$('#whiteListBox, #readListBox').toggleClass('hidden', acl == 'open');
$('#groupBox').toggleClass('hidden', acl == 'open');
loadWhitelist(libID);
}
@@ -181,7 +181,7 @@ window.rendDocCell = function(result, {col, row})
return result;
}
window.loadObjectModules = function(e)
window.loadObjectModules = function(e, docID)
{
let objectID = e.target.value;
let objectType = e.target.name;
@@ -204,7 +204,7 @@ window.loadObjectModules = function(e)
let docType = $('.radio-primary [name=type]:not(.hidden):checked').val();
if(typeof docType == 'undefined') docType = 'doc';
const link = $.createLink('doc', 'ajaxGetModules', 'objectType=' + objectType + '&objectID=' + objectID + '&type=' + docType);
const link = $.createLink('doc', 'ajaxGetModules', 'objectType=' + objectType + '&objectID=' + objectID + '&type=' + docType + '&docID=' + docID);
$.get(link, function(data)
{
data = JSON.parse(data);
@@ -212,15 +212,17 @@ window.loadObjectModules = function(e)
$libPicker.render({items: data.libs});
$libPicker.$.setValue('');
const $modulePicker = $("[name='module']").zui('picker');
const $modulePicker = $("[name='parent']").zui('picker');
$modulePicker.render({items: data.modules});
$modulePicker.$.setValue('');
});
}
window.loadLibModules = function(e, docType)
window.loadLibModules = function(e, docID)
{
const objectID = e.target.value;
const libID = e.target.value;
const libType = $(e.target.closest('div.form-group')).attr('data-lib-type');
const objectID = $("input[name='" + libType + "']").val();
if(!docType)
{
@@ -228,7 +230,7 @@ window.loadLibModules = function(e, docType)
if(typeof docType == 'undefined') docType = 'doc';
}
const link = $.createLink('tree', 'ajaxGetOptionMenu', 'rootID=' + objectID + '&viewType=' + docType + '&branch=all&rootModuleID=0&returnType=items');
const link = $.createLink('doc', 'ajaxGetModules', 'objectType=' + libType + '&objectID=' + objectID + '&type=' + docType + '&docID=' + docID + '&libID=' + libID);
$.get(link, function(data)
{
data = JSON.parse(data);
@@ -240,8 +242,8 @@ window.loadLibModules = function(e, docType)
});
}
const $modulePicker = $("[name='module']").zui('picker');
$modulePicker.render({items: data});
const $modulePicker = $("[name='parent']").zui('picker');
$modulePicker.render({items: data.modules});
$modulePicker.$.setValue('');
});
}
module/doc/js/uploaddocs.ui.js
-1
View File
@@ -54,7 +54,6 @@ window.toggleDocTitle = function()
$('.titleBox').toggleClass('hidden', uploadFormat != 'combinedDocs');
}
window.titleChanged = function()
{
if(observer) observer.disconnect();