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

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) {
-                    var grids = igdoo.grids;
+                if ($gdoo && $gdoo.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) {
@@ -485,7 +434,7 @@
             }
         }
 
-        self.attr    = attr;
+        self.attr = attr;
         self.element = element;
         self.options = options;
 

public/assets/js/support.js

@@ -51,7 +51,7 @@ $(function() {
 
         var tr = $(this);
         var checkbox = tr.find('.select-row');
-        var checked  = checkbox.prop('checked');
+        var checked = checkbox.prop('checked');
 
         if(checkbox.length == 0) {
             return;
@@ -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() {
-    var index = parent.layer.getFrameIndex(window.name);
-    parent.layer.close(index);
+function getIframeName() {
+    var name = window.name;
+    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/app.min.js": "/assets/dist/app.min.js?id=1298156573de42582abf",
-    "/assets/dist/app.min.css": "/assets/dist/app.min.css?id=079ac4e85bbcc7ba871f",
-    "/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=0b5199e460c9072a6bee",
-    "/assets/dist/index.min.css": "/assets/dist/index.min.css?id=41b06417831d9328ede1"
+    "/assets/dist/bundle.min.js": "/assets/dist/bundle.min.js?id=b46cb4305a863944f84c",
+    "/assets/dist/vendor.min.js": "/assets/dist/vendor.min.js?id=29c59d13160c6607b4af",
+    "/assets/dist/gdoo.min.js": "/assets/dist/gdoo.min.js?id=b40a40adf287e5ea02aa",
+    "/assets/dist/index.min.js": "/assets/dist/index.min.js?id=9f7be548e55d993be518",
+    "/assets/dist/vendor.min.css": "/assets/dist/vendor.min.css?id=99a58728a17257718260",
+    "/assets/dist/gdoo.min.css": "/assets/dist/gdoo.min.css?id=3817f9870ed3748aba46",
+    "/assets/dist/index.min.css": "/assets/dist/index.min.css?id=ccde8d73c536940b91d9"
 }