From 9f4edec3330a10ee6d62af2b579d5e60a20317e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?= <93301500+xushubieli@users.noreply.github.com> Date: Fri, 10 Feb 2023 10:53:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=B9=E5=87=BA=E5=B1=82?= =?UTF-8?q?=E5=92=8C=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- dedebiz | 35 ++- src/admin/dialog/select_images.php | 222 ++++++++++--------- src/admin/dialog/select_media.php | 251 +++++++++++----------- src/admin/dialog/select_mimages.php | 2 +- src/admin/dialog/select_soft.php | 195 +++++++++-------- src/admin/dialog/select_templets.php | 309 +++++++++++++-------------- src/admin/inc/fieldtype.txt | 6 +- src/admin/js/indexbody.js | 22 +- src/admin/js/main.js | 57 +---- src/data/downmix.data.inc | 2 +- src/system/common.inc.php | 20 +- 12 files changed, 535 insertions(+), 588 deletions(-) diff --git a/README.md b/README.md index 9a2c9903..9f987510 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Sockets：支持接入DedeBIZ商业组件模块 ``` / -..../a 默认HTML文件存放目录[必须可写入] +..../a 默认网页文件存放目录[必须可写入] ..../admin 默认后台管理目录[可任意改名] ..../apps 插件扩展程序目录[不可写入，可执行] ..../data 系统缓存或其它可写入数据存放目录[必须可写入，但不可执行，建议关闭对外访问权限] diff --git a/dedebiz b/dedebiz index 11596023..00c42918 100755 --- a/dedebiz +++ b/dedebiz @@ -63,14 +63,13 @@ function RandEncode($length=26) $rnd_cookieEncode=''; $length = rand(28,32); $max = strlen($chars) - 1; - for($i = 0; $i < $length; $i++) { + for ($i = 0; $i < $length; $i++) { $rnd_cookieEncode .= $chars[mt_rand(0, $max)]; } return $rnd_cookieEncode; } if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { - //PHP5.4以下不支持内建服务器 - //用于开发调试 + //PHP5.4以下不支持内建服务器，用于开发调试 if (phpversion() < "5.4") { die("DedeBIZ:command web server not support\n\n"); } @@ -98,7 +97,6 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { if (!empty($aid)) { $addsql .= " AND id IN(" . $typeid . ")"; } - $tt = $dsql->GetOne("SELECT COUNT(id) as dd FROM `#@__arctiny` WHERE " . $addsql); $total = intval($tt['dd']); $dsql->Execute('out', "SELECT id FROM `#@__arctiny` WHERE " . $addsql . " ORDER BY typeid ASC"); @@ -152,7 +150,6 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $templet = str_replace("{style}", $cfg_df_style, $templet); $pv = new PartView(); $GLOBALS['_arclistEnv'] = 'index'; - $pv->SetTemplet($cfg_basedir . $cfg_templets_dir . "/" . $templet); $pv->SaveToHtml($homeFile); DedeCli::write("Make index html successfull"); @@ -345,10 +342,10 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { fclose($fp); $query = ''; $fp = fopen($workDir.'/install/sql-dftables.txt','r'); - while(!feof($fp)) + while (!feof($fp)) { $line = rtrim(fgets($fp,1024)); - if(preg_match("#;$#", $line)) + if (preg_match("#;$#", $line)) { $query .= $line."\n"; $query = str_replace('#@__',$dbprefix,$query); @@ -365,16 +362,13 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { $query = preg_replace('/, UNIQUE KEY(.*?);/',');',$query); $query = preg_replace('/set\(([^\)]*?)\)/','varchar',$query); $query = preg_replace('/enum\(([^\)]*?)\)/','varchar',$query); - if ( preg_match("/PRIMARY KEY AUTOINCREMENT/",$query) ) - { - $query = preg_replace('/,([\t\s ]+)PRIMARY KEY \(`([0-9a-zA-Z]+)`\)/i','',$query); - $query = str_replace(', PRIMARY KEY (`id`)','',$query); + if (preg_match("/PRIMARY KEY AUTOINCREMENT/",$query)) { + $query = preg_replace('/,([\t\s ]+)PRIMARY KEY \(`([0-9a-zA-Z]+)`\)/i','',$query); + $query = str_replace(', PRIMARY KEY (`id`)','',$query); } @$db->exec($query); - $query=''; - } else if(!preg_match("#^(\/\/|--)#", $line)) - { + } else if (!preg_match("#^(\/\/|--)#", $line)) { $query .= $line; } } @@ -382,11 +376,10 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { //导入默认数据 $query = ''; $fp = fopen($workDir.'/install/sql-dfdata.txt','r'); - while(!feof($fp)) + while (!feof($fp)) { $line = rtrim(fgets($fp, 1024)); - if(preg_match("#;$#", $line)) - { + if (preg_match("#;$#", $line)) { $query .= $line; $query = str_replace('#@__',$dbprefix,$query); $query = str_replace("\'","\"",$query); @@ -395,8 +388,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { @$db->exec($query); $query=''; - } else if(!preg_match("#^(\/\/|--)#", $line)) - { + } else if (!preg_match("#^(\/\/|--)#", $line)) { $query .= $line; } } @@ -442,7 +434,7 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { if (phpversion() < "5.4") { die("DedeBIZ:command web server not support\n\n"); } - // 写入程序安装锁 + //写入程序安装锁 file_put_contents($workDir.'/install/install_lock.txt', 'ok'); echo "Start Dev Server For DedeBIZ\n\r"; echo "Open http://localhost:8088\n\r"; @@ -450,4 +442,5 @@ if (count($argv) > 1 && ($argv[1] == "serv" || $argv[1] == "s")) { exit; } else { echo $helpStr; -} \ No newline at end of file +} +?> \ No newline at end of file diff --git a/src/admin/dialog/select_images.php b/src/admin/dialog/select_images.php index b65bcf5e..7386e7e9 100644 --- a/src/admin/dialog/select_images.php +++ b/src/admin/dialog/select_images.php @@ -59,11 +59,7 @@ if (!empty($iseditor)) { - + - - -
- -
- - - - - - - - - - - - - - - - - "; - echo $line; - } else if (is_dir("$inpath/$file")) { - if (preg_match("#^_(.*)$#i", $file)) continue; - if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(jpg)#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - + + + + + + + + + + + + + "; + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(".$cfg_imgtype.")#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(jpg)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + + "; + echo "$line"; + } + }//End Loop + ?> + +
-
- " : ''; echo $noeditor;?> - - - - - - - - 选择： - - - 宽： - 高： - -
-
点击图片预览，再点击图片关闭预览，点击文件名选择图片
预览选择图片文件大小修改时间
上级目录当前目录：$activepath
$file
- - $file - $filesize KB$filetime
- - $file + + +
+
+ +
+ + + - - - "; - echo "$line"; - } - }//End Loop - ?> - -
+
+ " : ''; echo $noeditor;?> + + + + + + + + 选择： + + + 宽： + 高： + +
$filesize KB$filetime
+
点击图片预览，再点击图片关闭预览，点击文件名选择图片
预览选择图片文件大小修改时间
上级目录当前目录：$activepath
$file
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+ \ No newline at end of file diff --git a/src/admin/dialog/select_media.php b/src/admin/dialog/select_media.php index 83c38c2a..0753a2b6 100644 --- a/src/admin/dialog/select_media.php +++ b/src/admin/dialog/select_media.php @@ -49,12 +49,7 @@ if (!empty($noeditor)) { - - - + - - - - - - - - - - - - - "; - echo $line; - } else if (is_dir("$inpath/$file")) { - if (preg_match("#^_(.*)$#i", $file)) continue; - if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(wmv|avi)#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(rm|rmvb|mp3|mp4)#i", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(mp3|wma)#", $file)) { - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $line = " - + + + + + + + + + "; + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(swf|fly|fla|flv)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(wmv|avi)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(rm|rmvb|mp3|mp4)#i", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(mp3|wma)#", $file)) { + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $line = " + + + + "; + echo "$line"; + } + }//End Loop + ?> +
-
- - - - - 选择： - -
-
点击名称选择文件文件大小最后修改时间
上级目录当前目录：$activepath
$file
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
- - $file + + +
+ + + - - - "; - echo "$line"; - } - }//End Loop - ?> -
+
+ + + + + 选择： + +
$filesize KB$filetime
+
点击名称选择文件文件大小最后修改时间
上级目录当前目录：$activepath
$file
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+ \ No newline at end of file diff --git a/src/admin/dialog/select_mimages.php b/src/admin/dialog/select_mimages.php index 8205cce2..c7b67c51 100644 --- a/src/admin/dialog/select_mimages.php +++ b/src/admin/dialog/select_mimages.php @@ -23,7 +23,7 @@ button+button{margin-left:10px} .topbar button+.topbar button{margin-left:10px} #topbar button:focus{background:#006829;border-color:#005b24;box-shadow:0 0 0 0.2rem rgba(38,159,86,.5);outline:none} #file_list{display:grid;grid-gap:10px;grid-template-columns:repeat(auto-fill,minmax(160px,1fr));padding-top:10px} -#file_list:empty:after{content:'可以直接拖拽文件到这里'} +#file_list:empty:after{content:'拖拽图片放到这里进行上传'} #file_list li{position:relative;display:block;vertical-align:top;padding:10px;border-radius:.25rem} #file_list li.up-now:after{content:'';position:absolute;top:0;left:0;display:block;width:100%;height:100%;background:rgba(255,255,255,0.8) url(loading.gif) center center no-repeat;border-radius:.25rem;z-index:999} #file_list li:hover{background:#f5f5f5} diff --git a/src/admin/dialog/select_soft.php b/src/admin/dialog/select_soft.php index 5e4cb0b2..0e06d6a8 100644 --- a/src/admin/dialog/select_soft.php +++ b/src/admin/dialog/select_soft.php @@ -48,12 +48,7 @@ if (!empty($noeditor)) { - - - + - - - - - - - - - - - - - - - - \r\n"; - echo $line; - } else if (is_dir("$inpath/$file")) { - if (preg_match("#^_(.*)$#i", $file)) continue; - if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - $line = " - - - - "; - echo "$line"; - } else { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ''; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#^\.\.#", "", $reurl); - $reurl = $reurl; - $line = " - + + + + + + + + + + + + \r\n"; + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(zip|rar|tgr.gz)#i", $file)) { + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + $line = " + + + + "; + echo "$line"; + } else { + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ''; + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#^\.\.#", "", $reurl); + $reurl = $reurl; + $line = " + + + + "; + echo "$line"; + } + }//End Loop + ?> +
-
- - - - 选择： - 改名： - -
-
点击选择的文件，红色字样的为刚上传的文件
选择文件文件大小修改时间
上级目录当前目录：$activepath
$file
- - $file - $filesize KB$filetime
- - $file + + +
+ + + - - - "; - echo "$line"; - } - }//End Loop - ?> -
+
+ + + + 选择： + 改名： + +
$filesize KB$filetime
+
点击选择的文件，红色字样的为刚上传的文件
选择文件文件大小修改时间
上级目录当前目录：$activepath
$file
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+ \ No newline at end of file diff --git a/src/admin/dialog/select_templets.php b/src/admin/dialog/select_templets.php index 17d1099e..9414ab94 100644 --- a/src/admin/dialog/select_templets.php +++ b/src/admin/dialog/select_templets.php @@ -40,12 +40,7 @@ if (empty($comeback)) { - - - + - - - - - - - - - - + +
+
-
- - - - 选择： - 改名： - -
-
选择文件文件大小修改时间
+ + + + + + + + + + + + \r\n"; + echo $line; + } else if (is_dir("$inpath/$file")) { + if (preg_match("#^_(.*)$#i", $file)) continue; + if (preg_match("#^\.(.*)$#i", $file)) continue; + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(htm|html)#i", $file)) { + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(css)#i", $file)) { + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#".$templetdir."/#", "", $reurl); + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(js)#i", $file)) { + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(jpg)#i", $file)) { + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(gif|png)#i", $file)) { + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $line = " + + + + "; + echo "$line"; + } else if (preg_match("#\.(txt)#i", $file)) { + if ($file == $comeback) $lstyle = "class='text-danger'"; + else $lstyle = ""; + $reurl = "$activeurl/$file"; + $reurl = preg_replace("#\.\.#", "", $reurl); + $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); + $line = " + + + "; + echo "$line"; } - $filetime = filemtime("$inpath/$file"); - $filetime = MyDate("Y-m-d H:i:s", $filetime); - } - //判断文件类型并作处理 - if ($file == ".") continue; - else if ($file == "..") { - if ($activepath == "") continue; - $tmp = preg_replace("#[\/][^\/]*$#", "", $activepath); - $line = " - - - \r\n"; - echo $line; - } else if (is_dir("$inpath/$file")) { - if (preg_match("#^_(.*)$#i", $file)) continue; - if (preg_match("#^\.(.*)$#i", $file)) continue; - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(htm|html)#i", $file)) { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(css)#i", $file)) { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."/#", "", $reurl); - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(js)#i", $file)) { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(jpg)#i", $file)) { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(gif|png)#i", $file)) { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); - $line = " - - - - "; - echo "$line"; - } else if (preg_match("#\.(txt)#i", $file)) { - if ($file == $comeback) $lstyle = "class='text-danger'"; - else $lstyle = ""; - $reurl = "$activeurl/$file"; - $reurl = preg_replace("#\.\.#", "", $reurl); - $reurl = preg_replace("#".$templetdir."\/#", "", $reurl); - $line = " - - - "; - echo "$line"; - } - }//End Loop - ?> -
+
+ + + + 选择： + 改名： + +
+
选择文件文件大小修改时间
上级目录当前目录：$activepath
$file
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
+ + $file + $filesize KB$filetime
上级目录当前目录：$activepath
$file
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
- - $file - $filesize KB$filetime
+ }//End Loop + ?> + + \ No newline at end of file diff --git a/src/admin/inc/fieldtype.txt b/src/admin/inc/fieldtype.txt index aeee7909..1f043fad 100644 --- a/src/admin/inc/fieldtype.txt +++ b/src/admin/inc/fieldtype.txt @@ -2,7 +2,7 @@ text,单行文本(varchar) textchar,单行文本(char) multitext,多行文本 htmltext,网页文本 -textdata,HTML形式保存数据 +textdata,网页形式保存数据 int,整数类型 float,小数类型 datetime,时间类型 @@ -10,8 +10,8 @@ img,图片 imgfile,图片(无格式) media,多媒体文件 addon,附件类型 -select,使用select下拉框 -radio,使用radio选项卡 +select,select下拉框 +radio,radio选项卡 checkbox,checkbox多选框 stepselect,联动类型 relation,关联文档 \ No newline at end of file diff --git a/src/admin/js/indexbody.js b/src/admin/js/indexbody.js index 69d276a9..cb22448d 100644 --- a/src/admin/js/indexbody.js +++ b/src/admin/js/indexbody.js @@ -47,7 +47,7 @@ function Copyinfo() { var val = document.getElementById('text'); window.getSelection().selectAllChildren(val); document.execCommand("Copy"); - alert("复制环境配置摘要成功"); + alert("复制环境配置信息成功"); } //Dedebiz info var dedebizInfo; @@ -56,8 +56,7 @@ function ViewDedeBIZ() { ShowMsg("启动商业组件失败"); return; } - ShowMsg(` - + ShowMsg(`
@@ -70,8 +69,7 @@ function ViewDedeBIZ() { -
版本号： V${dedebizInfo.result.server_version}内存占用： ${dedebizInfo.result.server_memory_usage}%
- `); + `); } function LoadServer() { $.get("index_body.php?dopost=system_info", function (data) { @@ -84,8 +82,7 @@ function LoadServer() { } let infoStr = ``; if (typeof rsp.result.domain !== "undefined") { - infoStr += ` - + infoStr += ` @@ -99,22 +96,19 @@ function LoadServer() { 授权证书组件信息 - - `; + `; } infoStr += "
授权域名： ${rsp.result.domain} 授权版本：
"; $("#system-info").html(infoStr); } else { - $("#system-info").html(` - + $("#system-info").html(`
- + -
${rsp.msg}
您已购买了商业版授权，登录DedeBIZ官网会员中心可查看相关授权信息。若授权结果与实际授权存在差异，可能购买到其它非商业授权，及时和官网取得联系。您已购买了商业版授权，登录DedeBIZ官网会员中心可查看相关授权信息。若授权结果与实际授权存在差异，可能购买到其它非商业授权，及时与我们取得联系。
- `); + `); } }); } diff --git a/src/admin/js/main.js b/src/admin/js/main.js index 415b1a98..80419c23 100644 --- a/src/admin/js/main.js +++ b/src/admin/js/main.js @@ -333,8 +333,7 @@ function getEvent() { while (func != null) { var arg0 = func.arguments[0]; if (arg0) { - if ((arg0.constructor == Event || arg0.constructor == MouseEvent) - || (typeof (arg0) == "object" && arg0.preventDefault && arg0.stopPropagation)) { + if ((arg0.constructor == Event || arg0.constructor == MouseEvent) || (typeof (arg0) == "object" && arg0.preventDefault && arg0.stopPropagation)) { return arg0; } } @@ -343,13 +342,6 @@ function getEvent() { return null; } //模拟ondrop事件相关代码 -/*---------------------------- -leftLeaning = 300; -如果对象文档固定，用onmousedown=DropStart去除底下的DropStop -newobj.ondblclick = DropStart; -newobj.onmousemove = DropMove; -newobj.onmousedown = DropStop; -----------------------------*/ function DropStart() { this.style.cursor = 'move'; } @@ -371,11 +363,6 @@ function DropMove() { this.style.left = posLeft - leftLeaning; } //对指定的元素绑定move事件 -/*----------------------------- -onmousemove="DropMoveHand('divname', 225);" -onmousedown="DropStartHand();" -onmouseup="DropStopHand();" ------------------------------*/ function DropStartHand() { canMove = (canMove ? false : true); } @@ -386,7 +373,6 @@ function DropMoveHand(objid, mleftLeaning) { var event = getEvent(); var obj = $Obj(objid); if (!canMove) return; - if ($Nav() == 'IE') { var posLeft = event.clientX - 20; var posTop = event.clientY - 20; @@ -413,7 +399,7 @@ function copyToClipboard(txt) { try { netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); } catch (e) { - alert("浏览器已拒绝，请在浏览器地址栏输入about:config并回车\n然后把signed.applets.codebase_principal_support项设置为true"); + alert("浏览器已拒绝，请稍后重试"); } var clip = Components.classes['@mozilla.org/widget/clipboard;1'].createInstance(Components.interfaces.nsIClipboard); if (!clip) return; @@ -461,9 +447,8 @@ function getSelCat(targetId) { } } if (targetObj) targetObj.value = selvalue; - } - //主栏目单选 - else { + } else { + //主栏目单选 if (selBox) { for (var i = 0; i < selBox.length; i++) { if (selBox[i].checked) selvalue = selBox[i].value; @@ -528,13 +513,8 @@ function DedeConfirm(content="",title="确认提示") { CloseModal(`DedeModal${modalID}`); } let footer = ``; - let modal = `