From de8ea27542fd9c7317af634de1d72acbbeb0d336 Mon Sep 17 00:00:00 2001 From: Karson Date: Sat, 26 May 2018 22:27:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E9=92=AEvisible?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=E4=BF=AE=E5=A4=8Dcommonsearch=E4=B8=AD?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=85=8D=E7=BD=AE=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E6=95=B0=E6=8D=AE=E5=BA=93=E5=9C=A8=E5=90=AF?= =?UTF-8?q?=E7=94=A8=E4=B8=A5=E6=A0=BC=E6=A8=A1=E5=BC=8F=E4=B8=8B=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=AF=BC=E5=85=A5=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/command/Install/fastadmin.sql | 24 +++++++++---------- application/admin/view/index/login.html | 1 + application/index/view/index/index.html | 3 ++- application/index/view/layout/common.html | 3 ++- application/index/view/layout/default.html | 3 ++- .../assets/js/bootstrap-table-commonsearch.js | 4 ++-- public/assets/js/require-backend.min.js | 14 ++++++----- public/assets/js/require-table.js | 6 ++++- 8 files changed, 34 insertions(+), 24 deletions(-) diff --git a/application/admin/command/Install/fastadmin.sql b/application/admin/command/Install/fastadmin.sql index e2b048e2..91bce689 100755 --- a/application/admin/command/Install/fastadmin.sql +++ b/application/admin/command/Install/fastadmin.sql @@ -4,7 +4,7 @@ 官网: https://www.fastadmin.net 演示: https://demo.fastadmin.net - Date: 2018年03月07日 + Date: 2018年05月26日 */ SET FOREIGN_KEY_CHECKS = 0; @@ -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=1 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='管理员日志表'; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='管理员日志表'; -- ---------------------------- -- Table structure for fa_attachment @@ -82,7 +82,7 @@ CREATE TABLE `fa_attachment` ( `storage` varchar(100) NOT NULL DEFAULT 'local' COMMENT '存储位置', `sha1` varchar(40) NOT NULL DEFAULT '' COMMENT '文件 sha1编码', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='附件表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='附件表'; -- ---------------------------- -- Records of fa_attachment @@ -104,7 +104,7 @@ CREATE TABLE `fa_auth_group` ( `updatetime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '更新时间', `status` varchar(30) NOT NULL DEFAULT '' COMMENT '状态', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COMMENT='分组表'; +) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='分组表'; -- ---------------------------- -- Records of fa_auth_group @@ -127,7 +127,7 @@ CREATE TABLE `fa_auth_group_access` ( UNIQUE KEY `uid_group_id` (`uid`,`group_id`), KEY `uid` (`uid`), KEY `group_id` (`group_id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='权限分组表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='权限分组表'; -- ---------------------------- -- Records of fa_auth_group_access @@ -276,7 +276,7 @@ CREATE TABLE `fa_category` ( PRIMARY KEY (`id`), KEY `weigh` (`weigh`,`id`), KEY `pid` (`pid`) -) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='分类表'; +) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='分类表'; -- ---------------------------- -- Records of fa_category @@ -314,7 +314,7 @@ CREATE TABLE `fa_config` ( `extend` varchar(255) NOT NULL DEFAULT '' COMMENT '扩展属性', PRIMARY KEY (`id`), UNIQUE KEY `name` (`name`) -) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 COMMENT='系统配置'; +) ENGINE=InnoDB AUTO_INCREMENT=18 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='系统配置'; -- ---------------------------- -- Records of fa_config @@ -470,7 +470,7 @@ CREATE TABLE `fa_user_group` ( `updatetime` int(10) DEFAULT NULL COMMENT '更新时间', `status` enum('normal','hidden') DEFAULT NULL COMMENT '状态', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='会员组表'; +) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='会员组表'; -- ---------------------------- -- Records of fa_user_group @@ -495,7 +495,7 @@ CREATE TABLE `fa_user_rule` ( `weigh` int(10) DEFAULT '0' COMMENT '权重', `status` enum('normal','hidden') DEFAULT NULL COMMENT '状态', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COMMENT='会员规则表'; +) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='会员规则表'; -- ---------------------------- -- Records of fa_user_rule @@ -528,7 +528,7 @@ CREATE TABLE `fa_user_score_log` ( `memo` varchar(255) NOT NULL DEFAULT '' COMMENT '备注', `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 COMMENT='会员积分变动表'; +) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='会员积分变动表'; -- ---------------------------- -- Table structure for fa_user_token @@ -540,7 +540,7 @@ CREATE TABLE `fa_user_token` ( `createtime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '创建时间', `expiretime` int(10) unsigned NOT NULL DEFAULT '0' COMMENT '过期时间', PRIMARY KEY (`token`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='会员Token表'; +) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='会员Token表'; -- ---------------------------- -- Table structure for fa_version @@ -559,7 +559,7 @@ CREATE TABLE `fa_version` ( `weigh` int(10) NOT NULL DEFAULT 0 COMMENT '权重', `status` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '状态', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '版本表' ROW_FORMAT = Compact; +) ENGINE = InnoDB AUTO_INCREMENT = 1 DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT = '版本表'; -- ---------------------------- -- Table structure for fa_version diff --git a/application/admin/view/index/login.html b/application/admin/view/index/login.html index 439dec8c..1421375e 100644 --- a/application/admin/view/index/login.html +++ b/application/admin/view/index/login.html @@ -97,6 +97,7 @@ + diff --git a/application/index/view/index/index.html b/application/index/view/index/index.html index 0ff5b96d..e7dd9314 100755 --- a/application/index/view/index/index.html +++ b/application/index/view/index/index.html @@ -145,7 +145,8 @@