发布测试版 2.5.0
This commit is contained in:
@@ -329,6 +329,12 @@ class FieldController extends DefaultController
|
||||
$model->fill($gets);
|
||||
$model->save();
|
||||
|
||||
$_model = DB::table('model')->where('id', $model_id)->first();
|
||||
$_model['fields'] = DB::table('model_field')->where('model_id', $model_id)->get();
|
||||
$abc = json_encode($_model, JSON_UNESCAPED_UNICODE | JSON_PRETTY_PRINT);
|
||||
|
||||
file_put_contents('model_'.$_model['table'].'.json', $abc);
|
||||
|
||||
return $this->json('恭喜你，操作成功。', url('index', ['model_id' => $gets['model_id']]));
|
||||
}
|
||||
|
||||
|
||||
@@ -978,7 +978,7 @@ class FieldService
|
||||
$attribute = $field['attribute'];
|
||||
$id = $attribute['id'];
|
||||
$name = $attribute['name'];
|
||||
|
||||
|
||||
$rows = '';
|
||||
if ($value) {
|
||||
if ($field['type']) {
|
||||
|
||||
@@ -36,9 +36,9 @@
|
||||
<tr>
|
||||
<td>名称</td>
|
||||
<td>字段</td>
|
||||
<td>字段可写</td>
|
||||
<td>字段保密</td>
|
||||
<td>验证规则</td>
|
||||
<td>可写</td>
|
||||
<td>保密</td>
|
||||
<td>验证</td>
|
||||
</tr>
|
||||
|
||||
@foreach($master['fields'] as $field)
|
||||
@@ -62,69 +62,67 @@
|
||||
<option @if(in_array($key, (array)$permission['data'][$master->table][$field->field]['v'])) selected @endif value="{{$key}}">{{$regular}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@if($field['form_type'] == 'auto' || $field['form_type'] == 'sn' || $field['form_type'] == 'date')
|
||||
|
||||
@if($field['form_type'] == 'auto' || $field['form_type'] == 'sn' || $field['form_type'] == 'date')
|
||||
<label title="锁定将不允许修改字段的值">
|
||||
<input type="checkbox" value="1" @if($permission['data'][$master->table][$field->field]['m'] == 1) checked @endif name="data[{{$master->table}}][{{$field->field}}][m]"> 锁定
|
||||
</label>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@endforeach
|
||||
|
||||
@foreach($sublist as $submodel)
|
||||
<tr>
|
||||
<td>
|
||||
<span class="label label-success">{{$submodel['name']}}</span> 权限
|
||||
</td>
|
||||
<td>
|
||||
{{$submodel->table}}@option
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>
|
||||
<select multiple data-placeholder="选择验证规则" class="form-control input-sm input-inline input-select2" name="data[{{$submodel->table}}][@option][v][]">
|
||||
<option value=""></option>
|
||||
<option @if(in_array('required', (array)$permission['data'][$submodel->table]['@option']['v'])) selected @endif value="required">必填</option>
|
||||
</select>
|
||||
<label class="inline-checkbox"><input type="checkbox" @if($permission['data'][$submodel->table]['@option']['w'] == 1) checked @endif name="data[{{$submodel->table}}][@option][w]" value="1"> 增</label>
|
||||
|
||||
<label class="inline-checkbox"><input type="checkbox" @if($permission['data'][$submodel->table]['@option']['d'] == 1) checked @endif name="data[{{$submodel->table}}][@option][d]" value="1"> 删</label>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@foreach($submodel['fields'] as $field)
|
||||
<tr>
|
||||
<td>
|
||||
<span class="label label-primary">{{$submodel['name']}}</span>
|
||||
{{$field['name']}}
|
||||
</td>
|
||||
<td>
|
||||
{{$submodel->table}}.{{$field->field}}
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" @if($permission['data'][$submodel->table][$field->field]['w'] == 1) checked @endif class="field-edit" data-key="{{$submodel->table}}_{{$field->field}}" id="{{$submodel->table}}_{{$field->field}}_edit" name="data[{{$submodel->table}}][{{$field->field}}][w]" value="1">
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" @if($permission['data'][$submodel->table][$field->field]['s'] == 1) checked @endif class="field-secret" data-key="{{$submodel->table}}_{{$field->field}}" id="{{$submodel->table}}_{{$field->field}}_secret" name="data[{{$submodel->table}}][{{$field->field}}][s]" value="1">
|
||||
</td>
|
||||
<td>
|
||||
<select multiple data-placeholder="选择验证规则" class="form-control input-sm input-inline input-select2" name="data[{{$submodel->table}}][{{$field->field}}][v][]">
|
||||
<option value=""></option>
|
||||
@foreach($regulars as $key => $regular)
|
||||
<option @if(in_array($key, (array)$permission['data'][$submodel->table][$field->field]['v'])) selected @endif value="{{$key}}">{{$regular}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@if($field['form_type'] == 'auto' || $field['form_type'] == 'date')
|
||||
<label title="锁定将不允许修改宏控件的值">
|
||||
<input type="checkbox" value="1" @if($permission['data'][$submodel->table][$field->field]['m'] == 1) checked @endif name="data[{{$submodel->table}}][{{$field->field}}][m]"> 锁定
|
||||
</label>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@endforeach
|
||||
<tr>
|
||||
<td>
|
||||
<span class="label label-success">{{$submodel['name']}}</span> 权限
|
||||
</td>
|
||||
<td>
|
||||
{{$submodel->table}}@option
|
||||
</td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td>
|
||||
<select multiple data-placeholder="选择验证规则" class="form-control input-sm input-inline input-select2" name="data[{{$submodel->table}}][@option][v][]">
|
||||
<option value=""></option>
|
||||
<option @if(in_array('required', (array)$permission['data'][$submodel->table]['@option']['v'])) selected @endif value="required">必填</option>
|
||||
</select>
|
||||
<label class="inline-checkbox"><input type="checkbox" @if($permission['data'][$submodel->table]['@option']['w'] == 1) checked @endif name="data[{{$submodel->table}}][@option][w]" value="1"> 增</label>
|
||||
|
||||
<label class="inline-checkbox"><input type="checkbox" @if($permission['data'][$submodel->table]['@option']['d'] == 1) checked @endif name="data[{{$submodel->table}}][@option][d]" value="1"> 删</label>
|
||||
</td>
|
||||
</tr>
|
||||
@foreach($submodel['fields'] as $field)
|
||||
<tr>
|
||||
<td>
|
||||
<span class="label label-primary">{{$submodel['name']}}</span>
|
||||
{{$field['name']}}
|
||||
</td>
|
||||
<td>
|
||||
{{$submodel->table}}.{{$field->field}}
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" @if($permission['data'][$submodel->table][$field->field]['w'] == 1) checked @endif class="field-edit" data-key="{{$submodel->table}}_{{$field->field}}" id="{{$submodel->table}}_{{$field->field}}_edit" name="data[{{$submodel->table}}][{{$field->field}}][w]" value="1">
|
||||
</td>
|
||||
<td>
|
||||
<input type="checkbox" @if($permission['data'][$submodel->table][$field->field]['s'] == 1) checked @endif class="field-secret" data-key="{{$submodel->table}}_{{$field->field}}" id="{{$submodel->table}}_{{$field->field}}_secret" name="data[{{$submodel->table}}][{{$field->field}}][s]" value="1">
|
||||
</td>
|
||||
<td>
|
||||
<select multiple data-placeholder="选择验证规则" class="form-control input-sm input-inline input-select2" name="data[{{$submodel->table}}][{{$field->field}}][v][]">
|
||||
<option value=""></option>
|
||||
@foreach($regulars as $key => $regular)
|
||||
<option @if(in_array($key, (array)$permission['data'][$submodel->table][$field->field]['v'])) selected @endif value="{{$key}}">{{$regular}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
@if($field['form_type'] == 'auto' || $field['form_type'] == 'date')
|
||||
<label title="锁定将不允许修改宏控件的值">
|
||||
<input type="checkbox" value="1" @if($permission['data'][$submodel->table][$field->field]['m'] == 1) checked @endif name="data[{{$submodel->table}}][{{$field->field}}][m]"> 锁定
|
||||
</label>
|
||||
@endif
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@endforeach
|
||||
@endforeach
|
||||
|
||||
</table>
|
||||
|
||||
@@ -789,7 +789,7 @@ $(function() {
|
||||
|
||||
});
|
||||
|
||||
droppedFieldsBox.append('<div class="panel b-a"><div class="panel-heading b-b"><span class="pull-right"><i class="fa fa-fw fa-pencil"></i><i class="fa fa-fw fa-remove"></i></span><span class="label bg-light panel-type">' + type + '</span> <span class="panel-title">' + title + '</span></div><div data-type="' + type + '" data-border="'+border+'" data-title="' + title + '" data-column="' + size + '" id="selected-column-' + size + '" class="droppedFields">' + _fields.join('') + '</div></div>');
|
||||
droppedFieldsBox.append('<div class="panel b-a"><div class="panel-heading b-b"><span class="pull-right"><i class="fa fa-fw fa-pencil"></i><i class="fa fa-fw fa-remove"></i></span><span class="label bg-light panel-type">' + type + '</span> <span class="panel-title">' + title + '</span></div><div data-type="' + type + '" data-border="'+border+'" data-title="' + title + '" data-column="' + size + '" id="selected-column-' + size + '" class="droppedFields">' + _fields.join('') + '</div></div>');
|
||||
|
||||
});
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
@foreach($selects as $select)
|
||||
<option value="{{$select['id']}}">{{$select['name']}}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="todo-grid-box">
|
||||
@@ -49,7 +49,6 @@
|
||||
{suppressMenu: true, field: 'run_name', cellClass:'text-center', headerName: '状态', width: 160},
|
||||
{suppressMenu: true, field: 'user_name', cellClass:'text-center', headerName: '转交人', width: 160},
|
||||
{suppressMenu: true, type: 'datetime', cellClass:'text-center', field: 'created_at', headerName: '转交时间', width: 160},
|
||||
//{suppressMenu: true, field: 'id', cellClass:'text-center', headerName: 'ID', width: 80},
|
||||
{suppressMenu: true, field: 'link', cellClass:'text-center', sortable: false, cellRenderer: 'link', headerName: '', width: 60},
|
||||
];
|
||||
|
||||
|
||||
Reference in New Issue
Block a user