@@ -1180,8 +1153,7 @@ EOD;
protected function getImageUpload($field, $content)
{
$uploadfilter = $selectfilter = '';
- if ($this->isMatchSuffix($field, $this->imageField))
- {
+ if ($this->isMatchSuffix($field, $this->imageField)) {
$uploadfilter = ' data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp"';
$selectfilter = ' data-mimetype="image/*"';
}
@@ -1213,68 +1185,52 @@ EOD;
{
$lang = mb_ucfirst($field);
$formatter = '';
- foreach ($this->fieldFormatterSuffix as $k => $v)
- {
- if (preg_match("/{$k}$/i", $field))
- {
- if (is_array($v))
- {
- if (in_array($datatype, $v['type']))
- {
+ foreach ($this->fieldFormatterSuffix as $k => $v) {
+ if (preg_match("/{$k}$/i", $field)) {
+ if (is_array($v)) {
+ if (in_array($datatype, $v['type'])) {
$formatter = $v['name'];
break;
}
- }
- else
- {
+ } else {
$formatter = $v;
break;
}
}
}
- if ($formatter)
- {
+ if ($formatter) {
$extend = '';
}
$html = str_repeat(" ", 24) . "{field: '{$field}{$extend}', title: __('{$lang}')";
//$formatter = $extend ? '' : $formatter;
- if ($extend)
- {
+ if ($extend) {
$html .= ", operate:false";
- if ($datatype == 'set')
- {
+ if ($datatype == 'set') {
$formatter = 'label';
}
}
- foreach ($itemArr as $k => &$v)
- {
+ foreach ($itemArr as $k => &$v) {
if (substr($v, 0, 3) !== '__(')
$v = "__('" . $v . "')";
}
unset($v);
$searchList = json_encode($itemArr, JSON_FORCE_OBJECT);
$searchList = str_replace(['":"', '"}', ')","'], ['":', '}', '),"'], $searchList);
- if ($itemArr && !$extend)
- {
+ if ($itemArr && !$extend) {
$html .= ", searchList: " . $searchList;
}
- if (in_array($datatype, ['date', 'datetime']) || $formatter === 'datetime')
- {
+ if (in_array($datatype, ['date', 'datetime']) || $formatter === 'datetime') {
$html .= ", operate:'RANGE', addclass:'datetimerange'";
- }
- else if (in_array($datatype, ['float', 'double', 'decimal']))
- {
+ } else if (in_array($datatype, ['float', 'double', 'decimal'])) {
$html .= ", operate:'BETWEEN'";
}
if ($formatter)
$html .= ", formatter: Table.api.formatter." . $formatter . "}";
else
$html .= "}";
- if ($extend)
- {
+ if ($extend) {
$origin = str_repeat(" ", 24) . "{field: '{$field}', title: __('{$lang}'), visible:false";
- if ($searchList)
- {
+ if ($searchList) {
$origin .= ", searchList: " . $searchList;
}
$origin .= "}";
diff --git a/application/admin/command/Crud/stubs/controllerindex.stub b/application/admin/command/Crud/stubs/controllerindex.stub
old mode 100644
new mode 100755
index 35c94e3e..5294600c
--- a/application/admin/command/Crud/stubs/controllerindex.stub
+++ b/application/admin/command/Crud/stubs/controllerindex.stub
@@ -7,22 +7,28 @@
//当前是否为关联查询
$this->relationSearch = {%relationSearch%};
//设置过滤方法
- $this->request->filter(['strip_tags', 'htmlspecialchars']);
+ $this->request->filter(['strip_tags']);
if ($this->request->isAjax())
{
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
$total = $this->model
- {%relationWith%}
+ {%relationWithList%}
->where($where)
->order($sort, $order)
->count();
$list = $this->model
- {%relationWith%}
+ {%relationWithList%}
->where($where)
->order($sort, $order)
->limit($offset, $limit)
->select();
+
+ foreach ($list as $row) {
+ {%visibleFieldList%}
+ {%relationVisibleFieldList%}
+ }
+ $list = collection($list)->toArray();
$result = array("total" => $total, "rows" => $list);
return json($result);
diff --git a/application/admin/command/Crud/stubs/mixins/modelrelationmethod.stub b/application/admin/command/Crud/stubs/mixins/modelrelationmethod.stub
old mode 100644
new mode 100755
index fa6c4276..712daebf
--- a/application/admin/command/Crud/stubs/mixins/modelrelationmethod.stub
+++ b/application/admin/command/Crud/stubs/mixins/modelrelationmethod.stub
@@ -1,5 +1,5 @@
public function {%relationMethod%}()
{
- return $this->{%relationMode%}('{%relationModelName%}', '{%relationForeignKey%}', '{%relationPrimaryKey%}')->setEagerlyType(0);
+ return $this->{%relationMode%}('{%relationName%}', '{%relationForeignKey%}', '{%relationPrimaryKey%}', [], 'LEFT')->setEagerlyType(0);
}
\ No newline at end of file
diff --git a/application/admin/command/Crud/stubs/model.stub b/application/admin/command/Crud/stubs/model.stub
old mode 100644
new mode 100755
index ae3da174..c08152b0
--- a/application/admin/command/Crud/stubs/model.stub
+++ b/application/admin/command/Crud/stubs/model.stub
@@ -7,7 +7,7 @@ use think\Model;
class {%modelName%} extends Model
{
// 表名
- protected ${%modelTableType%} = '{%modelTableName%}';
+ protected ${%modelTableType%} = '{%modelTableTypeName%}';
// 自动写入时间戳字段
protected $autoWriteTimestamp = {%modelAutoWriteTimestamp%};
@@ -29,5 +29,5 @@ class {%modelName%} extends Model
{%setAttrList%}
-{%modelRelationMethod%}
+{%relationMethodList%}
}
diff --git a/application/admin/command/Crud/stubs/relationmodel.stub b/application/admin/command/Crud/stubs/relationmodel.stub
old mode 100644
new mode 100755
index 99b56f6c..dd22a533
--- a/application/admin/command/Crud/stubs/relationmodel.stub
+++ b/application/admin/command/Crud/stubs/relationmodel.stub
@@ -4,9 +4,9 @@ namespace {%modelNamespace%};
use think\Model;
-class {%relationModelName%} extends Model
+class {%relationName%} extends Model
{
// 表名
- protected ${%relationModelTableType%} = '{%relationModelTableName%}';
+ protected ${%relationTableType%} = '{%relationTableTypeName%}';
}
diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql
index 8ec0f2f5..50610976 100755
--- a/application/admin/command/Install/fastadmin.sql
+++ b/application/admin/command/Install/fastadmin.sql
@@ -50,7 +50,7 @@ CREATE TABLE `fa_admin_log` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT COMMENT 'ID',
`admin_id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '管理员ID',
`username` varchar(30) NOT NULL DEFAULT '' COMMENT '管理员名字',
- `url` varchar(100) NOT NULL DEFAULT '' COMMENT '操作页面',
+ `url` varchar(255) NOT NULL DEFAULT '' COMMENT '操作页面',
`title` varchar(100) NOT NULL DEFAULT '' COMMENT '日志标题',
`content` text NOT NULL COMMENT '内容',
`ip` varchar(50) NOT NULL DEFAULT '' COMMENT 'IP',
@@ -58,7 +58,7 @@ CREATE TABLE `fa_admin_log` (
`createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '操作时间',
PRIMARY KEY (`id`),
KEY `name` (`username`)
-) ENGINE=InnoDB AUTO_INCREMENT=1317 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='管理员日志表';
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='管理员日志表';
-- ----------------------------
-- Table structure for fa_attachment
diff --git a/application/admin/command/Menu.php b/application/admin/command/Menu.php
index 3b501565..b25791dc 100755
--- a/application/admin/command/Menu.php
+++ b/application/admin/command/Menu.php
@@ -21,10 +21,11 @@ class Menu extends Command
protected function configure()
{
$this
- ->setName('menu')
- ->addOption('controller', 'c', Option::VALUE_REQUIRED, 'controller name,use \'all-controller\' when build all menu', null)
- ->addOption('delete', 'd', Option::VALUE_OPTIONAL, 'delete the specified menu', '')
- ->setDescription('Build auth menu from controller');
+ ->setName('menu')
+ ->addOption('controller', 'c', Option::VALUE_REQUIRED | Option::VALUE_IS_ARRAY, 'controller name,use \'all-controller\' when build all menu', null)
+ ->addOption('delete', 'd', Option::VALUE_OPTIONAL, 'delete the specified menu', '')
+ ->addOption('force', 'f', Option::VALUE_OPTIONAL, 'force delete menu,without tips', null)
+ ->setDescription('Build auth menu from controller');
}
protected function execute(Input $input, Output $output)
@@ -33,34 +34,35 @@ class Menu extends Command
$adminPath = dirname(__DIR__) . DS;
//控制器名
$controller = $input->getOption('controller') ?: '';
- if (!$controller)
- {
+ if (!$controller) {
throw new Exception("please input controller name");
}
+ $force = $input->getOption('force');
//是否为删除模式
$delete = $input->getOption('delete');
- if ($delete)
- {
- if ($controller == 'all-controller')
- {
+ if ($delete) {
+ if (in_array('all-controller', $controller)) {
throw new Exception("could not delete all menu");
}
$ids = [];
- $list = $this->model->where('name', 'like', strtolower($controller) . "%")->select();
- foreach ($list as $k => $v)
- {
+ $list = $this->model->where(function ($query) use ($controller) {
+ foreach ($controller as $index => $item) {
+ $query->whereOr('name', 'like', strtolower($item) . "%");
+ }
+ })->select();
+ foreach ($list as $k => $v) {
$output->warning($v->name);
$ids[] = $v->id;
}
- if (!$ids)
- {
+ if (!$ids) {
throw new Exception("There is no menu to delete");
}
- $output->info("Are you sure you want to delete all those menu? Type 'yes' to continue: ");
- $line = fgets(STDIN);
- if (trim($line) != 'yes')
- {
- throw new Exception("Operation is aborted!");
+ if (!$force) {
+ $output->info("Are you sure you want to delete all those menu? Type 'yes' to continue: ");
+ $line = fgets(STDIN);
+ if (trim($line) != 'yes') {
+ throw new Exception("Operation is aborted!");
+ }
}
AuthRule::destroy($ids);
@@ -69,22 +71,21 @@ class Menu extends Command
return;
}
- if ($controller != 'all-controller')
- {
- $controllerArr = explode('/', $controller);
- end($controllerArr);
- $key = key($controllerArr);
- $controllerArr[$key] = ucfirst($controllerArr[$key]);
- $adminPath = dirname(__DIR__) . DS . 'controller' . DS . implode(DS, $controllerArr) . '.php';
- if (!is_file($adminPath))
- {
- $output->error("controller not found");
- return;
+ if (!in_array('all-controller', $controller)) {
+ foreach ($controller as $index => $item) {
+ $controllerArr = explode('/', $item);
+ end($controllerArr);
+ $key = key($controllerArr);
+ $controllerArr[$key] = ucfirst($controllerArr[$key]);
+ $adminPath = dirname(__DIR__) . DS . 'controller' . DS . implode(DS, $controllerArr) . '.php';
+ if (!is_file($adminPath)) {
+ $output->error("controller not found");
+ return;
+ }
+ $this->importRule($item);
}
- $this->importRule($controller);
- }
- else
- {
+
+ } else {
$this->model->where('id', '>', 0)->delete();
$controllerDir = $adminPath . 'controller' . DS;
// 扫描新的节点信息并导入
@@ -103,16 +104,11 @@ class Menu extends Command
{
$result = [];
$cdir = scandir($dir);
- foreach ($cdir as $value)
- {
- if (!in_array($value, array(".", "..")))
- {
- if (is_dir($dir . DS . $value))
- {
+ foreach ($cdir as $value) {
+ if (!in_array($value, array(".", ".."))) {
+ if (is_dir($dir . DS . $value)) {
$result[$value] = $this->scandir($dir . DS . $value);
- }
- else
- {
+ } else {
$result[] = $value;
}
}
@@ -129,19 +125,14 @@ class Menu extends Command
public function import($dirarr, $parentdir = [])
{
$menuarr = [];
- foreach ($dirarr as $k => $v)
- {
- if (is_array($v))
- {
+ foreach ($dirarr as $k => $v) {
+ if (is_array($v)) {
//当前是文件夹
$nowparentdir = array_merge($parentdir, [$k]);
$this->import($v, $nowparentdir);
- }
- else
- {
+ } else {
//只匹配PHP文件
- if (!preg_match('/^(\w+)\.php$/', $v, $matchone))
- {
+ if (!preg_match('/^(\w+)\.php$/', $v, $matchone)) {
continue;
}
//导入文件
@@ -177,8 +168,7 @@ class Menu extends Command
//反射机制调用类的注释和方法名
$reflector = new ReflectionClass($className);
- if (isset($tempClassFile))
- {
+ if (isset($tempClassFile)) {
//删除临时文件
@unlink($tempClassFile);
}
@@ -190,34 +180,27 @@ class Menu extends Command
$softDeleteMethods = ['destroy', 'restore', 'recyclebin'];
$withSofeDelete = false;
preg_match_all("/\\\$this\->model\s*=\s*model\('(\w+)'\);/", $classContent, $matches);
- if (isset($matches[1]) && isset($matches[1][0]) && $matches[1][0])
- {
+ if (isset($matches[1]) && isset($matches[1][0]) && $matches[1][0]) {
\think\Request::instance()->module('admin');
$model = model($matches[1][0]);
- if (in_array('trashed', get_class_methods($model)))
- {
+ if (in_array('trashed', get_class_methods($model))) {
$withSofeDelete = true;
}
}
//忽略的类
- if (stripos($classComment, "@internal") !== FALSE)
- {
+ if (stripos($classComment, "@internal") !== FALSE) {
return;
}
preg_match_all('#(@.*?)\n#s', $classComment, $annotations);
$controllerIcon = 'fa fa-circle-o';
$controllerRemark = '';
//判断注释中是否设置了icon值
- if (isset($annotations[1]))
- {
- foreach ($annotations[1] as $tag)
- {
- if (stripos($tag, '@icon') !== FALSE)
- {
+ if (isset($annotations[1])) {
+ foreach ($annotations[1] as $tag) {
+ if (stripos($tag, '@icon') !== FALSE) {
$controllerIcon = substr($tag, stripos($tag, ' ') + 1);
}
- if (stripos($tag, '@remark') !== FALSE)
- {
+ if (stripos($tag, '@remark') !== FALSE) {
$controllerRemark = substr($tag, stripos($tag, ' ') + 1);
}
}
@@ -230,8 +213,7 @@ class Menu extends Command
//先导入菜单的数据
$pid = 0;
- foreach ($controllerArr as $k => $v)
- {
+ foreach ($controllerArr as $k => $v) {
$key = $k + 1;
$name = strtolower(implode('/', array_slice($controllerArr, 0, $key)));
$title = (!isset($controllerArr[$key]) ? $controllerTitle : '');
@@ -239,42 +221,34 @@ class Menu extends Command
$remark = (!isset($controllerArr[$key]) ? $controllerRemark : '');
$title = $title ? $title : $v;
$rulemodel = $this->model->get(['name' => $name]);
- if (!$rulemodel)
- {
+ if (!$rulemodel) {
$this->model
- ->data(['pid' => $pid, 'name' => $name, 'title' => $title, 'icon' => $icon, 'remark' => $remark, 'ismenu' => 1, 'status' => 'normal'])
- ->isUpdate(false)
- ->save();
+ ->data(['pid' => $pid, 'name' => $name, 'title' => $title, 'icon' => $icon, 'remark' => $remark, 'ismenu' => 1, 'status' => 'normal'])
+ ->isUpdate(false)
+ ->save();
$pid = $this->model->id;
- }
- else
- {
+ } else {
$pid = $rulemodel->id;
}
}
$ruleArr = [];
- foreach ($methods as $m => $n)
- {
+ foreach ($methods as $m => $n) {
//过滤特殊的类
- if (substr($n->name, 0, 2) == '__' || $n->name == '_initialize')
- {
+ if (substr($n->name, 0, 2) == '__' || $n->name == '_initialize') {
continue;
}
//未启用软删除时过滤相关方法
- if (!$withSofeDelete && in_array($n->name, $softDeleteMethods))
- {
+ if (!$withSofeDelete && in_array($n->name, $softDeleteMethods)) {
continue;
}
//只匹配符合的方法
- if (!preg_match('/^(\w+)' . Config::get('action_suffix') . '/', $n->name, $matchtwo))
- {
+ if (!preg_match('/^(\w+)' . Config::get('action_suffix') . '/', $n->name, $matchtwo)) {
unset($methods[$m]);
continue;
}
$comment = $reflector->getMethod($n->name)->getDocComment();
//忽略的方法
- if (stripos($comment, "@internal") !== FALSE)
- {
+ if (stripos($comment, "@internal") !== FALSE) {
continue;
}
//过滤掉其它字符
@@ -293,11 +267,10 @@ class Menu extends Command
//获取主键
protected function getAuthRulePK($name)
{
- if (!empty($name))
- {
+ if (!empty($name)) {
$id = $this->model
- ->where('name', $name)
- ->value('id');
+ ->where('name', $name)
+ ->value('id');
return $id ? $id : null;
}
}
diff --git a/application/admin/common.php b/application/admin/common.php
old mode 100644
new mode 100755
index ec2661a7..2b61dde6
--- a/application/admin/common.php
+++ b/application/admin/common.php
@@ -5,149 +5,159 @@ use fast\Form;
use fast\Tree;
use think\Db;
-/**
- * 生成下拉列表
- * @param string $name
- * @param mixed $options
- * @param mixed $selected
- * @param mixed $attr
- * @return string
- */
-function build_select($name, $options, $selected = [], $attr = [])
-{
- $options = is_array($options) ? $options : explode(',', $options);
- $selected = is_array($selected) ? $selected : explode(',', $selected);
- return Form::select($name, $options, $selected, $attr);
+if (!function_exists('build_select')) {
+
+ /**
+ * 生成下拉列表
+ * @param string $name
+ * @param mixed $options
+ * @param mixed $selected
+ * @param mixed $attr
+ * @return string
+ */
+ function build_select($name, $options, $selected = [], $attr = [])
+ {
+ $options = is_array($options) ? $options : explode(',', $options);
+ $selected = is_array($selected) ? $selected : explode(',', $selected);
+ return Form::select($name, $options, $selected, $attr);
+ }
}
-/**
- * 生成单选按钮组
- * @param string $name
- * @param array $list
- * @param mixed $selected
- * @return string
- */
-function build_radios($name, $list = [], $selected = null)
-{
- $html = [];
- $selected = is_null($selected) ? key($list) : $selected;
- $selected = is_array($selected) ? $selected : explode(',', $selected);
- foreach ($list as $k => $v)
- {
- $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::radio($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
- }
- return '
diff --git a/application/common/lang/zh-cn/addon.php b/application/common/lang/zh-cn/addon.php
old mode 100644
new mode 100755
index 6b777137..a33b83ba
--- a/application/common/lang/zh-cn/addon.php
+++ b/application/common/lang/zh-cn/addon.php
@@ -85,6 +85,8 @@ return [
'Donation' => '捐赠',
'Forum' => '社区',
'Docs' => '文档',
+ 'Go back' => '返回首页',
+ 'Jump now' => '立即跳转',
'Please login first' => '请登录后再操作',
'Send verification code' => '发送验证码',
'Redirect now' => '立即跳转',
diff --git a/application/common/view/tpl/dispatch_jump.tpl b/application/common/view/tpl/dispatch_jump.tpl
old mode 100644
new mode 100755
index 5869a6df..c6b3878d
--- a/application/common/view/tpl/dispatch_jump.tpl
+++ b/application/common/view/tpl/dispatch_jump.tpl
@@ -2,7 +2,7 @@
- 跳转提示
+ {:__('Warning')}
-
' . implode(' ', $html) . '
';
-}
+if (!function_exists('build_radios')) {
-/**
- * 生成复选按钮组
- * @param string $name
- * @param array $list
- * @param mixed $selected
- * @return string
- */
-function build_checkboxs($name, $list = [], $selected = null)
-{
- $html = [];
- $selected = is_null($selected) ? [] : $selected;
- $selected = is_array($selected) ? $selected : explode(',', $selected);
- foreach ($list as $k => $v)
+ /**
+ * 生成单选按钮组
+ * @param string $name
+ * @param array $list
+ * @param mixed $selected
+ * @return string
+ */
+ function build_radios($name, $list = [], $selected = null)
{
- $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::checkbox($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
- }
- return '' . implode(' ', $html) . '
';
-}
-
-/**
- * 生成分类下拉列表框
- * @param string $name
- * @param string $type
- * @param mixed $selected
- * @param array $attr
- * @return string
- */
-function build_category_select($name, $type, $selected = null, $attr = [], $header = [])
-{
- $tree = Tree::instance();
- $tree->init(Category::getCategoryArray($type), 'pid');
- $categorylist = $tree->getTreeList($tree->getTreeArray(0), 'name');
- $categorydata = $header ? $header : [];
- foreach ($categorylist as $k => $v)
- {
- $categorydata[$v['id']] = $v['name'];
- }
- $attr = array_merge(['id' => "c-{$name}", 'class' => 'form-control selectpicker'], $attr);
- return build_select($name, $categorydata, $selected, $attr);
-}
-
-/**
- * 生成表格操作按钮栏
- * @param array $btns 按钮组
- * @param array $attr 按钮属性值
- * @return string
- */
-function build_toolbar($btns = NULL, $attr = [])
-{
- $auth = \app\admin\library\Auth::instance();
- $controller = str_replace('.', '/', strtolower(think\Request::instance()->controller()));
- $btns = $btns ? $btns : ['refresh', 'add', 'edit', 'del', 'import'];
- $btns = is_array($btns) ? $btns : explode(',', $btns);
- $index = array_search('delete', $btns);
- if ($index !== FALSE)
- {
- $btns[$index] = 'del';
- }
- $btnAttr = [
- 'refresh' => ['javascript:;', 'btn btn-primary btn-refresh', 'fa fa-refresh', '', __('Refresh')],
- 'add' => ['javascript:;', 'btn btn-success btn-add', 'fa fa-plus', __('Add'), __('Add')],
- 'edit' => ['javascript:;', 'btn btn-success btn-edit btn-disabled disabled', 'fa fa-pencil', __('Edit'), __('Edit')],
- 'del' => ['javascript:;', 'btn btn-danger btn-del btn-disabled disabled', 'fa fa-trash', __('Delete'), __('Delete')],
- 'import' => ['javascript:;', 'btn btn-danger btn-import', 'fa fa-upload', __('Import'), __('Import')],
- ];
- $btnAttr = array_merge($btnAttr, $attr);
- $html = [];
- foreach ($btns as $k => $v)
- {
- //如果未定义或没有权限
- if (!isset($btnAttr[$v]) || ($v !== 'refresh' && !$auth->check("{$controller}/{$v}")))
- {
- continue;
+ $html = [];
+ $selected = is_null($selected) ? key($list) : $selected;
+ $selected = is_array($selected) ? $selected : explode(',', $selected);
+ foreach ($list as $k => $v) {
+ $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::radio($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
}
- list($href, $class, $icon, $text, $title) = $btnAttr[$v];
- $extend = $v == 'import' ? 'id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"' : '';
- $html[] = ' ' . $text . '';
+ return '' . implode(' ', $html) . '
';
}
- return implode(' ', $html);
}
-/**
- * 生成页面Heading
- *
- * @param string $path 指定的path
- * @return string
- */
-function build_heading($path = NULL, $container = TRUE)
-{
- $title = $content = '';
- if (is_null($path))
+if (!function_exists('build_checkboxs')) {
+
+ /**
+ * 生成复选按钮组
+ * @param string $name
+ * @param array $list
+ * @param mixed $selected
+ * @return string
+ */
+ function build_checkboxs($name, $list = [], $selected = null)
{
- $action = request()->action();
- $controller = str_replace('.', '/', request()->controller());
- $path = strtolower($controller . ($action && $action != 'index' ? '/' . $action : ''));
+ $html = [];
+ $selected = is_null($selected) ? [] : $selected;
+ $selected = is_array($selected) ? $selected : explode(',', $selected);
+ foreach ($list as $k => $v) {
+ $html[] = sprintf(Form::label("{$name}-{$k}", "%s {$v}"), Form::checkbox($name, $k, in_array($k, $selected), ['id' => "{$name}-{$k}"]));
+ }
+ return '' . implode(' ', $html) . '
';
+ }
+}
+
+
+if (!function_exists('build_category_select')) {
+
+ /**
+ * 生成分类下拉列表框
+ * @param string $name
+ * @param string $type
+ * @param mixed $selected
+ * @param array $attr
+ * @return string
+ */
+ function build_category_select($name, $type, $selected = null, $attr = [], $header = [])
+ {
+ $tree = Tree::instance();
+ $tree->init(Category::getCategoryArray($type), 'pid');
+ $categorylist = $tree->getTreeList($tree->getTreeArray(0), 'name');
+ $categorydata = $header ? $header : [];
+ foreach ($categorylist as $k => $v) {
+ $categorydata[$v['id']] = $v['name'];
+ }
+ $attr = array_merge(['id' => "c-{$name}", 'class' => 'form-control selectpicker'], $attr);
+ return build_select($name, $categorydata, $selected, $attr);
+ }
+}
+
+if (!function_exists('build_toolbar')) {
+
+ /**
+ * 生成表格操作按钮栏
+ * @param array $btns 按钮组
+ * @param array $attr 按钮属性值
+ * @return string
+ */
+ function build_toolbar($btns = NULL, $attr = [])
+ {
+ $auth = \app\admin\library\Auth::instance();
+ $controller = str_replace('.', '/', strtolower(think\Request::instance()->controller()));
+ $btns = $btns ? $btns : ['refresh', 'add', 'edit', 'del', 'import'];
+ $btns = is_array($btns) ? $btns : explode(',', $btns);
+ $index = array_search('delete', $btns);
+ if ($index !== FALSE) {
+ $btns[$index] = 'del';
+ }
+ $btnAttr = [
+ 'refresh' => ['javascript:;', 'btn btn-primary btn-refresh', 'fa fa-refresh', '', __('Refresh')],
+ 'add' => ['javascript:;', 'btn btn-success btn-add', 'fa fa-plus', __('Add'), __('Add')],
+ 'edit' => ['javascript:;', 'btn btn-success btn-edit btn-disabled disabled', 'fa fa-pencil', __('Edit'), __('Edit')],
+ 'del' => ['javascript:;', 'btn btn-danger btn-del btn-disabled disabled', 'fa fa-trash', __('Delete'), __('Delete')],
+ 'import' => ['javascript:;', 'btn btn-danger btn-import', 'fa fa-upload', __('Import'), __('Import')],
+ ];
+ $btnAttr = array_merge($btnAttr, $attr);
+ $html = [];
+ foreach ($btns as $k => $v) {
+ //如果未定义或没有权限
+ if (!isset($btnAttr[$v]) || ($v !== 'refresh' && !$auth->check("{$controller}/{$v}"))) {
+ continue;
+ }
+ list($href, $class, $icon, $text, $title) = $btnAttr[$v];
+ $extend = $v == 'import' ? 'id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"' : '';
+ $html[] = ' ' . $text . '';
+ }
+ return implode(' ', $html);
+ }
+}
+
+if (!function_exists('build_heading')) {
+
+ /**
+ * 生成页面Heading
+ *
+ * @param string $path 指定的path
+ * @return string
+ */
+ function build_heading($path = NULL, $container = TRUE)
+ {
+ $title = $content = '';
+ if (is_null($path)) {
+ $action = request()->action();
+ $controller = str_replace('.', '/', request()->controller());
+ $path = strtolower($controller . ($action && $action != 'index' ? '/' . $action : ''));
+ }
+ // 根据当前的URI自动匹配父节点的标题和备注
+ $data = Db::name('auth_rule')->where('name', $path)->field('title,remark')->find();
+ if ($data) {
+ $title = __($data['title']);
+ $content = __($data['remark']);
+ }
+ if (!$content)
+ return '';
+ $result = '' . $title . '' . $content . '
';
+ if ($container) {
+ $result = '' . $result . '
';
+ }
+ return $result;
}
- // 根据当前的URI自动匹配父节点的标题和备注
- $data = Db::name('auth_rule')->where('name', $path)->field('title,remark')->find();
- if ($data)
- {
- $title = __($data['title']);
- $content = __($data['remark']);
- }
- if (!$content)
- return '';
- $result = '' . $title . '' . $content . '
';
- if ($container)
- {
- $result = '' . $result . '
';
- }
- return $result;
}
diff --git a/application/admin/lang/zh-cn.php b/application/admin/lang/zh-cn.php
old mode 100644
new mode 100755
index 791143b8..2f0c4c11
--- a/application/admin/lang/zh-cn.php
+++ b/application/admin/lang/zh-cn.php
@@ -113,6 +113,8 @@ return [
'Set to normal' => '设为正常',
'Set to hidden' => '设为隐藏',
//提示
+ 'Go back' => '返回首页',
+ 'Jump now' => '立即跳转',
'Operation completed' => '操作成功!',
'Operation failed' => '操作失败!',
'Unknown data format' => '未知的数据格式!',
diff --git a/application/admin/lang/zh-cn/addon.php b/application/admin/lang/zh-cn/addon.php
old mode 100644
new mode 100755
index 3fb633b0..c00f1527
--- a/application/admin/lang/zh-cn/addon.php
+++ b/application/admin/lang/zh-cn/addon.php
@@ -23,7 +23,7 @@ return [
'Pay new window tips' => '请在新弹出的窗口中进行支付，支付完成后再重新点击安装按钮进行安装！',
'Uninstall tips' => '确认卸载插件？卸载将会删除所有插件文件且不可找回!!! 插件如果有创建数据库表请手动删除!!!
如有重要数据请备份后再操作！', 'Upgrade tips' => '确认升级插件？如果之前购买插件时未登录，此次升级可能出现购买后才可以下载的提示!!!
升级后可能出现部分冗余数据记录,请根据需要移除即可!!!
+ {php}$codeText=$code == 1 ? 'success' : ($code == 0 ? 'error' : 'info');{/php}
+
- ;?>.svg)
+ 
-
+
+
{$msg}
- 页面将在 秒后自动跳转 + {:__('This page will be re-directed in %s seconds', '' . $wait . '')}
- 返回上一步 - 立即跳转 + {:__('Go back')} + {:__('Jump now')}
@@ -45,12 +46,11 @@