Commit a17e01dd authored by zengchao's avatar zengchao
Browse files

-

parent a30f21ad
package com.ibeetl.admin.core.conf; package com.ibeetl.admin.core.conf;
import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.CharsetUtil;
import cn.hutool.setting.SettingUtil;
import cn.hutool.setting.dialect.Props;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.ibeetl.admin.core.conf.handler.DateTypeHandler; import com.ibeetl.admin.core.conf.handler.DateTypeHandler;
import com.ibeetl.admin.core.conf.handler.ZonedDateTimeTypeHandler; import com.ibeetl.admin.core.conf.handler.ZonedDateTimeTypeHandler;
...@@ -25,7 +23,6 @@ import com.ibeetl.admin.core.web.query.QueryParser; ...@@ -25,7 +23,6 @@ import com.ibeetl.admin.core.web.query.QueryParser;
import com.ibeetl.starter.BeetlSqlMutipleSourceCustomize; import com.ibeetl.starter.BeetlSqlMutipleSourceCustomize;
import com.ibeetl.starter.BeetlTemplateCustomize; import com.ibeetl.starter.BeetlTemplateCustomize;
import com.ibeetl.starter.ObjectMapperJsonUtil; import com.ibeetl.starter.ObjectMapperJsonUtil;
import java.io.File;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.Date; import java.util.Date;
...@@ -112,9 +109,10 @@ public class BeetlConf { ...@@ -112,9 +109,10 @@ public class BeetlConf {
} }
/** /**
* Beetl模板引擎的自定义配置 * Beetl模板引擎的自定义配置
* @return *
* */ * @return
*/
@Bean @Bean
public BeetlTemplateCustomize beetlTemplateCustomize() { public BeetlTemplateCustomize beetlTemplateCustomize() {
return groupTemplate -> { return groupTemplate -> {
...@@ -183,6 +181,7 @@ public class BeetlConf { ...@@ -183,6 +181,7 @@ public class BeetlConf {
/** /**
* 将内置生成的SQL排除打印 * 将内置生成的SQL排除打印
*
* @param sqlId * @param sqlId
* @return * @return
*/ */
...@@ -197,7 +196,7 @@ public class BeetlConf { ...@@ -197,7 +196,7 @@ public class BeetlConf {
@Override @Override
protected void println(String str) { protected void println(String str) {
logger.info(System.lineSeparator()+str); logger.info(System.lineSeparator() + str);
} }
} }
} }
<!-- <!--
* @Author: ??????? * @Author: ???????
* @since: 2019-09-09 12:16:29 * @since: 2019-09-09 12:16:29
* @LastEditTime: 2019-10-12 17:10:36 * @LastEditTime: 2019-10-14 16:02:48
* @LastEditors: ??????? * @LastEditors: ???????
* @Description: * @Description:
--> -->
...@@ -438,7 +438,7 @@ export default { ...@@ -438,7 +438,7 @@ export default {
}, },
handleModifyStatus(row, status) { handleModifyStatus(row, status) {
this.$message({ this.$message({
message: '操作Success', message: 'Modify Success',
type: 'success' type: 'success'
}); });
row.status = status; row.status = status;
...@@ -574,13 +574,14 @@ export default { ...@@ -574,13 +574,14 @@ export default {
}) })
); );
}, },
/* eslint-disable indent */
getSortClass: function(key) { getSortClass: function(key) {
const sort = this.listQuery.sort; const sort = this.listQuery.sort;
return sort === `+${key}` return sort === `+${key}`
? 'ascending' ? 'ascending'
: sort === `-${key}` : sort === `-${key}`
? 'descending' ? 'descending'
: ''; : '';
} }
} }
}; };
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment