hawind/gdoo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

重新组织前端文件打包方式

Browse Source
This commit is contained in:
hawind
2021-03-17 07:16:37 +08:00
parent cd3a44340e
commit bc79583fe7
40 changed files with 26690 additions and 6852 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Approach/Controllers/ApproachController.php
+1 -1
View File
@@ -37,7 +37,7 @@ class ApproachController extends WorkflowController
$cols['master_cash_amount']['cellRenderer'] = 'htmlCellRenderer';
$header['buttons'] = [
// ['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => $this->access['delete']],
['name' => '删除', 'icon' => 'fa-remove', 'action' => 'delete', 'display' => 0],
['name' => '导出', 'icon' => 'fa-share', 'action' => 'export', 'display' => 1],
];
app/Gdoo/Article/views/article/index.blade.php
+3
View File
@@ -1,12 +1,15 @@
<div class="gdoo-list-page" id="{{$header['master_table']}}-page">
<div class="gdoo-list panel">
<div class="gdoo-list-header">
<gdoo-grid-header :header="header" :grid="grid" :action="action" />
</div>
<div class='gdoo-list-grid'>
<div id="{{$header['master_table']}}-grid" class="ag-theme-balham"></div>
</div>
</div>
</div>
<script>
app/Gdoo/Customer/Controllers/CustomerClassController.php
+1 -1
View File
@@ -26,7 +26,7 @@ class CustomerClassController extends DefaultController
]);
$cols = $header['cols'];
$cols['sequence_sn']['hide'] = true;
$cols['seq_sn']['hide'] = true;
$cols['name']['hide'] = true;
$cols['actions']['options'] = [[
app/Gdoo/Customer/Controllers/RegionController.php
+1 -1
View File
@@ -25,7 +25,7 @@ class RegionController extends DefaultController
]);
$cols = $header['cols'];
$cols['sequence_sn']['hide'] = true;
$cols['seq_sn']['hide'] = true;
$cols['name']['hide'] = true;
unset($cols['checkbox']);
app/Gdoo/Customer/views/customer/dialog.blade.php
+19 -2
View File
@@ -92,8 +92,25 @@
id.push(row[sid]);
text.push(row.name);
});
$('#'+option.id).val(id.join(','));
$('#'+option.id+'_text').val(text.join(','));
/*
if (params.iframe_id) {
var iframe = window.frames['iframe_' + params.iframe_id];
if (iframe) {
var $option_id = $('#' + option.id, doc);
var $option_text = $('#'+option.id + '_text', doc);
}
} else {
var $option = $('#' + option.id);
var $option_text = $('#'+option.id + '_text');
}
*/
var $option = $('#' + option.id);
var $option_text = $('#'+option.id + '_text');
$option_id.val(id.join(','));
$option_text.val(text.join(','));
if (event.exist('onSelect')) {
return event.trigger('onSelect', multiple ? rows : rows[0]);
app/Gdoo/Index/Controllers/ApiController.php
+3 -1
View File
@@ -22,7 +22,9 @@ class ApiController extends Controller
$settings['realtime'] = not_empty(env('REALTIME_KEY'));
header('Content-type: text/javascript');
echo 'var settings = '. json_encode($settings, JSON_UNESCAPED_UNICODE);
$e[] = 'var settings = '. json_encode($settings, JSON_UNESCAPED_UNICODE);
$e[] = env("AGGRID_LICENSE");
echo join(";\n", $e).';';
exit;
}
app/Gdoo/Index/views/index/index.blade.php
+14 -5
View File
@@ -5,11 +5,19 @@
<title>{{$setting['title']}} - Powered By {{$setting['powered']}}</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=yes" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="stylesheet" href="{{mix('/assets/dist/index.min.css')}}" type="text/css" />
<script src="{{$public_url}}/common?v={{time()}}"></script>
<script src="{{mix('/assets/dist/index.min.js')}}"></script>
<script src="{{mix('/assets/dist/bundle.min.js')}}"></script>
<script src="{{$asset_url}}/vendor/layer/layer.js"></script>
<link href="{{mix('/assets/dist/vendor.min.css')}}" rel="stylesheet" type="text/css" />
<link href="{{mix('/assets/dist/gdoo.min.css')}}" rel="stylesheet" type="text/css" />
<link href="{{mix('/assets/dist/index.min.css')}}" rel="stylesheet" type="text/css" />
<script type="text/javascript" src="{{mix('/assets/dist/vendor.min.js')}}"></script>
<script type="text/javascript" src="{{$asset_url}}/vendor/layer/layer.js"></script>
<script type="text/javascript" src="{{$asset_url}}/vendor/datepicker/datepicker.js"></script>
<script type="text/javascript" src="{{$public_url}}/common?s={{time()}}"></script>
<script type="text/javascript" src="{{mix('/assets/dist/bundle.min.js')}}"></script>
<script type="text/javascript" src="{{mix('/assets/dist/index.min.js')}}"></script>
<script type="text/javascript" src="{{mix('/assets/dist/gdoo.min.js')}}"></script>
<style type="text/css">
@foreach($menus['children'] as $menu_id => $menu)
@@ -20,6 +28,7 @@
.side-nav .hover a.a{{$menu_id}} .icon .fa { color: {{$menu['color']}}; }
@endforeach
</style>
</head>
<body class="theme-{{auth()->user()->theme ?: 'lilac'}}">
app/Gdoo/Model/Controllers/BillController.php
+1 -1
View File
@@ -43,7 +43,7 @@ class BillController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/Model/Controllers/ModelController.php
+1 -1
View File
@@ -49,7 +49,7 @@ class ModelController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/Model/Controllers/ModuleController.php
+1 -1
View File
@@ -47,7 +47,7 @@ class ModuleController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/Model/Grid.php
+1 -1
View File
@@ -571,7 +571,7 @@ class Grid
'headerCheckboxSelection' => true,
];
$res['cols']['sequence_sn'] = [
$res['cols']['seq_sn'] = [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/Product/Controllers/CategoryController.php
+1 -1
View File
@@ -25,7 +25,7 @@ class CategoryController extends DefaultController
$cols = $header['cols'];
$cols['sequence_sn']['hide'] = true;
$cols['seq_sn']['hide'] = true;
$cols['name']['hide'] = true;
$cols['actions']['options'] = [[
app/Gdoo/System/Controllers/LogController.php
+1 -1
View File
@@ -45,7 +45,7 @@ class LogController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/System/Controllers/MailController.php
+1 -1
View File
@@ -47,7 +47,7 @@ class MailController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/System/Controllers/MenuController.php
+2 -2
View File
@@ -41,7 +41,7 @@ class MenuController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
@@ -126,7 +126,7 @@ class MenuController extends DefaultController
];
$cols = $header['cols'];
$cols['sequence_sn']['hide'] = true;
$cols['seq_sn']['hide'] = true;
$cols['text']['hide'] = true;
unset($cols['checkbox']);
$header['cols'] = $cols;
app/Gdoo/System/Controllers/OptionController.php
+1 -1
View File
@@ -44,7 +44,7 @@ class OptionController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/System/Controllers/SettingController.php
+1 -1
View File
@@ -47,7 +47,7 @@ class SettingController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/System/Controllers/SmsController.php
+1 -1
View File
@@ -46,7 +46,7 @@ class SmsController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/System/Controllers/SmsLogController.php
+1 -1
View File
@@ -44,7 +44,7 @@ class SmsLogController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/System/Controllers/WidgetController.php
+1 -1
View File
@@ -46,7 +46,7 @@ class WidgetController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/Workflow/Controllers/BillController.php
+1 -1
View File
@@ -49,7 +49,7 @@ class BillController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,
app/Gdoo/Workflow/Controllers/CategoryController.php
+1 -1
View File
@@ -41,7 +41,7 @@ class CategoryController extends DefaultController
'checkboxSelection' => true,
'headerCheckboxSelection' => true,
],
'sequence_sn' => [
'seq_sn' => [
'width' => 60,
'headerName' => '序号',
'suppressSizeToFit' => true,