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

更新底层layui；修改time字段默认宽度；修改底层js；发布新版本

Browse Source
This commit is contained in:
augushong
2023-09-26 13:59:34 +08:00
parent ee28d35a1e
commit b1926664c5
16 changed files with 25 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extend/base/admin/view/common/_require.html
View File

@@ -9,7 +9,7 @@
<!-- 基础js -->
<script src="__STATIC__/plugs/jquery-3.4.1/jquery-3.4.1.min.js"></script>
<script src="__STATIC__/common/js/app.js"></script>
<script src="__STATIC__/plugs/layui-v2.8.16/layui.js" charset="utf-8"></script>
<script src="__STATIC__/plugs/layui-v2.8.17/layui.js" charset="utf-8"></script>
<!-- 其他js -->
<script src="__STATIC__/plugs/jq-module/jquery.particleground.min.js"></script>

2
extend/base/admin/view/system/uploadfile/index.js
View File

@@ -6,7 +6,7 @@ $(function () {
{ type: "checkbox" },
{ field: 'id', width: 80, title: 'ID' },
{ field: 'upload_type', minWidth: 80, title: '存储位置', search: 'select', selectList: { 'local': '本地', 'alioss': '阿里云', 'qnoss': '七牛云', ',txcos': '腾讯云' } },
{ field: 'url', minWidth: 80, search: false, title: '文件预览', templet: ua.table.filePreview },
{ field: 'url', minWidth: 80, search: false, title: '文件预览', templet: ua.table.filePreview, },
{
field: 'url', minWidth: 120, title: '保存地址', templet: ua.table.url, urlNameField: function (data) {
return data.url;

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

@@ -12,23 +12,19 @@ use think\console\Output;
class VersionBase extends Command
{
public const VERSION = 'v2.0.47';
public const VERSION = 'v2.0.48';
public const LAYUI_VERSION = '2.8.16';
public const LAYUI_VERSION = '2.8.17';
public const COMMENT = [
'将topthink/think-template引入到框架内；',
'增加fetch和include的文件目录的@和@/开头的定位方法',
'将fetch方法改为return的模式',
'更新底层layui',
'修改time字段默认宽度',
'修改底层js',
'发布新版本',
];
public const UPDATE_TIPS = [
'本次调整了composer依赖，应按照新的composer 调整',
'删除 topthink/think-template',
'引入 psr/simple-cache>=1.0',
'然后重新执行更新命令，删除后会自动初始化新的代码',
'',
];
protected function configure()

3
public/static/admin/css/public.css
View File

@@ -1,4 +1,4 @@
@import url("../../plugs/layui-v2.8.16/css/layui.css");
@import url("../../plugs/layui-v2.8.17/css/layui.css");
@import url("../../plugs/font-awesome-4.7.0/css/font-awesome.min.css");
@import url("../css/iconfont.css");
@import url('../../plugs/jq-module/city-picker/css/city-picker.css');
@@ -75,7 +75,6 @@ body {
/**重写layui表格自适应*/
.layuimini-container .layui-table-cell {
height: 100%;
max-width: 100%;
}

46
public/static/config-admin.js
View File

@@ -1,46 +0,0 @@
var BASE_URL = document.scripts[document.scripts.length - 1].src.substring(0, document.scripts[document.scripts.length - 1].src.lastIndexOf("/") + 1);
window.BASE_URL = BASE_URL;
require.config({
urlArgs: "v=" + CONFIG.VERSION,
baseUrl: BASE_URL,
paths: {
"jquery": ["plugs/jquery-3.4.1/jquery-3.4.1.min"],
"jquery-particleground": ["plugs/jq-module/jquery.particleground.min"],
"echarts": ["plugs/echarts/echarts.min"],
"echarts-theme": ["plugs/echarts/echarts-theme"],
"easy-admin": ["plugs/easy-admin/easy-admin"],
"layui": ["plugs/layui-v2.8.16/layui"],
"miniAdmin": ["plugs/lay-module/layuimini/miniAdmin"],
"miniMenu": ["plugs/lay-module/layuimini/miniMenu"],
"miniTab": ["plugs/lay-module/layuimini/miniTab"],
"miniTheme": ["plugs/lay-module/layuimini/miniTheme"],
"miniTongji": ["plugs/lay-module/layuimini/miniTongji"],
"treetable": ["plugs/lay-module/treetable-lay/treetable"],
"tableData": ["plugs/lay-module/tableData/tableData"],
"tagInput": ["plugs/lay-module/tagInput/tagInput"],
"propertyInput": ["plugs/lay-module/propertyInput/propertyInput"],
"iconPickerFa": ["plugs/lay-module/iconPicker/iconPickerFa"],
"autocomplete": ["plugs/lay-module/autocomplete/autocomplete"],
"vue": ["plugs/vue-2.6.10/vue.min"],
"ckeditor": ["plugs/ckeditor4/ckeditor"],
'citypicker': ['plugs/jq-module/city-picker/js/city-picker.min'],
'ChineseDistricts': ['plugs/jq-module/city-picker/js/city-picker.data.min'],
'clipboardjs': ['plugs/clipboard.js/clipboard.min'],
}
});
// 路径配置信息
var PATH_CONFIG = {
iconLess: BASE_URL + "plugs/font-awesome-4.7.0/less/variables.less",
};
window.PATH_CONFIG = PATH_CONFIG;
// 初始化控制器对应的JS自动加载
if ("undefined" != typeof CONFIG.AUTOLOAD_JS && CONFIG.AUTOLOAD_JS) {
require([BASE_URL + CONFIG.CONTROLLER_JS_PATH], function (Controller) {
if (eval('Controller.' + CONFIG.ACTION)) {
eval('Controller.' + CONFIG.ACTION + '()');
}
});
}

1
public/static/plugs/layui-v2.8.16/css/layui.css
View File

File diff suppressed because one or more lines are too long

1
public/static/plugs/layui-v2.8.16/layui.js
View File

File diff suppressed because one or more lines are too long

1
public/static/plugs/layui-v2.8.17/css/layui.css Normal file
View File

File diff suppressed because one or more lines are too long

0
public/static/plugs/layui-v2.8.16/font/iconfont.eot → public/static/plugs/layui-v2.8.17/font/iconfont.eot
View File

0
public/static/plugs/layui-v2.8.16/font/iconfont.svg → public/static/plugs/layui-v2.8.17/font/iconfont.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 322 KiB

After

Width:  |  Height:  |  Size: 322 KiB

0
public/static/plugs/layui-v2.8.16/font/iconfont.ttf → public/static/plugs/layui-v2.8.17/font/iconfont.ttf
View File

0
public/static/plugs/layui-v2.8.16/font/iconfont.woff → public/static/plugs/layui-v2.8.17/font/iconfont.woff
View File

0
public/static/plugs/layui-v2.8.16/font/iconfont.woff2 → public/static/plugs/layui-v2.8.17/font/iconfont.woff2
View File

1
public/static/plugs/layui-v2.8.17/layui.js Normal file
View File

File diff suppressed because one or more lines are too long

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

@@ -304,13 +304,7 @@
};
var tableFixedAutoHeight = function () {
$(".layui-table-main tr").each(function (index, val) {
$(".layui-table-fixed").each(function () {
$($(this).find(".layui-table-body tbody tr")[index]).height($(val).height());
});
});
};
var optionDone = function () { };
if (options.done != undefined) {
@@ -319,7 +313,6 @@
options.done = function () {
optionDone();
table2card();
tableFixedAutoHeight();
// 监听表格内的复制组件
admin.api.copyText('[lay-id=' + options.id + ']');
@@ -844,6 +837,12 @@
}
}
// if str end with _time
if (val.field && val.field.indexOf('_time') !== -1) {
cols[i][index]['minWidth'] = 160;
}
if (val.sort === undefined) {
cols[i][index]['sort'] = true;
@@ -875,7 +874,7 @@
// 判断是否初始化对齐方式
if (val.align === undefined) {
cols[i][index]['align'] = 'center';
cols[i][index]['align'] = 'left';
}
// 部分字段开启排序
@@ -886,7 +885,7 @@
// 初始化图片高度
if (val.templet === admin.table.image && val.imageHeight === undefined) {
cols[i][index]['imageHeight'] = 40;
cols[i][index]['imageHeight'] = 26;
cols[i][index]['sort'] = false;
}
@@ -1108,19 +1107,19 @@
image: function (data) {
var option = data.LAY_COL;
option.imageWidth = option.imageWidth || 200;
option.imageHeight = option.imageHeight || 40;
option.imageHeight = option.imageHeight || 26;
option.imageSplit = option.imageSplit || '|';
option.imageJoin = option.imageJoin || '<br>';
option.title = option.title || option.field;
var title = data[option.title];
var value = admin.table.returnColumnValue(data);
if (value === undefined || value === null) {
return '<img style="max-width: ' + option.imageWidth + 'px; height: ' + option.imageHeight + 'px;" src="' + value + '" data-image="' + title + '">';
return '<img style="max-width: ' + option.imageWidth + 'px; max-height: ' + option.imageHeight + 'px;" src="' + value + '" data-image="' + title + '">';
} else {
var values = value.split(option.imageSplit),
valuesHtml = [];
values.forEach((value, index) => {
valuesHtml.push('<img style="max-width: ' + option.imageWidth + 'px; height: ' + option.imageHeight + 'px;" src="' + value + '" data-image="' + title + '">');
valuesHtml.push('<img style="max-width: ' + option.imageWidth + 'px; max-height: ' + option.imageHeight + 'px;" src="' + value + '" data-image="' + title + '">');
});
return valuesHtml.join(option.imageJoin);
}

4
view/index/welcome.html
View File

@@ -10,8 +10,8 @@
<title>ulthon_admin | 一款基于ThinkPHP6.0和Layui的快速开发的后台管理框架系统</title>
<link rel="stylesheet" href="//layui.ulthon.com/cdn/layui-ul.css">
<link rel="stylesheet" href="__STATIC__/common/css/welcome.css?v={$version}">
<link rel="stylesheet" href="/static/plugs/layui-v2.8.16/css/layui.css">
<script src="/static/plugs/layui-v2.8.16/layui.js"></script>
<link rel="stylesheet" href="/static/plugs/layui-v2.8.17/css/layui.css">
<script src="/static/plugs/layui-v2.8.17/layui.js"></script>
</head>