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

app/Gdoo/Approach/Controllers/ApproachController.php

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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>
+    <link href="{{mix('/assets/dist/vendor.min.css')}}" rel="stylesheet" type="text/css" />
-    <script src="{{mix('/assets/dist/index.min.js')}}"></script>
+    <link href="{{mix('/assets/dist/gdoo.min.css')}}" rel="stylesheet" type="text/css" />
-    <script src="{{mix('/assets/dist/bundle.min.js')}}"></script>
+    <link href="{{mix('/assets/dist/index.min.css')}}" rel="stylesheet" type="text/css" />
-    <script src="{{$asset_url}}/vendor/layer/layer.js"></script>
+
+    <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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -41,7 +41,7 @@ class CategoryController extends DefaultController
                 'checkboxSelection' => true,
                 'headerCheckboxSelection' => true,
             ],
-            'sequence_sn' => [
+            'seq_sn' => [
                 'width' => 60,
                 'headerName' => '序号',
                 'suppressSizeToFit' => true,

package.json

@@ -19,7 +19,6 @@
         "vue-loader": "16.1.0"
     },
     "dependencies": {
-        "element-plus": "^1.0",
         "vue": "^3.0.5",
         "vuedraggable": "^4.0.1"
     }

public/assets/js/model.js

@@ -48,17 +48,17 @@
         var iframes = top.document.getElementsByTagName("iframe");
         for (var i=0; i < iframes.length; i++) {
             var iframe = iframes[i];
-            var igdoo = iframe.contentWindow.gdoo;
+            var $gdoo = iframe.contentWindow.gdoo;
             if (iframe.id == 'tab_iframe_dashboard') {
                 // 刷新首页全部部件
-                var widgets = Object.values(igdoo.widgets);
+                var widgets = Object.values($gdoo.widgets);
                 widgets.forEach(function(grid) {
                     grid.remoteData();
                 });
             } else {
                 // 刷新全部页面的相关grid
-                if (igdoo && igdoo.grids) {
+                if ($gdoo && $gdoo.grids) {
-                    var grids = igdoo.grids;
+                    var grids = $gdoo.grids;
                     if (grids[table]) {
                         grids[table].grid.remoteData();
                     }

public/assets/js/search.js

@@ -274,57 +274,6 @@
             e += '</div>';
             element[i].value.append($(e));
         }
-        self._product_category = function(i, query) {
-
-            var category = self.attr(i, 0);
-            var product  = self.attr(i, 1);
-
-            var category_id = category.value;
-            var product_id  = product.value;
-
-            element[i].value.append('<select name="'+category.name+'" id="'+category.id+'" class="form-control input-sm"></select>&nbsp;<select name="'+product.name+'" id="'+product.id+'" class="form-control input-sm"></select>');
-            
-            $.post(app.url('product/category/dialog', query), function(res) {
-                var option = '<option value=""> - </option>';
-                $.map(res.rows, function(row) {
-                    option += '<option value="'+row.id+'">' + row.layer_space + row.name + '</option>';
-                });
-                var e = $('#'+category.id).html(option);
-                if(category_id) {
-                    e.val(category_id);
-                }
-                _product(i);
-            });
-
-            self.on('change', '#'+category.id, function() {
-                category_id = this.value;
-                product_id  = 0;
-                _product(i);
-            });
-
-            function _product(i) {
-                var option = '<option value=""> - </option>';
-                if(category_id) {
-                    var q = {
-                        field_0: 'product.category_id',
-                        condition_0: 'eq',
-                        search_0: category_id,
-                        limit: 0
-                    };
-                    $.post(app.url('product/product/dialog', q), function(res) {
-                        $.map(res.data, function(row) {
-                            option += '<option value="'+row.id+'">'+row.text+'</option>';
-                        });
-                        var e = $('#'+product.id).html(option);
-                        if(product_id) {
-                            e.val(product_id);
-                        }
-                    });
-                } else {
-                    $('#'+product.id).html(option);
-                }
-            }
-        }
 
         var handle = {
             empty: function(i) {

public/assets/js/support.js

@@ -108,6 +108,12 @@ $(function() {
             query[k] = v;
         });
 
+        // 传递当前iframe
+        var iframe_id = getIframeName();
+        if (iframe_id) {
+            query.iframe_id = iframe_id;
+        }
+
         var option = gdoo.formKey(params);
         var event = gdoo.event.get(option.key);
         event.trigger('open', params, query);
@@ -239,7 +245,8 @@ $(function() {
 
     // 关闭layerFrame
     $document.on('click.frame.close', '[data-toggle="layer-frame-close"]', function() {
-        layerFrameClose();
+        var index = parent.layer.getFrameIndex(window.name);
+        parent.layer.close(index);
     });
 
     // 打开layerFrame
@@ -868,9 +875,9 @@ function ajaxSubmit(table, callback) {
     });
 }
 
-function layerFrameClose() {
+function getIframeName() {
-    var index = parent.layer.getFrameIndex(window.name);
+    var name = window.name;
-    parent.layer.close(index);
+    return name ? name.replace('iframe_', '') : '';
 }
 
 /**

public/mix-manifest.json

@@ -1,8 +1,9 @@
 {
-    "/assets/dist/bundle.min.js": "/assets/dist/bundle.min.js?id=66f13bad36bfa2e3ec52",
+    "/assets/dist/bundle.min.js": "/assets/dist/bundle.min.js?id=b46cb4305a863944f84c",
-    "/assets/dist/app.min.js": "/assets/dist/app.min.js?id=1298156573de42582abf",
+    "/assets/dist/vendor.min.js": "/assets/dist/vendor.min.js?id=29c59d13160c6607b4af",
-    "/assets/dist/app.min.css": "/assets/dist/app.min.css?id=079ac4e85bbcc7ba871f",
+    "/assets/dist/gdoo.min.js": "/assets/dist/gdoo.min.js?id=b40a40adf287e5ea02aa",
-    "/assets/vendor/ag-grid/ag-grid.min.css": "/assets/vendor/ag-grid/ag-grid.min.css?id=0e414057cb24126f35ae",
+    "/assets/dist/index.min.js": "/assets/dist/index.min.js?id=9f7be548e55d993be518",
-    "/assets/dist/index.min.js": "/assets/dist/index.min.js?id=0b5199e460c9072a6bee",
+    "/assets/dist/vendor.min.css": "/assets/dist/vendor.min.css?id=99a58728a17257718260",
-    "/assets/dist/index.min.css": "/assets/dist/index.min.css?id=41b06417831d9328ede1"
+    "/assets/dist/gdoo.min.css": "/assets/dist/gdoo.min.css?id=3817f9870ed3748aba46",
+    "/assets/dist/index.min.css": "/assets/dist/index.min.css?id=ccde8d73c536940b91d9"
 }

resources/views/layouts/header.blade.php

@@ -5,20 +5,16 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>{{$setting['title']}} - Powered By {{$setting['powered']}}</title>
-    <link href="{{$asset_url}}/vendor/ag-grid/ag-grid.min.css" rel="stylesheet" type="text/css" />
-    <link href="{{mix('/assets/dist/app.min.css')}}" rel="stylesheet" type="text/css" />
 
-    <script type="text/javascript" src="{{$public_url}}/common?v={{time()}}"></script>
+    <link href="{{mix('/assets/dist/vendor.min.css')}}" rel="stylesheet" type="text/css" />
-    <script type="text/javascript" src="{{mix('/assets/dist/app.min.js')}}"></script>
+    <link href="{{mix('/assets/dist/gdoo.min.css')}}" rel="stylesheet" type="text/css" />
-    <script type="text/javascript" src="{{mix('/assets/dist/bundle.min.js')}}"></script>
 
-    <!-- 第三方库 -->
+    <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="{{$asset_url}}/vendor/ag-grid/ag-grid.min.js"></script>
+    <script type="text/javascript" src="{{$public_url}}/common?s={{time()}}"></script>
 
-    <script>
+    <script type="text/javascript" src="{{mix('/assets/dist/bundle.min.js')}}"></script>
-    {{env("AGGRID_LICENSE")}}
+    <script type="text/javascript" src="{{mix('/assets/dist/gdoo.min.js')}}"></script>
-    </script>
 </head>
 <body class="frame-{{auth()->user()->theme ?: 'lilac'}}">

webpack.mix.js

@@ -6,32 +6,32 @@ mix.js(
 ).vue();
 
 mix.babel([
+    'public/assets/vendor/template.min.js',
     'public/assets/vendor/jquery.js',
     'public/assets/vendor/jquery-ui.min.js',
     'public/assets/vendor/bootstrap/js/bootstrap.js',
     'public/assets/vendor/contextmenu/bootstrap-contextmenu.js',
 
     'public/assets/vendor/jquery.colorpicker.js',
-
     'public/assets/vendor/jquery.table2excel.js',
-
     'public/assets/vendor/viewerjs/viewer.js',
-
     'public/assets/vendor/toastr/toastr.js',
-
     'public/assets/vendor/jquery.paging.js',
-
     'public/assets/vendor/select2/select2.js',
     'public/assets/vendor/select2/zh-CN.js',
 
+    'public/assets/vendor/pcas.js',
+
+    'public/assets/vendor/ag-grid/ag-grid.min.js',
+
+],'public/assets/dist/vendor.min.js');
+
+mix.babel([
     'public/assets/js/aggrid/celleditor/dropdown.js',
     'public/assets/js/aggrid/celleditor/suggest.js',
     'public/assets/js/aggrid/form.js',
     'public/assets/js/aggrid.js',
 
-    'public/assets/vendor/pcas.js',
-    'public/assets/vendor/template.min.js',
-
     'public/assets/js/gdoo.js',
     'public/assets/js/select2.js',
     'public/assets/js/gdoo.dialog.input.js',
@@ -41,9 +41,19 @@ mix.babel([
     'public/assets/js/model.js',
     'public/assets/js/support.js',
 
-],'public/assets/dist/app.min.js');
+],'public/assets/dist/gdoo.min.js');
+
+mix.babel([
+    'public/assets/libs/modernizr.min.js',
+    'public/assets/vendor/addtabs/bootstrap.addtabs.js',
+    'public/assets/js/menu.js',
+
+],'public/assets/dist/index.min.js')
 
 mix.combine([
+    'public/assets/vendor/ag-grid/ag-grid.css',
+    'public/assets/vendor/ag-grid/ag-theme-balham.css',
+
     'public/assets/vendor/bootstrap/css/font-awesome.min.css',
     'public/assets/vendor/bootstrap/css/animate.css',
     'public/assets/vendor/bootstrap/css/bootstrap.css',
@@ -53,43 +63,17 @@ mix.combine([
     'public/assets/vendor/viewerjs/viewer.css',
     'public/assets/vendor/select2/select2.css',
 
+],'public/assets/dist/vendor.min.css')
+
+mix.combine([
     'public/assets/css/reset.css',
     'public/assets/css/gdoo.css',
-
     'public/assets/css/aggrid.css',
+],'public/assets/dist/gdoo.min.css')
 
-],'public/assets/dist/app.min.css')
 
 mix.combine([
-    'public/assets/vendor/ag-grid/ag-grid.css',
-    'public/assets/vendor/ag-grid/ag-theme-balham.css',
-],'public/assets/vendor/ag-grid/ag-grid.min.css')
-
-mix.babel([
-    'public/assets/libs/modernizr.min.js',
-    'public/assets/vendor/jquery.js',
-    'public/assets/vendor/jquery-ui.min.js',
-    'public/assets/vendor/bootstrap/js/bootstrap.js',
-    'public/assets/vendor/toastr/toastr.js',
-    'public/assets/vendor/template.min.js',
-    'public/assets/js/dialog.js',
-    'public/assets/js/menu.js',
-    'public/assets/js/support.js',
-    'public/assets/vendor/addtabs/bootstrap.addtabs.js',
-    
-],'public/assets/dist/index.min.js')
-
-mix.combine([
-    'public/assets/vendor/bootstrap/css/font-awesome.min.css',
-    'public/assets/vendor/bootstrap/css/animate.css',
-    'public/assets/vendor/bootstrap/css/bootstrap.css',
-    'public/assets/vendor/bootstrap/css/glyphicon.css',
-    'public/assets/vendor/toastr/toastr.css',
-
-    'public/assets/css/reset.css',
-    'public/assets/css/gdoo.css',
     'public/assets/css/menu.css',
-
 ],'public/assets/dist/index.min.css');
 
 if (mix.inProduction()) {