diff --git a/components/Crud.php b/components/Crud.php index eadee7d..f4bd951 100644 --- a/components/Crud.php +++ b/components/Crud.php @@ -1062,7 +1062,7 @@ public function export(CrudExportForm $model) 'renderData' => (bool)$model->renderData, 'model' => $this->getModel('search'), 'dataProvider' => $this->getDataProvider(), - 'columns' => $this->guessColumns($this->getFields()), + 'columns' => $this->getConfig('exportColumns', $this->guessColumns($this->getFields())), ]); return $exporter->export(); } diff --git a/components/CrudImport.php b/components/CrudImport.php index 2e0bdb6..be7caf7 100644 --- a/components/CrudImport.php +++ b/components/CrudImport.php @@ -9,6 +9,7 @@ use Yii; use yii\base\BaseObject; use yii\db\Schema; +use yii\helpers\ArrayHelper; /** * Class CrudImport @@ -108,6 +109,10 @@ public function import() /* @var $model \yii\db\ActiveRecord */ $model = new $this->modelClass; + if ($id = ArrayHelper::getValue($values, 'id')) { + $model->id = $id; + $model->setIsNewRecord(false); + } $model->setAttributes($values); if ($model->save()) {