发布2.3测试版

app/Gdoo/Product/views/product/dialog.blade.php

@@ -43,10 +43,9 @@
 
 <script>
 (function ($) {
-    var treeOptions = new agGridOptions();
-    var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}-tree");
+    var treeGrid = new agGridOptions();
     
-    treeOptions.autoGroupColumnDef = {
+    treeGrid.autoGroupColumnDef = {
         headerName: '产品类别',
         width: 250,
         sortable: false,
@@ -55,43 +54,39 @@
             suppressCount: false,
         }
     };
-    treeOptions.rowSelection = 'single';
-    treeOptions.enableCellTextSelection = false;
-    treeOptions.treeData = true;
-    treeOptions.groupDefaultExpanded = 1;
-    treeOptions.getDataPath = function(data) {
+    treeGrid.rowSelection = 'single';
+    treeGrid.enableCellTextSelection = false;
+    treeGrid.treeData = true;
+    treeGrid.groupDefaultExpanded = 1;
+    treeGrid.getDataPath = function(data) {
         return data.tree_path;
     };
-    treeOptions.columnDefs = [];
+    treeGrid.columnDefs = [];
 
-    treeOptions.onRowClicked = function (params) {
+    treeGrid.onRowClicked = function (params) {
         var query = {};
         query['category_id'] = params.data.id;
         query['page'] = 1;
         grid.remoteData(query);
     };
-    treeOptions.remoteDataUrl = "{{url('category')}}?type=1";
+    treeGrid.remoteDataUrl = "{{url('category')}}?type=1";
+    
+    var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}-tree");
+    new agGrid.Grid(gridDiv, treeGrid);
 
-    new agGrid.Grid(gridDiv, treeOptions);
-
-    treeOptions.remoteData();
+    treeGrid.remoteData();
 
     var search = JSON.parse('{{json_encode($search)}}');
     var params = search.query;
 
-    var option = gdoo.formKey(params);
-    var event = gdoo.event.get(option.key);
-    event.trigger('query', params);
-
-    var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     var grid = new agGridOptions();
-    var multiple = params.multi == 0 ? false : true;
+    var option = gdoo.dialogInit(params, grid);
+
     grid.remoteDataUrl = '{{url()}}';
     grid.remoteParams = params;
-    grid.rowSelection = multiple ? 'multiple' : 'single';
-    grid.suppressRowClickSelection = true;
+
     grid.columnDefs = [
-        {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: multiple, suppressSizeToFit: true, sortable: false, width: 40},
+        {suppressMenu: true, cellClass:'text-center', checkboxSelection: true, headerCheckboxSelection: grid.multiple, suppressSizeToFit: true, sortable: false, width: 40},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'code', headerName: '存货编码', width: 100},
         {suppressMenu: true, cellClass:'text-left', sortable: false, field: 'name', headerName: '产品名称', minWidth: 160},
         {suppressMenu: true, cellClass:'text-center', sortable: false, field: 'spec', headerName: '规格型号', width: 100},
@@ -99,27 +94,10 @@
         {suppressMenu: true, cellClass:'text-center', field: 'id', headerName: 'ID', width: 60}
     ];
 
-    grid.onRowClicked = function(row) {
-        var selected = row.node.isSelected();
-        if (selected === false) {
-            row.node.setSelected(true, true);
-        }
-    };
-
-    grid.onRowDoubleClicked = function (row) {
-        var ret = gdoo.writeSelected(event, params, option, grid);
-        if (ret == true) {
-            $('#gdoo-dialog-' + params.dialog_index).dialog('close');
-        }
-    };
-
-    gdoo.dialogs[option.id] = grid;
+    var gridDiv = document.querySelector("#dialog-{{$search['query']['id']}}");
     new agGrid.Grid(gridDiv, grid);
 
     grid.remoteData({page: 1});
-    grid.remoteAfterSuccess = function() {
-        gdoo.initSelected(params, option, grid);
-    }
 
     var data = search.forms;
     var search = $("#dialog-{{$search['query']['id']}}-search-form").searchForm({