diff --git a/app/Controller/Admin/System.php b/app/Controller/Admin/System.php index 1d7b6ed..44e4dcd 100644 --- a/app/Controller/Admin/System.php +++ b/app/Controller/Admin/System.php @@ -733,7 +733,7 @@ class System extends Base { $request = $this->container->get(ddRequest::class); $request->scene('add')->validateResolved(); - $data = Param::only(["dict_id", "dict_label", "dict_value", "is_default", "rank", "status", "remark"]); + $data = Param::only(["dict_id", "dict_label", "dict_value", "is_default", "show_style", "rank", "status", "remark"]); return $this->toAjax(ddModel::add($data)); } @@ -743,7 +743,7 @@ class System extends Base { $request = $this->container->get(ddRequest::class); $request->scene('edit')->validateResolved(); - $data = Param::only(["data_id", "dict_id", "dict_label", "dict_value", "is_default", "rank", "status", "remark"]); + $data = Param::only(["data_id", "dict_id", "dict_label", "dict_value", "is_default", "show_style", "rank", "status", "remark"]); return $this->toAjax(ddModel::edit($data)); } diff --git a/app/Model/DictData.php b/app/Model/DictData.php index 05e15d6..6692153 100644 --- a/app/Model/DictData.php +++ b/app/Model/DictData.php @@ -9,6 +9,7 @@ namespace App\Model; * @property int $dict_id * @property string $dict_label * @property string $dict_value + * @property string $show_style * @property int $is_default * @property int $rank * @property int $status @@ -49,7 +50,7 @@ class DictData extends Model } return $model->orderByDesc("rank") ->orderByDesc("dict_id") - ->select(["data_id", "dict_id", "dict_label", "dict_value", "is_default", "rank", "status", "remark", "create_time", "update_time"]) + ->select(["data_id", "dict_id", "dict_label", "dict_value", "is_default", "show_style", "rank", "status", "remark", "create_time", "update_time"]) ->paginate((int)$param['limit']); } @@ -60,7 +61,7 @@ class DictData extends Model ->join('dict as d', 'd.dict_id', '=', 'da.dict_id') ->where('d.dict_type', $param['key']) ->where('da.status', 1) - ->select(["da.dict_value", "da.dict_label", "da.is_default"]) + ->select(["da.dict_value", "da.dict_label", "da.is_default", "show_style"]) ->orderByDesc("da.rank") ->get() ->toArray();