diff --git a/vendor/antgoods/goods/src/controllers/AttributeController.php b/vendor/antgoods/goods/src/controllers/AttributeController.php index 719fea2..ffa0873 100644 --- a/vendor/antgoods/goods/src/controllers/AttributeController.php +++ b/vendor/antgoods/goods/src/controllers/AttributeController.php @@ -97,7 +97,7 @@ class AttributeController extends Controller { $model = $this->findModel($id); - if ($model->load(Yii::$app->request->post())) { + if ($model->load(Yii::$app->request->post()) && $model->validate()) { $model->value = str_replace(',', ',', $model->value); $array = explode(',', $model->value); if (count($array) != count(array_unique($array))) { diff --git a/vendor/antgoods/goods/src/migrations/m191202_025843_update_column_sort_order_in_antgoods_attribute.php b/vendor/antgoods/goods/src/migrations/m191202_025843_update_column_sort_order_in_antgoods_attribute.php new file mode 100644 index 0000000..6757320 --- /dev/null +++ b/vendor/antgoods/goods/src/migrations/m191202_025843_update_column_sort_order_in_antgoods_attribute.php @@ -0,0 +1,43 @@ +dropColumn('antgoods_attribute', 'sort_order'); + $this->addColumn('antgoods_attribute', 'sort_order', $this->smallInteger(3)->defaultValue(null)->unsigned()->comment('排序')); + } + + /** + * {@inheritdoc} + */ + public function safeDown() + { + $this->dropColumn('antgoods_attribute', 'sort_order'); + $this->addColumn('antgoods_attribute', 'sort_order', $this->smallInteger(3)->defaultValue(null)->comment('排序')); + return true; + } + + /* + // Use up()/down() to run migration code without a transaction. + public function up() + { + + } + + public function down() + { + echo "m191202_025843_update_column_sort_order_in_antgoods_attribute cannot be reverted.\n"; + + return false; + } + */ +} diff --git a/vendor/antgoods/goods/src/models/ars/Attribute.php b/vendor/antgoods/goods/src/models/ars/Attribute.php index 0d7bee3..496dbc7 100644 --- a/vendor/antgoods/goods/src/models/ars/Attribute.php +++ b/vendor/antgoods/goods/src/models/ars/Attribute.php @@ -44,9 +44,22 @@ class Attribute extends \yii\db\ActiveRecord [['value'], 'string'], [['type', 'sort_order', 'is_delete', 'cat_id'], 'integer'], [['name'], 'string', 'max' => 50], + [['sort_order'], 'checkNegative'], ]; } + /** + * @param $attribute + * @param $params + * 验证是否为负数 + */ + public function checkNegative($attribute, $params) + { + if ((integer)$this->$attribute < 0) { + $this->addError($attribute, "不得为负数"); + } + } + /** * {@inheritdoc} */