diff --git a/src/admin/album_add.php b/src/admin/album_add.php index 9fb973da..0e83b70a 100644 --- a/src/admin/album_add.php +++ b/src/admin/album_add.php @@ -50,7 +50,7 @@ if ($dopost != 'save') { if (!isset($delzip)) $delzip = 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/album_edit.php b/src/admin/album_edit.php index c71ff77a..b3d20cdb 100644 --- a/src/admin/album_edit.php +++ b/src/admin/album_edit.php @@ -63,7 +63,7 @@ if ($dopost != 'save') { if (!isset($ddisfirst)) $ddisfirst = 0; if (!isset($delzip)) $delzip = 0; if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/archives_add.php b/src/admin/archives_add.php index 7045b610..38776ed1 100644 --- a/src/admin/archives_add.php +++ b/src/admin/archives_add.php @@ -50,7 +50,7 @@ if ($dopost != 'save') { if (!isset($autolitpic)) $autolitpic = 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/archives_edit.php b/src/admin/archives_edit.php index b53971b5..72db2fd0 100644 --- a/src/admin/archives_edit.php +++ b/src/admin/archives_edit.php @@ -49,7 +49,7 @@ if ($dopost != 'save') { if (!isset($autolitpic)) $autolitpic = 0; if (!isset($writer)) $writer = ''; if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/archives_sg_add.php b/src/admin/archives_sg_add.php index 40109f85..4282025d 100644 --- a/src/admin/archives_sg_add.php +++ b/src/admin/archives_sg_add.php @@ -38,7 +38,7 @@ if ($dopost != 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/archives_sg_edit.php b/src/admin/archives_sg_edit.php index d344fcb2..c179f308 100644 --- a/src/admin/archives_sg_edit.php +++ b/src/admin/archives_sg_edit.php @@ -35,7 +35,7 @@ if ($dopost != 'save') { require_once(DEDEINC.'/image.func.php'); require_once(DEDEINC.'/libraries/oxwindow.class.php'); if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/article_add.php b/src/admin/article_add.php index b5c09704..0a64a3bc 100644 --- a/src/admin/article_add.php +++ b/src/admin/article_add.php @@ -52,7 +52,7 @@ if ($dopost != 'save') { if (!isset($autolitpic)) $autolitpic = 0; if (empty($click)) $click = ($cfg_arc_click == '-1' ? mt_rand(1000,6000) : $cfg_arc_click); if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/article_edit.php b/src/admin/article_edit.php index cae6c312..37a4de87 100644 --- a/src/admin/article_edit.php +++ b/src/admin/article_edit.php @@ -55,7 +55,7 @@ if ($dopost != 'save') { if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/js/main.js b/src/admin/js/main.js index e6873ef3..8f8f7778 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -86,7 +86,7 @@ function OpenMyWin(surl) { } function OpenMyWinCoOne(surl) { var pos = GetWinPos(800,600); - window.open(surl, "popUpMyWin2", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ",top=" + pos.top); + window.open(surl, "popUpMyWin2", "scrollbars=yes,resizable=yes,statebar=no,width=800,height=600,left=" + pos.left + ", top=" + pos.top); } function InitPage() { var selsource = $Obj('selsource'); @@ -258,28 +258,6 @@ function ShowUrlTrEdit() { function CkRemote() { document.getElementById('picname').value = ''; } -//文档列表快捷属性弹出 -function LoadQuickDiv(e, surl, oname, w, h) { - var newobj = $Obj(oname); - if (!newobj) { - newobj = document.createElement("div"); - newobj.id = oname; - newobj.style.position = 'fixed'; - newobj.className = 'pubdlg'; - newobj.style.width = w; - newobj.style.height = h + 30; - document.body.appendChild(newobj); - } - newobj.style.top = "50%"; - newobj.style.left = "50%"; - newobj.style.display = 'block'; - newobj.style.transform = "translate(-50%, -201px)"; - newobj.innerHTML = ''; - fetch(surl).then(resp => resp.text()).then((d) => { - newobj.innerHTML = d; - }); - fixupPos = false; -} //复制文档到剪切板 function copyToClipboard(txt) { if (txt == null || txt == '') { @@ -322,6 +300,28 @@ function getSelTxt() { } return g; } +//文档列表快捷属性弹出 +function LoadQuickDiv(e, surl, oname, w, h) { + var newobj = $Obj(oname); + if (!newobj) { + newobj = document.createElement("div"); + newobj.id = oname; + newobj.style.position = 'fixed'; + newobj.className = 'pubdlg'; + newobj.style.width = w; + newobj.style.height = h + 30; + document.body.appendChild(newobj); + } + newobj.style.top = "50%"; + newobj.style.left = "50%"; + newobj.style.display = 'block'; + newobj.style.transform = "translate(-50%, -201px)"; + newobj.innerHTML = ''; + fetch(surl).then(resp => resp.text()).then((d) => { + newobj.innerHTML = d; + }); + fixupPos = false; +} //显示副栏目 function ShowCatMap(e, obj, cid, targetId, oldvalue) { fixupPos = true; @@ -379,7 +379,7 @@ function __DedeConfirmRun(modalID) { function __DedeConfirmRunClose(modalID) { _DedeConfirmFuncsClose[modalID](); } -function DedeConfirm(content="",title="确认提示") { +function DedeConfirm(content = "", title = "确认提示") { let modalID = guid(); return new Promise((resolve, reject) => { _DedeConfirmFuncs[modalID] = ()=>{ @@ -407,6 +407,7 @@ function DedeConfirm(content="",title="确认提示") { //函数会返回一个modalID,通过这个id可自已定义一些方法,这里用到了一个展开语法:https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Operators/Spread_syntax function ShowMsg(content, ...args) { title = "系统提示"; + size = ""; if (typeof content == "undefined") content = ""; modalID = guid(); var footer = ``; diff --git a/src/admin/soft_add.php b/src/admin/soft_add.php index 30822e59..6a88bc5e 100644 --- a/src/admin/soft_add.php +++ b/src/admin/soft_add.php @@ -47,7 +47,7 @@ if ($dopost != 'save') { if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/soft_edit.php b/src/admin/soft_edit.php index 7421e3d2..03e70194 100644 --- a/src/admin/soft_edit.php +++ b/src/admin/soft_edit.php @@ -76,7 +76,7 @@ if ($dopost != 'save') { if (!isset($dellink)) $dellink = 0; if (!isset($autolitpic)) $autolitpic = 0; if (trim($title) == '') { - ShowMsg("请输入文档标题", "-1"); + ShowMsg("文档标题不能为空", "-1"); exit(); } if (empty($typeid)) { diff --git a/src/admin/templets/album_add.htm b/src/admin/templets/album_add.htm index b875cd67..bb83a11b 100644 --- a/src/admin/templets/album_add.htm +++ b/src/admin/templets/album_add.htm @@ -369,8 +369,8 @@ + \ No newline at end of file diff --git a/src/admin/templets/freelist_edit.htm b/src/admin/templets/freelist_edit.htm index 43e0c506..fa09387c 100644 --- a/src/admin/templets/freelist_edit.htm +++ b/src/admin/templets/freelist_edit.htm @@ -183,6 +183,13 @@ + diff --git a/src/admin/templets/spec_edit.htm b/src/admin/templets/spec_edit.htm index bd67c89f..c71e4197 100644 --- a/src/admin/templets/spec_edit.htm +++ b/src/admin/templets/spec_edit.htm @@ -355,27 +355,11 @@ - + \ No newline at end of file diff --git a/src/admin/templets/templets_one_add.htm b/src/admin/templets/templets_one_add.htm index 3341a883..4bb852b9 100644 --- a/src/admin/templets/templets_one_add.htm +++ b/src/admin/templets/templets_one_add.htm @@ -80,7 +80,7 @@