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

完全vue渲染列表的功能

Browse Source 
去掉不必要的js函数定义
修改返回json的方式
This commit is contained in:
hawind
2021-03-15 06:12:12 +08:00
parent d795809fb3
commit 975be7cc91
135 changed files with 402 additions and 792 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Gdoo/Model/Controllers/FieldController.php
+1 -1
View File
@@ -419,7 +419,7 @@ class FieldController extends DefaultController
public function getEnumsAction()
{
$enums = Option::where('parent_id', 0)->orderBy('sort', 'asc')->orderBy('id', 'asc')->get();
return response()->json($enums);
return $enums;
}
public function deleteAction()
app/Gdoo/Model/Form.php
+47 -46
View File
@@ -1992,7 +1992,7 @@ class Form
$permission = $permissions[$table];
foreach ($fields as $field) {
$key = $field['field'];
$setting = $field['setting'];
$value = $values[$key];
@@ -2002,56 +2002,57 @@ class Form
if ($row['w'] == 1) {
$_field_data = Hook::fire($table.'.onFieldFilter', ['table' => $table, 'master' => $master, 'field' => $field, 'values' => $values]);
extract($_field_data);
}
if ($field['data_format']) {
switch ($field['data_format']) {
case 'number':
case 'money':
list($_, $len) = explode(',', $field['length']);
$len = $len > 0 ? $len : 2;
$value = round(floatval($value), $len);
break;
}
} else {
switch ($field['type']) {
case 'DECIMAL':
list($_, $len) = explode(',', $field['length']);
$value = round(floatval($value), $len);
if ($field['data_format']) {
switch ($field['data_format']) {
case 'number':
case 'money':
list($_, $len) = explode(',', $field['length']);
$len = $len > 0 ? $len : 2;
$value = round(floatval($value), $len);
break;
}
} else {
switch ($field['type']) {
case 'DECIMAL':
list($_, $len) = explode(',', $field['length']);
$value = round(floatval($value), $len);
break;
}
}
switch ($field['form_type']) {
case 'autocomplete':
$value = str_replace('draft_', '', $value);
break;
case 'address':
$value = join("\n", (array)$value);
break;
case 'files':
$value = (array)$value;
$dataFiles = array_merge($dataFiles, $value);
$value = join("\n", $value);
break;
case 'images':
$value = join("\n", (array)$value);
break;
case 'date':
if ($setting['save'] == 'u') {
$value = empty($value) ? '' : strtotime($value);
}
break;
case 'checkbox':
if (is_array($value)) {
$value = join(",", (array)$value);
} else {
$value = intval($value);
}
break;
}
$values[$key] = $value;
}
switch ($field['form_type']) {
case 'autocomplete':
$value = str_replace('draft_', '', $value);
break;
case 'address':
$value = join("\n", (array)$value);
break;
case 'files':
$value = (array)$value;
$dataFiles = array_merge($dataFiles, $value);
$value = join("\n", $value);
break;
case 'images':
$value = join("\n", (array)$value);
break;
case 'date':
if ($setting['save'] == 'u') {
$value = empty($value) ? '' : strtotime($value);
}
break;
case 'checkbox':
if (is_array($value)) {
$value = join(",", (array)$value);
} else {
$value = intval($value);
}
break;
}
$values[$key] = $value;
}
return $values;
}
app/Gdoo/Model/Grid.php
+19
View File
@@ -20,6 +20,7 @@ use Gdoo\Model\Models\Step;
use Gdoo\Model\Models\StepLog;
use Gdoo\Model\Services\ModelService;
use Gdoo\Model\Services\ModuleService;
use Gdoo\User\Services\UserAssetService;
class Grid
{
@@ -99,6 +100,7 @@ class Grid
$_header = $header;
unset($_header['columns']);
unset($_header['cols']);
unset($_header['dialogs']);
unset($_header['join']);
unset($_header['js']);
@@ -106,6 +108,19 @@ class Grid
unset($_header['search']);
unset($_header['select']);
// 重新组合字段给前端
$columns = [];
foreach ($header['cols'] as $field => $col) {
if ($field == 'action' && empty($col['events'])) {
continue;
}
if ($col['field'] == 'created_by') {
$col['formatter'] = 'created_by';
}
$columns[] = $col;
}
$_header['columns'] = $columns;
$header['runs'] = $runs;
$header['dialogs'] = $dialogs;
$header['regions'] = $regions;
@@ -886,6 +901,7 @@ class Grid
$res['form_type'] = $bill['form_type'];
$res['bill_id'] = $bill['id'];
$res['bill_uri'] = $bill['uri'];
$res['name'] = $master['name'];
$res['model_id'] = $master['id'];
$res['is_sort'] = $master['is_sort'];
@@ -893,6 +909,9 @@ class Grid
$res['sort'] = $sort;
$res['order'] = $order;
// 获取当前权限
$res['access'] = UserAssetService::getNowRoleAssets();
// 是否开启简单搜索框
$res['simple_search_form'] = 1;
$res['exist_sub_table'] = $exist_sub_table;
app/Gdoo/Model/views/bill/index.blade.php
-5
View File
@@ -15,11 +15,6 @@
action.dialogType = 'dialog';
// 自定义搜索方法
search.searchInit = function (e) {
var self = this;
}
action.view = function(data) {
var me = this;
var grid = config.grid;
app/Gdoo/Model/views/model/index.blade.php
-5
View File
@@ -15,11 +15,6 @@
action.dialogType = 'dialog';
// 自定义搜索方法
search.searchInit = function (e) {
var self = this;
}
action.field = function(data) {
var me = this;
var grid = config.grid;
app/Gdoo/Model/views/module/index.blade.php
-5
View File
@@ -56,11 +56,6 @@
}
}
// 自定义搜索方法
search.searchInit = function (e) {
var self = this;
}
var options = new agGridOptions();
var gridDiv = document.querySelector("#{{$header['master_table']}}-grid");
gridDiv.style.height = getPanelHeight(48);