重构系统附件字段逻辑

修改各模块附件功能
This commit is contained in:
2021-03-21 05:07:01 +08:00
parent fb37c7110b
commit decaabd448
45 changed files with 656 additions and 1513 deletions
+7 -10
View File
@@ -469,10 +469,6 @@ class Form
$attribute = [];
if ($action == 'show') {
$field['is_show'] = true;
}
$permission_table = $permission[$flow['table']];
$p = $permission_table[$field['field']];
$field['is_print'] = $action == 'print';
@@ -481,12 +477,13 @@ class Form
$field['is_auto'] = $p['m'] == 1 ? 1 : 0;
$field['is_hide'] = $p['s'] == 1 ? 1 : $field['is_hide'];
$validate = (array) $p['v'];
if ($action == 'print') {
$field['is_show'] = true;
if ($action == 'show' || $action == 'print') {
$field['is_show'] = 1;
$field['is_write'] = 0;
}
$validate = (array) $p['v'];
if ($action == 'print') {
} else {
$required = '';
@@ -2000,7 +1997,7 @@ class Form
// 权限可写
if ($permission['w'] == 1) {
// 自定义过滤器
$_field_data = Hook::fire($table.'.onFieldFilter', ['table' => $table, 'master' => $master, 'field' => $field, 'values' => $values]);
extract($_field_data);
@@ -2033,7 +2030,7 @@ class Form
case 'files':
$value = (array)$value;
$dataFiles = array_merge($dataFiles, $value);
$value = join("\n", $value);
$value = join(",", $value);
break;
case 'images':
$value = join("\n", (array)$value);