去掉无用的参数

修改表单构建关联字段的逻辑修改外部插件说明
2021-03-01 03:02:47 +08:00
parent 2418516c49
commit eebbdf279e
63 changed files with 1273 additions and 1380 deletions
@@ -404,11 +404,13 @@ class FieldController extends DefaultController
        $fields = DB::table('model_field')->where('model_id', $flow['id'])->get();
        $rows = [];
        foreach($fields as $field) {
-            if ($field['data_type'] && $field['data_field']) {
-                $f = $field['data_type'].'.'.$field['data_field'];
-                $rows[] = ['field' => $f, 'key' => $field['field'].'.'.$field['data_link'].':'.$f, 'name' => $field['name']];
-            } else {
-                $rows[] = ['field' => $field['field'], 'key' => $field['field'], 'name' => $field['name']];
+            if ($field['type']) {
+                if ($field['data_type'] && $field['data_field']) {
+                    $f = $field['data_type'].'.'.$field['data_field'];
+                    $rows[] = ['field' => $f, 'key' => $field['field'].'.'.$field['data_link'].':'.$f, 'name' => $field['name']];
+                } else {
+                    $rows[] = ['field' => $field['field'], 'key' => $field['field'], 'name' => $field['name']];
+                }
            }
        }
        return $this->json($rows, true);