ulthon/ulthon_admin
1
0
Fork 0
mirror of https://gitee.com/ulthon/ulthon_admin.git synced 2026-07-08 02:52:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

number_limit增加默认参数；发布新版本

Browse Source
This commit is contained in:
augushong
2023-12-08 16:26:17 +08:00
parent 69a090f6e0
commit a337900077
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extend/base/common/command/admin/VersionBase.php
View File

@@ -12,12 +12,12 @@ use think\console\Output;
class VersionBase extends Command class VersionBase extends Command
{ {
public const VERSION = 'v2.0.77'; public const VERSION = 'v2.0.78';
public const LAYUI_VERSION = '2.8.17'; public const LAYUI_VERSION = '2.8.17';
public const COMMENT = [ public const COMMENT = [
'修复更新逻辑创建目录', 'number_limit增加默认参数',
'发布新版本', '发布新版本',
]; ];

25
public/static/plugs/ulthon-admin/ulthon-admin.js
View File

@@ -34,7 +34,7 @@
tableRenderId: 'currentTableRenderId', tableRenderId: 'currentTableRenderId',
uploadUrl: 'ajax/upload', uploadUrl: 'ajax/upload',
uploadExts: '', uploadExts: '',
extGroup:{} extGroup: {}
}; };
var table; var table;
@@ -79,7 +79,7 @@
} }
} }
extGroup['office'] = [].concat(extGroup['word'], extGroup['excel'], extGroup['ppt'], extGroup['pdf']); extGroup['office'] = [].concat(extGroup['word'], extGroup['excel'], extGroup['ppt'], extGroup['pdf']);
extGroup['media'] = [].concat(extGroup['image'], extGroup['music'], extGroup['video']); extGroup['media'] = [].concat(extGroup['image'], extGroup['music'], extGroup['video']);
@@ -512,8 +512,25 @@
d.searchValue = d.defaultSearchValue; d.searchValue = d.defaultSearchValue;
} }
formatFilter[d.field] = d.defaultSearchValue; if (d.search == 'number_limit') {
formatOp[d.field] = d.searchOp; var a = '';
var b = '';
if (d.searchValue) {
var paramsArr = d.searchValue.split(',');
a = paramsArr[0];
b = paramsArr[1];
}
formatFilter['[' + d.field + ']min'] = a;
formatOp['[' + d.field + ']min'] = 'min';
formatFilter['[' + d.field + ']max'] = b;
formatOp['[' + d.field + ']max'] = 'max';
} else {
formatFilter[d.field] = d.defaultSearchValue;
formatOp[d.field] = d.searchOp;
}
} }