diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index cbc338ac..6c2fa9bb 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -323,6 +323,7 @@ CREATE TABLE `fa_config` ( `title` varchar(100) DEFAULT '' COMMENT '变量标题', `tip` varchar(100) DEFAULT '' COMMENT '变量描述', `type` varchar(30) DEFAULT '' COMMENT '类型:string,text,int,bool,array,datetime,date,file', + `visible` varchar(255) DEFAULT '' COMMENT '可见条件', `value` text COMMENT '变量值', `content` text COMMENT '变量字典数据', `rule` varchar(100) DEFAULT '' COMMENT '验证规则', @@ -336,24 +337,24 @@ CREATE TABLE `fa_config` ( -- Records of fa_config -- ---------------------------- BEGIN; -INSERT INTO `fa_config` VALUES (1, 'name', 'basic', 'Site name', '请填写站点名称', 'string', '我的网站', '', 'required', '', ''); -INSERT INTO `fa_config` VALUES (2, 'beian', 'basic', 'Beian', '粤ICP备15000000号-1', 'string', '', '', '', '', ''); -INSERT INTO `fa_config` VALUES (3, 'cdnurl', 'basic', 'Cdn url', '如果全站静态资源使用第三方云储存请配置该值', 'string', '', '', '', '', ''); -INSERT INTO `fa_config` VALUES (4, 'version', 'basic', 'Version', '如果静态资源有变动请重新配置该值', 'string', '1.0.1', '', 'required', '', ''); -INSERT INTO `fa_config` VALUES (5, 'timezone', 'basic', 'Timezone', '', 'string', 'Asia/Shanghai', '', 'required', '', ''); -INSERT INTO `fa_config` VALUES (6, 'forbiddenip', 'basic', 'Forbidden ip', '一行一条记录', 'text', '', '', '', '', ''); -INSERT INTO `fa_config` VALUES (7, 'languages', 'basic', 'Languages', '', 'array', '{\"backend\":\"zh-cn\",\"frontend\":\"zh-cn\"}', '', 'required', '', ''); -INSERT INTO `fa_config` VALUES (8, 'fixedpage', 'basic', 'Fixed page', '请尽量输入左侧菜单栏存在的链接', 'string', 'dashboard', '', 'required', '', ''); -INSERT INTO `fa_config` VALUES (9, 'categorytype', 'dictionary', 'Category type', '', 'array', '{\"default\":\"Default\",\"page\":\"Page\",\"article\":\"Article\",\"test\":\"Test\"}', '', '', '', ''); -INSERT INTO `fa_config` VALUES (10, 'configgroup', 'dictionary', 'Config group', '', 'array', '{\"basic\":\"Basic\",\"email\":\"Email\",\"dictionary\":\"Dictionary\",\"user\":\"User\",\"example\":\"Example\"}', '', '', '', ''); -INSERT INTO `fa_config` VALUES (11, 'mail_type', 'email', 'Mail type', '选择邮件发送方式', 'select', '1', '[\"请选择\",\"SMTP\"]', '', '', ''); -INSERT INTO `fa_config` VALUES (12, 'mail_smtp_host', 'email', 'Mail smtp host', '错误的配置发送邮件会导致服务器超时', 'string', 'smtp.qq.com', '', '', '', ''); -INSERT INTO `fa_config` VALUES (13, 'mail_smtp_port', 'email', 'Mail smtp port', '(不加密默认25,SSL默认465,TLS默认587)', 'string', '465', '', '', '', ''); -INSERT INTO `fa_config` VALUES (14, 'mail_smtp_user', 'email', 'Mail smtp user', '（填写完整用户名）', 'string', '10000', '', '', '', ''); -INSERT INTO `fa_config` VALUES (15, 'mail_smtp_pass', 'email', 'Mail smtp password', '（填写您的密码或授权码）', 'string', 'password', '', '', '', ''); -INSERT INTO `fa_config` VALUES (16, 'mail_verify_type', 'email', 'Mail vertify type', '（SMTP验证方式[推荐SSL]）', 'select', '2', '[\"无\",\"TLS\",\"SSL\"]', '', '', ''); -INSERT INTO `fa_config` VALUES (17, 'mail_from', 'email', 'Mail from', '', 'string', '10000@qq.com', '', '', '', ''); -INSERT INTO `fa_config` VALUES (18, 'attachmentcategory', 'dictionary', 'Attachment category', '', 'array', '{\"category1\":\"Category1\",\"category2\":\"Category2\",\"custom\":\"Custom\"}', '', '', '', ''); +INSERT INTO `fa_config` VALUES (1, 'name', 'basic', 'Site name', '请填写站点名称', 'string', '', '我的网站', '', 'required', '', ''); +INSERT INTO `fa_config` VALUES (2, 'beian', 'basic', 'Beian', '粤ICP备15000000号-1', 'string', '', '', '', '', '', ''); +INSERT INTO `fa_config` VALUES (3, 'cdnurl', 'basic', 'Cdn url', '如果全站静态资源使用第三方云储存请配置该值', 'string', '', '', '', '', '', ''); +INSERT INTO `fa_config` VALUES (4, 'version', 'basic', 'Version', '如果静态资源有变动请重新配置该值', 'string', '', '1.0.1', '', 'required', '', ''); +INSERT INTO `fa_config` VALUES (5, 'timezone', 'basic', 'Timezone', '', 'string', '', 'Asia/Shanghai', '', 'required', '', ''); +INSERT INTO `fa_config` VALUES (6, 'forbiddenip', 'basic', 'Forbidden ip', '一行一条记录', 'text', '', '', '', '', '', ''); +INSERT INTO `fa_config` VALUES (7, 'languages', 'basic', 'Languages', '', 'array', '', '{\"backend\":\"zh-cn\",\"frontend\":\"zh-cn\"}', '', 'required', '', ''); +INSERT INTO `fa_config` VALUES (8, 'fixedpage', 'basic', 'Fixed page', '请尽量输入左侧菜单栏存在的链接', 'string', '', 'dashboard', '', 'required', '', ''); +INSERT INTO `fa_config` VALUES (9, 'categorytype', 'dictionary', 'Category type', '', 'array', '', '{\"default\":\"Default\",\"page\":\"Page\",\"article\":\"Article\",\"test\":\"Test\"}', '', '', '', ''); +INSERT INTO `fa_config` VALUES (10, 'configgroup', 'dictionary', 'Config group', '', 'array', '', '{\"basic\":\"Basic\",\"email\":\"Email\",\"dictionary\":\"Dictionary\",\"user\":\"User\",\"example\":\"Example\"}', '', '', '', ''); +INSERT INTO `fa_config` VALUES (11, 'mail_type', 'email', 'Mail type', '选择邮件发送方式', 'select', '', '1', '[\"请选择\",\"SMTP\"]', '', '', ''); +INSERT INTO `fa_config` VALUES (12, 'mail_smtp_host', 'email', 'Mail smtp host', '错误的配置发送邮件会导致服务器超时', 'string', '', 'smtp.qq.com', '', '', '', ''); +INSERT INTO `fa_config` VALUES (13, 'mail_smtp_port', 'email', 'Mail smtp port', '(不加密默认25,SSL默认465,TLS默认587)', 'string', '', '465', '', '', '', ''); +INSERT INTO `fa_config` VALUES (14, 'mail_smtp_user', 'email', 'Mail smtp user', '（填写完整用户名）', 'string', '', '10000', '', '', '', ''); +INSERT INTO `fa_config` VALUES (15, 'mail_smtp_pass', 'email', 'Mail smtp password', '（填写您的密码或授权码）', 'string', '', 'password', '', '', '', ''); +INSERT INTO `fa_config` VALUES (16, 'mail_verify_type', 'email', 'Mail vertify type', '（SMTP验证方式[推荐SSL]）', 'select', '', '2', '[\"无\",\"TLS\",\"SSL\"]', '', '', ''); +INSERT INTO `fa_config` VALUES (17, 'mail_from', 'email', 'Mail from', '', 'string', '', '10000@qq.com', '', '', '', ''); +INSERT INTO `fa_config` VALUES (18, 'attachmentcategory', 'dictionary', 'Attachment category', '', 'array', '', '{\"category1\":\"Category1\",\"category2\":\"Category2\",\"custom\":\"Custom\"}', '', '', '', ''); COMMIT; -- ---------------------------- diff --git a/application/admin/controller/Addon.php b/application/admin/controller/Addon.php index 1abc30cb..365b60f8 100644 --- a/application/admin/controller/Addon.php +++ b/application/admin/controller/Addon.php @@ -94,12 +94,16 @@ class Addon extends Backend $this->error(__('Parameter %s can not be empty', '')); } $tips = []; + $groupList = []; foreach ($config as $index => &$item) { if ($item['name'] == '__tips__') { + $groupList = $item['content'] ? $item['content'] : []; $tips = $item; unset($config[$index]); } } + $groupList['other'] = '其它'; + $this->view->assign("groupList", $groupList); $this->view->assign("addon", ['info' => $info, 'config' => $config, 'tips' => $tips]); $configFile = ADDON_PATH . $name . DS . 'config.html'; $viewFile = is_file($configFile) ? $configFile : ''; diff --git a/application/admin/lang/zh-cn/general/config.php b/application/admin/lang/zh-cn/general/config.php index 6939a667..0da3f0ea 100644 --- a/application/admin/lang/zh-cn/general/config.php +++ b/application/admin/lang/zh-cn/general/config.php @@ -48,6 +48,7 @@ return [ 'Field value' => '字段值', 'Content' => '数据列表', 'Rule' => '校验规则', + 'Visible condition' => '可见条件', 'Site name' => '站点名称', 'Beian' => '备案号', 'Cdn url' => 'CDN地址', diff --git a/application/admin/view/addon/config.html b/application/admin/view/addon/config.html index 70a1c1ca..b9283054 100644 --- a/application/admin/view/addon/config.html +++ b/application/admin/view/addon/config.html @@ -1,118 +1,134 @@
- {if $addon.tips} + {if $addon.tips && $addon.tips.value}
+ {if $addon.tips.title} {$addon.tips.title}
+ {/if} {$addon.tips.value}
{/if} - - - - - - - - - {foreach $addon.config as $item} - - - - - {/foreach} - -
{:__('Title')}{:__('Value')}
{$item.title} -
-
- {switch $item.type} - {case string} - - {/case} - {case password} - - {/case} - {case text} - - {/case} - {case array} -
-
- {:__('Array key')} - {:__('Array value')} -
-
{:__('Append')}
- -
- {/case} - {case date} - - {/case} - {case time} - - {/case} - {case datetime} - - {/case} - {case number} - - {/case} - {case checkbox} - {foreach name="item.content" item="vo"} - - {/foreach} - {/case} - {case radio} - {foreach name="item.content" item="vo"} - - {/foreach} - {/case} - {case value="select" break="0"}{/case} - {case value="selects"} - - {/case} - {case value="image" break="0"}{/case} - {case value="images"} -
- -
- - -
- -
-
    - {/case} - {case value="file" break="0"}{/case} - {case value="files"} -
    - -
    - - -
    - -
    -
      - {/case} - {case bool} - - - {/case} - {default /}{$item.value} - {/switch} -
      -
      -
      -
      -
      - -
      - - +
      + {if $groupList} +
      +
        +
      • 全部
        • + {foreach name="groupList" id="tab"} +
      • {$tab}
        • + {/foreach} +
      +
      + {/if} + +
      +
      + {foreach name="groupList" id="group" key="groupName"} +
      + + + + {foreach name="$addon.config" id="item"} + {if ((!isset($item['group']) || $item['group']=='') && $key=='other') || (isset($item['group']) && $item['group']==$groupName)} + + + + + {/if} + {/foreach} + +
      {$item.title} +
      +
      + {switch $item.type} + {case string} + + {/case} + {case password} + + {/case} + {case text} + + {/case} + {case array} +
      +
      + {:__('Array key')} + {:__('Array value')} +
      +
      {:__('Append')}
      + +
      + {/case} + {case date} + + {/case} + {case time} + + {/case} + {case datetime} + + {/case} + {case number} + + {/case} + {case checkbox} + {foreach name="item.content" item="vo"} + + {/foreach} + + {/case} + {case radio} + {foreach name="item.content" item="vo"} + + {/foreach} + + {/case} + {case value="select" break="0"}{/case} + {case value="selects"} + + {/case} + {case value="image" break="0"}{/case} + {case value="images"} +
      + + + +
        +
        + {/case} + {case value="file" break="0"}{/case} + {case value="files"} +
        + + + +
        + {/case} + {case bool} + + + {/case} + {default /}{$item.value} + {/switch} +
        +
        +
        + +
        +
        + {/foreach} +
        + +
        + + +
        +
        +
        diff --git a/application/admin/view/general/config/index.html b/application/admin/view/general/config/index.html index fbff8f72..24f4ac65 100644 --- a/application/admin/view/general/config/index.html +++ b/application/admin/view/general/config/index.html @@ -36,7 +36,7 @@ {:build_heading(null, false)}
          {foreach $siteList as $index=>$vo} -
        • {:__($vo.title)}
          • +
        • {:__($vo.title)}
          • {/foreach} {if $Think.config.app_debug}
        • @@ -50,7 +50,7 @@
          {foreach $siteList as $index=>$vo} -
          +
          {:token()} @@ -67,7 +67,7 @@ {foreach $vo.list as $item} - + {$item.title}
          @@ -323,6 +323,12 @@ value2|title2
          +
          + +
          + +
          +
          diff --git a/public/assets/js/backend/addon.js b/public/assets/js/backend/addon.js index f4ebca91..123bffc5 100644 --- a/public/assets/js/backend/addon.js +++ b/public/assets/js/backend/addon.js @@ -678,6 +678,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function Controller.api.bindevent(); }, config: function () { + $(document).on("click", ".nav-group li a[data-toggle='tab']", function () { + if ($(this).attr("href") == "#all") { + $(".tab-pane").addClass("active in"); + } + return; + var type = $(this).attr("href").substring(1); + if (type == 'all') { + $(".table-config tr").show(); + } else { + $(".table-config tr").hide(); + $(".table-config tr[data-group='" + type + "']").show(); + } + }); + Controller.api.bindevent(); }, api: { diff --git a/public/assets/js/require-form.js b/public/assets/js/require-form.js index 2af0d699..cc46f75d 100755 --- a/public/assets/js/require-form.js +++ b/public/assets/js/require-form.js @@ -484,6 +484,89 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio $("[data-role='autocomplete']").autocomplete(); }); } + }, + favisible: function (form) { + if ($("[data-favisible]", form).length == 0) { + return; + } + var checkCondition = function (condition) { + var conditionArr = condition.split(/&&/); + var success = 0; + var baseregex = /^([a-z0-9\_]+)([>|<|=|\!]=?)(.*)$/i, strregex = /^('|")(.*)('|")$/, regregex = /^regex:(.*)$/; + + var operator_result = { + '>': function(a, b) { return a > b; }, + '>=': function(a, b) { return a >= b; }, + '<': function(a, b) { return a < b; }, + '<=': function(a, b) { return a <= b; }, + '==': function(a, b) { return a == b; }, + '!=': function(a, b) { return a != b; }, + 'in': function(a, b) { return b.split(/\,/).indexOf(a) > -1; }, + 'regex': function(a, b) { + var regParts = b.match(/^\/(.*?)\/([gim]*)$/); + var regexp = regParts ? new RegExp(regParts[1], regParts[2]) : new RegExp(b); + return regexp.test(a); + } + }; + + var dataArr = form.serializeArray(), dataObj = {}; + $(dataArr).each(function (i, field) { + dataObj[field.name] = field.value; + }); + + $.each(conditionArr, function (i, item) { + var basematches = baseregex.exec(item); + if (basematches) { + var name = basematches[1], operator = basematches[2], value = basematches[3].toString(); + if (operator === '=') { + var strmatches = strregex.exec(value); + operator = strmatches ? '==' : 'in'; + value = strmatches ? strmatches[2] : value; + } + var regmatches = regregex.exec(value); + if (regmatches) { + operator = 'regex'; + value = regmatches[1]; + } + var chkname = "row[" + name + "]"; + if (typeof dataObj[chkname] === 'undefined') { + return false; + } + var objvalue = dataObj[chkname]; + if (['>', '>=', '<', '<='].indexOf(operator) > -1) { + objvalue = parseFloat(objvalue); + value = parseFloat(value); + } + var result = operator_result[operator](objvalue, value); + success += (result ? 1 : 0); + } + }); + return success === conditionArr.length; + }; + form.on("keyup change click configchange", "input,select", function () { + $("[data-favisible][data-favisible!='']", form).each(function () { + var visible = $(this).data("favisible"); + var groupArr = visible.split(/\|\|/); + var success = 0; + $.each(groupArr, function (i, j) { + if (checkCondition(j)) { + success++; + } + }); + if (success > 0) { + $(this).removeClass("hidden"); + } else { + $(this).addClass("hidden"); + } + }); + }); + + //追加上忽略元素 + setTimeout(function () { + form.data('validator').options.ignore += ((form.data('validator').options.ignore ? ',' : '') + '[data-favisible] :hidden'); + }, 0); + + $("input,select", form).trigger("configchange"); } }, api: { @@ -590,6 +673,8 @@ define(['jquery', 'bootstrap', 'upload', 'validator', 'validator-lang'], functio events.tagsinput(form); events.autocomplete(form); + + events.favisible(form); }, custom: {} },