From 36cca729f73996564e42639b02de667292d7ff2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=83=A1?= <3203164629@qq.com> Date: Tue, 29 Aug 2023 16:41:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=87=B3V1.85.1=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=86=85=E5=AE=B9=E5=9C=A8=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E4=B8=AD=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 11 - admin/images/app.css | 4 - admin/images/member.css | 4 - core/class/dzz/dzz_app.php | 2 +- core/core_version.php | 6 +- core/function/function_core.php | 4 +- core/template/default/common/about.htm | 4 +- .../template/default/common/header_common.htm | 2 + .../template/default/common/header_simple.htm | 2 + .../default/common/header_simple_end.htm | 6 - .../default/common/header_simple_start.htm | 2 + dzz/comment/images/comment.css | 5 - dzz/comment/images/folder.css | 2 +- dzz/dzzvote/template/vote_user.htm | 2 +- dzz/filemanage/images/folder.css | 2 +- dzz/onlyoffice/LICENSE | 201 +++++ dzz/onlyoffice/README.md | 11 + dzz/onlyoffice/admin.php | 44 + dzz/onlyoffice/classes/filter.php | 20 + dzz/onlyoffice/classes/index.htm | 0 dzz/onlyoffice/classes/thumb.php | 119 +++ dzz/onlyoffice/config/config.php | 6 + dzz/onlyoffice/config/index.htm | 0 dzz/onlyoffice/dzz_app_onlyoffice.xml | 76 ++ dzz/onlyoffice/enable.php | 17 + dzz/onlyoffice/images/index.htm | 0 dzz/onlyoffice/images/loading.gif | Bin 0 -> 695 bytes dzz/onlyoffice/images/onlyoffice54.png | Bin 0 -> 1738 bytes dzz/onlyoffice/images/onlyofficelogo.png | Bin 0 -> 4623 bytes dzz/onlyoffice/index.htm | 0 dzz/onlyoffice/index.php | 252 ++++++ dzz/onlyoffice/jwt/BeforeValidException.php | 7 + dzz/onlyoffice/jwt/ExpiredException.php | 7 + dzz/onlyoffice/jwt/JWT.php | 370 ++++++++ .../jwt/SignatureInvalidException.php | 7 + dzz/onlyoffice/language/en-US/index.htm | 0 dzz/onlyoffice/language/en-US/lang.php | 17 + dzz/onlyoffice/language/index.htm | 0 dzz/onlyoffice/language/zh-cn/index.htm | 0 dzz/onlyoffice/language/zh-cn/lang.php | 17 + dzz/onlyoffice/onlyoffice.md5 | 14 + dzz/onlyoffice/template/admin.htm | 239 ++++++ dzz/onlyoffice/template/header_left.htm | 3 + dzz/onlyoffice/template/index.htm | 22 + dzz/onlyoffice/template/left.htm | 4 + dzz/onlyoffice/template/main.htm | 30 + dzz/orguser/ajax.php | 519 ------------ dzz/orguser/edituser.php | 440 ---------- dzz/orguser/export.php | 183 ---- dzz/orguser/export_tmpl.php | 96 --- dzz/orguser/images/add_guide.png | Bin 17935 -> 0 bytes dzz/orguser/images/ctrl.png | Bin 537 -> 0 bytes dzz/orguser/images/icons.png | Bin 3904 -> 0 bytes dzz/orguser/images/icons_24.png | Bin 7124 -> 0 bytes dzz/orguser/images/orguser.css | 305 ------- dzz/orguser/images/user_bg.png | Bin 8276 -> 0 bytes dzz/orguser/import.php | 462 ---------- dzz/orguser/index.php | 30 - dzz/orguser/language/en-US/lang.php | 164 ---- dzz/orguser/language/zh-cn/lang.php | 164 ---- dzz/orguser/scripts/orguser.js | 539 ------------ dzz/orguser/template.xlsx | Bin 9918 -> 0 bytes dzz/orguser/template/adduser.htm | 285 ------- dzz/orguser/template/detail_org.htm | 281 ------ dzz/orguser/template/edituser.htm | 301 ------- dzz/orguser/template/export.htm | 71 -- dzz/orguser/template/guide.htm | 20 - dzz/orguser/template/header_left.htm | 13 - dzz/orguser/template/header_search.htm | 25 - dzz/orguser/template/import_guide.htm | 71 -- dzz/orguser/template/import_list.htm | 209 ----- dzz/orguser/template/main.htm | 87 -- dzz/orguser/template/profile.htm | 55 -- dzz/orguser/template/tree.htm | 420 --------- dzz/orguser/view.php | 60 -- dzz/styles/icoblock/default/style.css | 1 - dzz/system/css/select-file.css | 57 +- dzz/system/css/selfilewindow.css | 4 - dzz/system/scripts/selorguser.js | 2 +- dzz/system/template/fileselection/index.htm | 3 + .../template/fileselection/listcontent.htm | 3 - .../template_file_detaillist_cat.htm | 8 +- dzz/system/template/notification_list.htm | 5 +- dzz/system/template/selectfile.htm | 2 +- dzz/system/template/selorguser.htm | 4 +- dzz/system/template/selposition.htm | 5 +- static/bootstrap/css/bootstrap.min.css | 39 +- static/css/app_manage.css | 17 +- static/css/barber-shop.css | 85 ++ static/css/common.css | 23 - static/css/style.min.css | 14 +- static/js/main.min.js | 16 +- static/js/pace.min.js | 800 ++++++++++++++++++ user/space/template/space.htm | 4 - 94 files changed, 2451 insertions(+), 4982 deletions(-) create mode 100644 dzz/onlyoffice/LICENSE create mode 100644 dzz/onlyoffice/README.md create mode 100644 dzz/onlyoffice/admin.php create mode 100644 dzz/onlyoffice/classes/filter.php create mode 100644 dzz/onlyoffice/classes/index.htm create mode 100644 dzz/onlyoffice/classes/thumb.php create mode 100644 dzz/onlyoffice/config/config.php create mode 100644 dzz/onlyoffice/config/index.htm create mode 100644 dzz/onlyoffice/dzz_app_onlyoffice.xml create mode 100644 dzz/onlyoffice/enable.php create mode 100644 dzz/onlyoffice/images/index.htm create mode 100644 dzz/onlyoffice/images/loading.gif create mode 100644 dzz/onlyoffice/images/onlyoffice54.png create mode 100644 dzz/onlyoffice/images/onlyofficelogo.png create mode 100644 dzz/onlyoffice/index.htm create mode 100644 dzz/onlyoffice/index.php create mode 100644 dzz/onlyoffice/jwt/BeforeValidException.php create mode 100644 dzz/onlyoffice/jwt/ExpiredException.php create mode 100644 dzz/onlyoffice/jwt/JWT.php create mode 100644 dzz/onlyoffice/jwt/SignatureInvalidException.php create mode 100644 dzz/onlyoffice/language/en-US/index.htm create mode 100644 dzz/onlyoffice/language/en-US/lang.php create mode 100644 dzz/onlyoffice/language/index.htm create mode 100644 dzz/onlyoffice/language/zh-cn/index.htm create mode 100644 dzz/onlyoffice/language/zh-cn/lang.php create mode 100644 dzz/onlyoffice/onlyoffice.md5 create mode 100644 dzz/onlyoffice/template/admin.htm create mode 100644 dzz/onlyoffice/template/header_left.htm create mode 100644 dzz/onlyoffice/template/index.htm create mode 100644 dzz/onlyoffice/template/left.htm create mode 100644 dzz/onlyoffice/template/main.htm delete mode 100644 dzz/orguser/ajax.php delete mode 100644 dzz/orguser/edituser.php delete mode 100644 dzz/orguser/export.php delete mode 100644 dzz/orguser/export_tmpl.php delete mode 100644 dzz/orguser/images/add_guide.png delete mode 100644 dzz/orguser/images/ctrl.png delete mode 100644 dzz/orguser/images/icons.png delete mode 100644 dzz/orguser/images/icons_24.png delete mode 100644 dzz/orguser/images/orguser.css delete mode 100644 dzz/orguser/images/user_bg.png delete mode 100644 dzz/orguser/import.php delete mode 100644 dzz/orguser/index.php delete mode 100644 dzz/orguser/language/en-US/lang.php delete mode 100644 dzz/orguser/language/zh-cn/lang.php delete mode 100644 dzz/orguser/scripts/orguser.js delete mode 100644 dzz/orguser/template.xlsx delete mode 100644 dzz/orguser/template/adduser.htm delete mode 100644 dzz/orguser/template/detail_org.htm delete mode 100644 dzz/orguser/template/edituser.htm delete mode 100644 dzz/orguser/template/export.htm delete mode 100644 dzz/orguser/template/guide.htm delete mode 100644 dzz/orguser/template/header_left.htm delete mode 100644 dzz/orguser/template/header_search.htm delete mode 100644 dzz/orguser/template/import_guide.htm delete mode 100644 dzz/orguser/template/import_list.htm delete mode 100644 dzz/orguser/template/main.htm delete mode 100644 dzz/orguser/template/profile.htm delete mode 100644 dzz/orguser/template/tree.htm delete mode 100644 dzz/orguser/view.php create mode 100644 static/css/barber-shop.css create mode 100644 static/js/pace.min.js diff --git a/README.md b/README.md index 0e3cab6..017678e 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,4 @@ ### 官方网站:http://dzzoffice.com ### 小胡版插件获取地址:https://gitee.com/xh2002/projects ### 【金山文档】 Dzzoffice笔记:https://kdocs.cn/l/cauBSADFYYE2 -### DzzOffice 介绍: - -DzzOffice是一款云存储与应用管理工具,可用于个人、团队网盘和企业OA等。它部署简单,支持多种云存储的接入,并具有强大的文件共享功能以及丰富的成员权限管理。通过将存储文件与云端各类应用的交互,来实现在线协同办公,提高工作效率。 -### dzzoffice小胡版说明 - dzzoffice小胡版也是是开源且免费的,它遵循的是apache开源协议。而关于这个协议,其实我也并不十分了解。我自己是一名学生,经常寻找各种模板来搭建网站。结合我个人的使用习惯,并参考了很多网络模板的设计,这便出了dzzoffice小胡版。尽管项目可能并不完美,也存在一些问题,但因为我平时只能在空闲时间来维护和更新,所以更新的时间可能并不十分及时。希望大家能给予理解。如果您觉得dzzoffice小胡版对您有帮助,或者认为它有可取之处,可以去码云上给我们点个star,而对于那些愿意捐赠的小伙伴,我们自然是热烈欢迎的。 - 注意事项: - a. 英文语言包需自行维护,我只是添加了部分内容,且一般不进行维护; - b. 如果官方与小胡版有共同的插件就得用小胡版的,没有的就可以选择用官方的插件,但可能会出现不适配问题; - c. 应用市场应用更新需谨慎,因为二次开发的应用与官方版存在差异; - d. 支持小胡和官方2.0beta及以上的系列版本升级。注意,选择更新也有可能与全新安装的效果不一样。 - ### 其他内容在dzzoffice笔记查看 \ No newline at end of file diff --git a/admin/images/app.css b/admin/images/app.css index 4018748..eabff1e 100644 --- a/admin/images/app.css +++ b/admin/images/app.css @@ -205,10 +205,6 @@ button:focus{ margin-left:10px; } -.main-content{ - -} - .partion{ padding:10px; margin:10px; diff --git a/admin/images/member.css b/admin/images/member.css index 1374a21..943e324 100644 --- a/admin/images/member.css +++ b/admin/images/member.css @@ -28,10 +28,6 @@ height:26px; margin-left:10px; } -.main-content{ - padding:20px 10px; -} - .partion{ padding:10px; margin:10px; diff --git a/core/class/dzz/dzz_app.php b/core/class/dzz/dzz_app.php index ad4dc8a..ee0bbb9 100644 --- a/core/class/dzz/dzz_app.php +++ b/core/class/dzz/dzz_app.php @@ -588,7 +588,7 @@ class dzz_app extends dzz_base{ } } if($appidxu=C::t('app_market')->fetch_by_identifier(CURMODULE)){ - if($this->var['member']['adminid']){ + if($this->var['member']['adminid'] || $_GET['do']=='savefile'){ }elseif($appidxu['available']==0){ showmessage(lang('您无权使用该应用,请联系管理员。')); }elseif($this->var['member']['uid']){ diff --git a/core/core_version.php b/core/core_version.php index a372018..dc92e47 100644 --- a/core/core_version.php +++ b/core/core_version.php @@ -14,7 +14,7 @@ if(!defined('CORE_VERSION')) { define('CORE_VERSION', '2.02'); define('CORE_RELEASE', '20180909'); define('CORE_FIXBUG' , '20000000'); - define('CORE_XHVERSION', '1.85'); - define('CORE_XHRELEASE', '20230828'); - define('CORE_XHFIXBUG' , '20230828'); + define('CORE_XHVERSION', '1.85.1'); + define('CORE_XHRELEASE', '20230829'); + define('CORE_XHFIXBUG' , '20230829'); } \ No newline at end of file diff --git a/core/function/function_core.php b/core/function/function_core.php index e61d5fc..b180d2c 100644 --- a/core/function/function_core.php +++ b/core/function/function_core.php @@ -723,7 +723,7 @@ function avatar_group($gid,$groupcolors=array(),$class='iconFirstWord'){ if(preg_match('/^\#.+/',$groupcolor)){ return ''.strtoupper(new_strsubstr($groupcolors[$gid]['orgname'],1,'')).''; }elseif(preg_match('/^\d+$/',$groupcolor) && $groupcolors > 0){ - return ''; + return ''; } }else{ $colorkey = rand(1,15); @@ -739,7 +739,7 @@ function avatar_group($gid,$groupcolors=array(),$class='iconFirstWord'){ if(preg_match('/^\#.+/',$groupinfo['aid'])){ return ''.strtoupper(new_strsubstr($groupinfo['orgname'],1,'')).''; }elseif(preg_match('/^\d+$/',$groupinfo['aid']) && $groupinfo['aid'] > 0){ - return ''; + return ''; } }else{ diff --git a/core/template/default/common/about.htm b/core/template/default/common/about.htm index 5835572..136a5b0 100644 --- a/core/template/default/common/about.htm +++ b/core/template/default/common/about.htm @@ -21,7 +21,7 @@ $about[name_en] {lang version}: - $about[version] + $about[version]

@@ -34,7 +34,7 @@ 服务支持: www.dzzoffice.com

- 小胡 版本:$about[xhversion] + 小胡版本:$about[xhversion]

-
- -
- - - - -
- -
- -

 

- - - - {lang adduser_login_email_text} -
-
-
- -
- - - - - {lang login_username_tips} -
-
-
- -
- - {lang adduser_phone_number_text} -
-
-
- -
- - {lang edituser_weixin_text} -
-
-
- -
- - - - - -
-
-
- -
- - - - - -
-
-
- -
- -
-
-
- -
- disabled="disabled" value="1" checked> - {lang adduser_disable_user_text} -
-
-
- -
- - {lang adduser_usergroup_text} -
-
-
- -
-
-
- - - - -
-
-
-
-
- -
-
-
-
- -
-
-
-
-
-
- - -
-
- -
-
-
- \ No newline at end of file diff --git a/dzz/orguser/template/detail_org.htm b/dzz/orguser/template/detail_org.htm deleted file mode 100644 index 35b9ef5..0000000 --- a/dzz/orguser/template/detail_org.htm +++ /dev/null @@ -1,281 +0,0 @@ - -
- -
-
-
-
- -
- -
-
-
- -
-
    -
  • $org['avatar']
  • -
  • - -
  • -
  • - -
  • -
-
-
-
- -
- -
-
- -
- -
-
- 0}-->checked="checked" onclick="folder_available(1,'$orgid');" /> - -
-
- checked="checked" onclick="folder_available(0,'$orgid');" /> - -
- - {lang detail_org_explorerapp_enable} - - {lang detail_org_enable} - -
-
- - -
- -
-
- - M -
-
    -
  • {lang org_space_assign_tip}:{eval echo ($allowallotspace == 0) ? lang('no_limit'):formatsize($allowallotspace);} -
  • {lang org_space_assign_tips} -
-
-
- -
- -
-
-
{eval echo formatsize($org[usesize])}/{eval if($org[maxallotspacesize] == -1) echo formatsize($org[usesize]);else echo ($org[maxallotspacesize] == 0)?lang('no_limit'):formatsize($org[maxallotspacesize])} -
-
-
{eval echo formatsize($org[usesize])}/{eval if($org[maxallotspacesize] == -1) echo formatsize($org[usesize]);else echo ($org[maxallotspacesize] == 0)?lang('no_limit'):formatsize($org[maxallotspacesize])}
-
    - {lang space_use_org_tips} -
-
-
-
- -
- -
- -
-
-
- -
- - -
-
-
- -
- {lang add_position} -
-
- -
- - -
-
-
- -
-
- -
-
    - -
  • -
    -
    -
    - -
    -
    -
  • - - -
  • - -
     
    - -
    -
    -
    - {eval echo avatar_block($value[uid]);} -
    -
    -

    $value[username]

    -
  • - - -
- -
    - {lang detail_org_administrator} -
-
-
-
-
- - - \ No newline at end of file diff --git a/dzz/orguser/template/edituser.htm b/dzz/orguser/template/edituser.htm deleted file mode 100644 index 7a3aa1f..0000000 --- a/dzz/orguser/template/edituser.htm +++ /dev/null @@ -1,301 +0,0 @@ -
- -
-
- -
- - - - -
- -
- disabled="disabled"> -

 

- - - - {lang required_used_login_system} -
-
-
- -
- disabled="disabled"> - - - - {lang login_username_tips} -
-
- -
- -
-

-
-
-
- -
-

$user[regip]

-
-
- -
- -
-

-
-
- -
- -
- disabled="disabled"> - {lang adduser_phone_number_text} -
-
-
- -
- disabled="disabled"> - {lang edituser_weixin_text} -
-
-
- -
- disabled="disabled"> - - - - -
-
-
- -
- disabled="disabled"> - - - - -
-
-
- -
-
- disabled="disabled"name="userspace" value="$userfield[userspace]" autocomplete="off"> - M -
-
    -
  • {lang user_allocable_space}:{eval echo ($allowallotspace == 0) ? '{lang no_limit}':formatsize($currentuserAllotspace);}
  • -
  • {lang user_set_space_text}
  • -
-
-
-
- -
-
- checked disabled="disabled"> - -
-
-
-
- -
- - {lang adduser_usergroup_text} -
-
-
- -
-
- - - - -
-
-
-
- -
-
-
- -
-
-
-
-
- -
-
-
- \ No newline at end of file diff --git a/dzz/orguser/template/export.htm b/dzz/orguser/template/export.htm deleted file mode 100644 index 70c969b..0000000 --- a/dzz/orguser/template/export.htm +++ /dev/null @@ -1,71 +0,0 @@ - - - - -
-
- -
-
-
-
- - -
- -
- - {lang export_range_user}
-
- -
- -
- -
- - -
- - -
- -
-
- -
-
-
-
-
-
-
- - diff --git a/dzz/orguser/template/guide.htm b/dzz/orguser/template/guide.htm deleted file mode 100644 index 2895a0d..0000000 --- a/dzz/orguser/template/guide.htm +++ /dev/null @@ -1,20 +0,0 @@ -
-

{lang Organization management instructions}

- -
-

{lang Delete user description}:

- -
-
\ No newline at end of file diff --git a/dzz/orguser/template/header_left.htm b/dzz/orguser/template/header_left.htm deleted file mode 100644 index d9119b8..0000000 --- a/dzz/orguser/template/header_left.htm +++ /dev/null @@ -1,13 +0,0 @@ - - -
- -
- -
-
- -
- - {lang appname} -
\ No newline at end of file diff --git a/dzz/orguser/template/header_search.htm b/dzz/orguser/template/header_search.htm deleted file mode 100644 index 38cebe9..0000000 --- a/dzz/orguser/template/header_search.htm +++ /dev/null @@ -1,25 +0,0 @@ - - - - - \ No newline at end of file diff --git a/dzz/orguser/template/import_guide.htm b/dzz/orguser/template/import_guide.htm deleted file mode 100644 index 67c2308..0000000 --- a/dzz/orguser/template/import_guide.htm +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - -
-
-
- -
-
-
-
- -
- {lang inport_guide_download} - {lang inport_guide_template} -
-
-
- -
- {lang inport_guide_user.} -
-
-
- - -
- -
- - {lang inport_guide_layout} -
-
-
- -
-
-
-

{lang inport_guide_notice}

-
    - {lang inport_guide_notice_text} -
-
-
-
-
-
- \ No newline at end of file diff --git a/dzz/orguser/template/import_list.htm b/dzz/orguser/template/import_list.htm deleted file mode 100644 index 887aefb..0000000 --- a/dzz/orguser/template/import_list.htm +++ /dev/null @@ -1,209 +0,0 @@ - - - - - -
-
- -
-
- -
-
- -
- {lang import_list_organization} -
-
-
- -
- - {lang import_list_password} -
-
-
- -
-
- - -
-
- - -
- {lang import_list_coverage} -
-
-
    - {lang import_list_text} -
-
- - - - - - - - - - {eval $i=0;} - - - - - - - - - - - - - {eval $i++;} - - -
$h0[$value]
-

$value2

-

$value[$value1]

-     
-
-
-
-
- - diff --git a/dzz/orguser/template/main.htm b/dzz/orguser/template/main.htm deleted file mode 100644 index bb471f4..0000000 --- a/dzz/orguser/template/main.htm +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - -
-
- -
-
-
-
-
-
-
-
-
-
-
-
- -
- - - - - - - - - - - - \ No newline at end of file diff --git a/dzz/orguser/template/profile.htm b/dzz/orguser/template/profile.htm deleted file mode 100644 index 8067691..0000000 --- a/dzz/orguser/template/profile.htm +++ /dev/null @@ -1,55 +0,0 @@ -
- -
-
-
-
- - - - - - -
- -
- $htmls[$key] -
-
- - -
- -
-
-
- - - - - - - \ No newline at end of file diff --git a/dzz/orguser/template/tree.htm b/dzz/orguser/template/tree.htm deleted file mode 100644 index d1c1e3f..0000000 --- a/dzz/orguser/template/tree.htm +++ /dev/null @@ -1,420 +0,0 @@ -
- - - - - - - - -
- -
- - \ No newline at end of file diff --git a/dzz/orguser/view.php b/dzz/orguser/view.php deleted file mode 100644 index 371128a..0000000 --- a/dzz/orguser/view.php +++ /dev/null @@ -1,60 +0,0 @@ - ismoderator_by_uid_orgid($orgid, $_G['uid'])) { - exit(lang('orguser_vidw_delete')); - } - if($org = C::t('organization') -> fetch($orgid)){ - $org['avatar'] = avatar_group($org['orgid'],array($org['orgid']=>array('aid'=>$org['aid'],'orgname'=>$org['orgname']))); - } - if ($org && $org['forgid'] > 0) { - $toporgid = C::t('organization') -> getTopOrgid($orgid); - $toporg = C::t('organization') -> fetch($toporgid); - $folder_available = $toporg['available']; - $group_on = $toporg['syatemon']; - } else { - $folder_available = 1; - $group_on = 1; - } - - //可分配空间 - $allowallotspace = C::t('organization')->get_allowallotspacesize_by_orgid($orgid); - //获取已使用空间 - $org['usesize'] = C::t('organization')->get_orgallotspace_by_orgid($orgid,0,false); - /*echo formatsize($org['usesize']); - die;*/ - //获取总空间 - if($org['maxspacesize'] == 0){ - $maxspacesize = C::t('organization')->get_parent_maxspacesize_by_pathkey($org['pathkey'],$orgid); - $org['maxallotspacesize'] = $maxspacesize['maxspacesize']; - }else{ - if($org['maxspacesize'] == -1){ - $org['maxallotspacesize'] = -1; - }else{ - $org['maxallotspacesize'] = $org['maxspacesize']*1024*1024; - } - - } - $pmoderator = C::t('organization_admin') -> ismoderator_by_uid_orgid($org['forgid'], $_G['uid']); - $jobs = C::t('organization_job') -> fetch_all_by_orgid($orgid); - $moderators = C::t('organization_admin') -> fetch_moderators_by_orgid($orgid); - //$grouppic= C::t('resources_grouppic')->fetch_user_pic(); - include template('detail_org'); -} -?> diff --git a/dzz/styles/icoblock/default/style.css b/dzz/styles/icoblock/default/style.css index ac4c7e8..278dd2a 100644 --- a/dzz/styles/icoblock/default/style.css +++ b/dzz/styles/icoblock/default/style.css @@ -25,7 +25,6 @@ /*目录内图标文字样式*/ .IcoText_folder {font-size:13px; color:#333; font-weight:nomal;font-family:Tahoma,'微软雅黑','Simsun';word-break:break-all;text-decoration:none} -.IcoText_div { max-height:38px; overflow:hidden;word-break:break-all; } .IcoText_div table{table-layout:fixed;} .IcoText_div a{ text-decoration:none; diff --git a/dzz/system/css/select-file.css b/dzz/system/css/select-file.css index 86dc0b3..8d9c2b4 100644 --- a/dzz/system/css/select-file.css +++ b/dzz/system/css/select-file.css @@ -2,7 +2,7 @@ height: 100%; width: 100%; margin: 0; - overflow: hidden; + overflow: auto; /*padding-bottom: 34px;*/ } a,a:hover,a:focus{ @@ -173,25 +173,6 @@ li{ margin-right: 2px; color: #FFFFFF; } -@media (min-width:768px ) { - .modal-dialog{ - width: 800px; - - } -} -@media (max-width:768px ) { - .modal-dialog{ - width: 550px; - min-width: 550px; - } -} -/*内容上部分开始*/ -.select-fileall{ - padding:0 15px -} -/*.select-filetop{ - overflow: hidden; -}*/ .select-filetop{ position: relative; padding:0 10px; @@ -401,9 +382,6 @@ li{ } .filemanage .detail_text { text-shadow: none; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; max-width: -webkit-calc(100% - 10px); line-height: 30px; cursor: default; @@ -451,10 +429,8 @@ li{ .Icoblock.middleicon{ margin: 0.5rem 0.8rem 0.3rem 0.5rem; width: 100px; - height: 125px; position: relative; float: left; - padding: 0; z-index: 10; overflow: visible; } @@ -501,33 +477,15 @@ li{ border-radius: var(--radius); } .Icoselected.Icoblock.middleicon .select-tdtop{ - border: 1px solid #3779ff; - outline: 1px solid #3779ff; - border-radius: var(--radius); -} -.Icoblock.middleicon .td_ico_item_name { - overflow: hidden; - text-overflow: ellipsis; - word-break: break-all; - white-space: nowrap; + border: 1px solid var(--bs-primary); + border-radius: var(--radius); + background-color: rgba(var(--bs-primary-hover),0.2); } .Icoblock.middleicon .IcoText_div { position: relative; overflow: hidden; word-break: break-all; } -.IcoText_div a { - font-family: "微软雅黑"; - font-size: 12px; - color:#4e5563; - text-decoration: none; - overflow: hidden; - text-overflow: ellipsis; - word-break: break-all; - white-space: nowrap; - display: block; - width: 100px; -} .Icoselected.Icoblock.middleicon .IcoText_div a{ color: #3779ff; } @@ -543,4 +501,9 @@ li{ .typedropup{ width: 100%; } -/*内容下部分结束*/ \ No newline at end of file +/*内容下部分结束*/ +.square-fileList{ + display: flex; + flex-direction: row; + flex-wrap: wrap; +} \ No newline at end of file diff --git a/dzz/system/css/selfilewindow.css b/dzz/system/css/selfilewindow.css index b4f0a77..13041e5 100644 --- a/dzz/system/css/selfilewindow.css +++ b/dzz/system/css/selfilewindow.css @@ -1,8 +1,4 @@ -#seluser_dropdown_menu{ - /*padding-left: 1.78rem; - padding-right: 1.78rem;*/ -} .jstree-default .jstree-wholerow{ height: 2.14rem; } diff --git a/dzz/system/scripts/selorguser.js b/dzz/system/scripts/selorguser.js index 56a8c89..f7ddbc7 100644 --- a/dzz/system/scripts/selorguser.js +++ b/dzz/system/scripts/selorguser.js @@ -11,7 +11,7 @@ selorg.add=function(ctrlid,vals){ if(vals[i].orgid.indexOf('uid_')===0){ var headimg = ''; if(vals[i].icon){ - headimg = ''; + headimg = ''; } html='
  • ' + headimg+vals[i].text+'
  • '; diff --git a/dzz/system/template/fileselection/index.htm b/dzz/system/template/fileselection/index.htm index f796496..47fb8ab 100644 --- a/dzz/system/template/fileselection/index.htm +++ b/dzz/system/template/fileselection/index.htm @@ -11,6 +11,9 @@ var urldefined = '{$urldefined}'; + + +