diff --git a/backend/views/attribute/index.php b/vendor/antgoods/goods/src/views/attribute/index.php
similarity index 87%
rename from backend/views/attribute/index.php
rename to vendor/antgoods/goods/src/views/attribute/index.php
index 3b9e384..b147a9f 100644
--- a/backend/views/attribute/index.php
+++ b/vendor/antgoods/goods/src/views/attribute/index.php
@@ -4,10 +4,10 @@ use yii\helpers\Html;
use iron\grid\GridView;
/* @var $this yii\web\View */
-/* @var $searchModel common\models\searchs\attributeSearch */
+/* @var $searchModel common\models\searchs\AttributeSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
-$this->title = 'Attributes';
+$this->title = '规格管理';
$this->params['breadcrumbs'][] = $this->title;
?>
diff --git a/backend/views/attribute/update.php b/vendor/antgoods/goods/src/views/attribute/update.php
similarity index 63%
rename from backend/views/attribute/update.php
rename to vendor/antgoods/goods/src/views/attribute/update.php
index 4532da0..0f412bc 100644
--- a/backend/views/attribute/update.php
+++ b/vendor/antgoods/goods/src/views/attribute/update.php
@@ -3,10 +3,10 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Attribute */
+/* @var $model antgoods\goods\models\ars\Attribute */
-$this->title = '编辑 Attribute: ' . $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Attributes', 'url' => ['index']];
+$this->title = '编辑规格: ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => '规格管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
$this->params['breadcrumbs'][] = 'Update ';
?>
diff --git a/backend/views/attribute/view.php b/vendor/antgoods/goods/src/views/attribute/view.php
similarity index 72%
rename from backend/views/attribute/view.php
rename to vendor/antgoods/goods/src/views/attribute/view.php
index 8e54adb..87eaed1 100644
--- a/backend/views/attribute/view.php
+++ b/vendor/antgoods/goods/src/views/attribute/view.php
@@ -4,10 +4,10 @@ use yii\helpers\Html;
use yii\widgets\DetailView;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Attribute */
+/* @var $model antgoods\goods\models\ars\Attribute */
$this->title = $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Attributes', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => '规格管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
\yii\web\YiiAsset::register($this);
?>
@@ -25,9 +25,8 @@ $this->params['breadcrumbs'][] = $this->title;
'value:ntext',
'type',
'sort_order',
- 'is_delete',
- 'created_at',
- 'updated_at',
+ 'created_at:datetime',
+ 'updated_at:datetime',
],
]) ?>
diff --git a/backend/views/brand/_form.php b/vendor/antgoods/goods/src/views/brand/_form.php
similarity index 78%
rename from backend/views/brand/_form.php
rename to vendor/antgoods/goods/src/views/brand/_form.php
index 036e9f6..fb90e37 100644
--- a/backend/views/brand/_form.php
+++ b/vendor/antgoods/goods/src/views/brand/_form.php
@@ -1,10 +1,10 @@
@@ -14,8 +14,6 @@ use yii\widgets\ActiveForm;
field($model, 'name')->textInput(['maxlength' => true]) ?>
- field($model, 'is_delete')->textInput() ?>
-
'btn btn-success']) ?>
'btn btn-info']) ?>
diff --git a/vendor/antgoods/goods/src/views/brand/_search.php b/vendor/antgoods/goods/src/views/brand/_search.php
new file mode 100644
index 0000000..ed21354
--- /dev/null
+++ b/vendor/antgoods/goods/src/views/brand/_search.php
@@ -0,0 +1,49 @@
+
+
+ ['index'],
+ 'method' => 'get',
+ 'validateOnType' => true,
+ ]);
+?>
+
+
+
\ No newline at end of file
diff --git a/backend/views/brand/create.php b/vendor/antgoods/goods/src/views/brand/create.php
similarity index 57%
rename from backend/views/brand/create.php
rename to vendor/antgoods/goods/src/views/brand/create.php
index c768fcb..7effd14 100644
--- a/backend/views/brand/create.php
+++ b/vendor/antgoods/goods/src/views/brand/create.php
@@ -3,10 +3,10 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Brand */
+/* @var $model antgoods\goods\models\ars\Brand */
-$this->title = '创建 Brand';
-$this->params['breadcrumbs'][] = ['label' => 'Brands', 'url' => ['index']];
+$this->title = '创建品牌';
+$this->params['breadcrumbs'][] = ['label' => '品牌管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
+ field($model, 'id', [
+ "template" => "{input}{error}",
+ "inputOptions" => [
+ "placeholder" => "检索ID",
+ "class" => "form-control",
+ ],
+ "errorOptions" => [
+ "class" => "error-tips"
+ ]
+ ])
+ ?>
+
+
+ field($model, "created_at_range", [
+ "template" => "{input}{error}",
+ "inputOptions" => [
+ "placeholder" => "创建时间",
+ ],
+ "errorOptions" => [
+ "class" => "error-tips"
+ ]
+ ])->widget(DateRangePicker::className());
+ ?>
+
+
+ ', ['class' => 'btn btn-default']) ?>
+ ', ['class' => 'btn btn-default']) ?>
+
+
diff --git a/backend/views/brand/index.php b/vendor/antgoods/goods/src/views/brand/index.php
similarity index 88%
rename from backend/views/brand/index.php
rename to vendor/antgoods/goods/src/views/brand/index.php
index f799f7a..7f2b6ba 100644
--- a/backend/views/brand/index.php
+++ b/vendor/antgoods/goods/src/views/brand/index.php
@@ -1,17 +1,17 @@
title = 'Brands';
+$this->title = '品牌管理';
$this->params['breadcrumbs'][] = $this->title;
?>
-
+
$dataProvider,
'filter' => $this->render("_search", ['model' => $searchModel]),
diff --git a/backend/views/brand/update.php b/vendor/antgoods/goods/src/views/brand/update.php
similarity index 54%
rename from backend/views/brand/update.php
rename to vendor/antgoods/goods/src/views/brand/update.php
index 453ee2f..6b13cfe 100644
--- a/backend/views/brand/update.php
+++ b/vendor/antgoods/goods/src/views/brand/update.php
@@ -3,12 +3,12 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Brand */
+/* @var $model antgoods\goods\models\ars\Brand */
-$this->title = '编辑 Brand: ' . $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Brands', 'url' => ['index']];
+$this->title = '编辑品牌: ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => '品牌管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = 'Update ';
+$this->params['breadcrumbs'][] = '编辑 ';
?>
diff --git a/backend/views/brand/view.php b/vendor/antgoods/goods/src/views/brand/view.php
similarity index 70%
rename from backend/views/brand/view.php
rename to vendor/antgoods/goods/src/views/brand/view.php
index 814b5be..a9de5d8 100644
--- a/backend/views/brand/view.php
+++ b/vendor/antgoods/goods/src/views/brand/view.php
@@ -4,10 +4,10 @@ use yii\helpers\Html;
use yii\widgets\DetailView;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Brand */
+/* @var $model antgoods\goods\models\ars\Brand */
$this->title = $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Brands', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => '品牌管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
\yii\web\YiiAsset::register($this);
?>
@@ -22,9 +22,8 @@ $this->params['breadcrumbs'][] = $this->title;
'attributes' => [
'id',
'name',
- 'is_delete',
- 'created_at',
- 'updated_at',
+ 'created_at:datetime',
+ 'updated_at:datetime',
],
]) ?>
diff --git a/vendor/antgoods/goods/src/views/category/_form.php b/vendor/antgoods/goods/src/views/category/_form.php
new file mode 100644
index 0000000..344b234
--- /dev/null
+++ b/vendor/antgoods/goods/src/views/category/_form.php
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+ field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+ field($model, 'sort_order')->textInput() ?>
+
+ field($model, 'iconImageId')->hiddenInput()->label('') ?>
+ field($model, 'iconImagePath')->widget(\iron\widgets\Upload::className(), [
+ 'url' => 'upload',
+ 'deleteUrl' => 'img-id-del',
+ 'dragdropWidth'=> 800,
+ 'afterSave' => 'save-file',
+ 'maxCount' => 1,
+ 'fillInAttribute' => 'iconImageId',
+ 'model' => $model,
+ 'previewConfig' => [
+ 'url' => Url::to(['image-file', 'fileidstr' => $model->iconImageId]),
+ ],
+ ])->label('类目图片') ?>
+
+ field($model, 'is_show')->widget(Icheck::className(), ["items" => $model::$isShow, 'type' => "radio"]) ?>
+
+
diff --git a/backend/views/category/_search.php b/vendor/antgoods/goods/src/views/category/_search.php
similarity index 100%
rename from backend/views/category/_search.php
rename to vendor/antgoods/goods/src/views/category/_search.php
diff --git a/backend/views/category/create.php b/vendor/antgoods/goods/src/views/category/create.php
similarity index 54%
rename from backend/views/category/create.php
rename to vendor/antgoods/goods/src/views/category/create.php
index 932a778..a213063 100644
--- a/backend/views/category/create.php
+++ b/vendor/antgoods/goods/src/views/category/create.php
@@ -3,10 +3,10 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Category */
+/* @var $model antgoods\goods\models\ars\Category */
-$this->title = '创建 Category';
-$this->params['breadcrumbs'][] = ['label' => 'Categories', 'url' => ['index']];
+$this->title = '创建后台商品分类';
+$this->params['breadcrumbs'][] = ['label' => '后台商品分类', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
+ 'btn btn-success']) ?>
+ 'btn btn-info']) ?>
+
+
+
+
+
diff --git a/backend/views/category/index.php b/vendor/antgoods/goods/src/views/category/index.php
similarity index 94%
rename from backend/views/category/index.php
rename to vendor/antgoods/goods/src/views/category/index.php
index 9c6da0b..0f5127f 100644
--- a/backend/views/category/index.php
+++ b/vendor/antgoods/goods/src/views/category/index.php
@@ -7,7 +7,7 @@ use iron\grid\GridView;
/* @var $searchModel common\models\searchs\CategorySearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
-$this->title = 'Categories';
+$this->title = '后台商品分类';
$this->params['breadcrumbs'][] = $this->title;
?>
diff --git a/backend/views/category/update.php b/vendor/antgoods/goods/src/views/category/update.php
similarity index 52%
rename from backend/views/category/update.php
rename to vendor/antgoods/goods/src/views/category/update.php
index f492c7b..9e2753c 100644
--- a/backend/views/category/update.php
+++ b/vendor/antgoods/goods/src/views/category/update.php
@@ -3,12 +3,12 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Category */
+/* @var $model antgoods\goods\models\ars\Category */
-$this->title = '编辑 Category: ' . $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Categories', 'url' => ['index']];
+$this->title = '编辑后台商品分类: ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => '后台商品分类', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = 'Update ';
+$this->params['breadcrumbs'][] = '编辑 ';
?>
diff --git a/backend/views/category/view.php b/vendor/antgoods/goods/src/views/category/view.php
similarity index 55%
rename from backend/views/category/view.php
rename to vendor/antgoods/goods/src/views/category/view.php
index 403a436..f0ec780 100644
--- a/backend/views/category/view.php
+++ b/vendor/antgoods/goods/src/views/category/view.php
@@ -4,10 +4,10 @@ use yii\helpers\Html;
use yii\widgets\DetailView;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Category */
+/* @var $model antgoods\goods\models\ars\Category */
$this->title = $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Categories', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => '后台商品分类', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
\yii\web\YiiAsset::register($this);
?>
@@ -27,10 +27,14 @@ $this->params['breadcrumbs'][] = $this->title;
'sort_order',
'icon_type',
'icon',
- 'is_show',
- 'is_delete',
- 'created_at',
- 'updated_at',
+ [
+ 'attribute' => 'is_show',
+ 'value' => function ($model) {
+ return $model->is_show == \antgoods\goods\models\ars\Category::IS_SHOW_DISPLAY ? '显示':'隐藏';
+ }
+ ],
+ 'created_at:datetime',
+ 'updated_at:datetime',
],
]) ?>
diff --git a/vendor/antgoods/goods/src/views/goods/_form.php b/vendor/antgoods/goods/src/views/goods/_form.php
new file mode 100644
index 0000000..99d331c
--- /dev/null
+++ b/vendor/antgoods/goods/src/views/goods/_form.php
@@ -0,0 +1,107 @@
+
+
+
+
+
+
+ field($model, 'cat_id')->dropDownList(Category::modelColumn(), ['prompt' => '请选择']) ?>
+
+ field($model, 'brand_id')->dropDownList(Brand::modelColumn(), ['prompt' => '请选择']) ?>
+
+ field($model, 'shop_cat_id')->dropDownList(ShopCategory::modelColumn(), ['prompt' => '请选择']) ?>
+
+ field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+ field($model, 'sn')->textInput(['maxlength' => true]) ?>
+
+ field($model, 'code')->textInput(['maxlength' => true]) ?>
+
+ field($model, 'supplier_id')->dropDownList(Supplier::modelColumn(), ['prompt' => '请选择']) ?>
+
+ field($model, 'weight')->textInput() ?>
+
+ field($model, 'length')->textInput() ?>
+
+ field($model, 'width')->textInput() ?>
+
+ field($model, 'height')->textInput() ?>
+
+ field($model, 'diameter')->textInput() ?>
+
+ field($model, 'unit')->textInput(['maxlength' => true]) ?>
+
+ field($model, 'limit_count')->textInput() ?>
+
+ field($model, 'stock')->textInput() ?>
+
+ field($model, 'stock_warn')->textInput() ?>
+
+ field($model, 'market_price')->textInput() ?>
+
+ field($model, 'price')->textInput() ?>
+
+ field($model, 'brief')->textInput(['maxlength' => true]) ?>
+
+ field($model, 'description')->textarea(['rows' => 6]) ?>
+
+ field($model, 'model_id')->textInput() ?>
+
+ field($model, 'is_sale')->radioList($model::$isSale) ?>
+
+ field($model, 'sort_order')->textInput() ?>
+
+ field($model, 'bouns_points')->textInput() ?>
+
+ field($model, 'experience_points')->textInput() ?>
+
+ field($model, 'express_template')->textInput() ?>
+
+ field($model, 'coverImageId')->hiddenInput()->label('') ?>
+ field($model, 'coverImagePath')->widget(\iron\widgets\Upload::className(), [
+ 'url' => 'upload',
+ 'deleteUrl' => 'img-id-del',
+ 'dragdropWidth'=> 800,
+ 'afterSave' => 'save-file',
+ 'maxCount' => 1,
+ 'fillInAttribute' => 'coverImageId',
+ 'model' => $model,
+ 'previewConfig' => [
+ 'url' => Url::to(['image-file', 'fileidstr' => $model->coverImageId]),
+ ],
+ ])->label('商品封面图') ?>
+
+ field($model, 'detailImageId')->hiddenInput()->label('') ?>
+ field($model, 'detailImagePath')->widget(\iron\widgets\Upload::className(), [
+ 'url' => 'upload',
+ 'deleteUrl' => 'img-id-del',
+ 'dragdropWidth'=> 800,
+ 'afterSave' => 'save-file',
+ 'maxCount' => 5,
+ 'fillInAttribute' => 'detailImageId',
+ 'model' => $model,
+ 'previewConfig' => [
+ 'url' => Url::to(['image-file', 'fileidstr' => $model->detailImageId]),
+ ],
+ ])->label('商品详情图') ?>
+
+
diff --git a/backend/views/goods/_search.php b/vendor/antgoods/goods/src/views/goods/_search.php
similarity index 100%
rename from backend/views/goods/_search.php
rename to vendor/antgoods/goods/src/views/goods/_search.php
diff --git a/backend/views/goods/create.php b/vendor/antgoods/goods/src/views/goods/create.php
similarity index 57%
rename from backend/views/goods/create.php
rename to vendor/antgoods/goods/src/views/goods/create.php
index d32b1b8..05be9b7 100644
--- a/backend/views/goods/create.php
+++ b/vendor/antgoods/goods/src/views/goods/create.php
@@ -3,10 +3,10 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Goods */
+/* @var $model antgoods\goods\models\ars\Goods */
-$this->title = '创建 Goods';
-$this->params['breadcrumbs'][] = ['label' => 'Goods', 'url' => ['index']];
+$this->title = '创建商品';
+$this->params['breadcrumbs'][] = ['label' => '商品列表', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
+ 'btn btn-success']) ?>
+ 'btn btn-info']) ?>
+
+
+
+
+
diff --git a/backend/views/goods/index.php b/vendor/antgoods/goods/src/views/goods/index.php
similarity index 95%
rename from backend/views/goods/index.php
rename to vendor/antgoods/goods/src/views/goods/index.php
index 82c38b2..40421e3 100644
--- a/backend/views/goods/index.php
+++ b/vendor/antgoods/goods/src/views/goods/index.php
@@ -7,7 +7,7 @@ use iron\grid\GridView;
/* @var $searchModel common\models\searchs\GoodsSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
-$this->title = 'Goods';
+$this->title = '商品列表';
$this->params['breadcrumbs'][] = $this->title;
?>
diff --git a/backend/views/goods/update.php b/vendor/antgoods/goods/src/views/goods/update.php
similarity index 54%
rename from backend/views/goods/update.php
rename to vendor/antgoods/goods/src/views/goods/update.php
index afaf45f..c4a3cf1 100644
--- a/backend/views/goods/update.php
+++ b/vendor/antgoods/goods/src/views/goods/update.php
@@ -3,12 +3,12 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Goods */
+/* @var $model antgoods\goods\models\ars\Goods */
-$this->title = '编辑 Goods: ' . $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Goods', 'url' => ['index']];
+$this->title = '编辑商品: ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => '商品管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = 'Update ';
+$this->params['breadcrumbs'][] = '编辑 ';
?>
diff --git a/backend/views/goods/view.php b/vendor/antgoods/goods/src/views/goods/view.php
similarity index 85%
rename from backend/views/goods/view.php
rename to vendor/antgoods/goods/src/views/goods/view.php
index e2a57f2..5f51770 100644
--- a/backend/views/goods/view.php
+++ b/vendor/antgoods/goods/src/views/goods/view.php
@@ -4,10 +4,10 @@ use yii\helpers\Html;
use yii\widgets\DetailView;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Goods */
+/* @var $model antgoods\goods\models\ars\Goods */
$this->title = $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Goods', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => '商品管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
\yii\web\YiiAsset::register($this);
?>
@@ -51,8 +51,8 @@ $this->params['breadcrumbs'][] = $this->title;
'experience_points',
'is_delete',
'express_template',
- 'created_at',
- 'updated_at',
+ 'created_at:datetime',
+ 'updated_at:datetime',
],
]) ?>
diff --git a/vendor/antgoods/goods/src/views/shop-category/_form.php b/vendor/antgoods/goods/src/views/shop-category/_form.php
new file mode 100644
index 0000000..9213502
--- /dev/null
+++ b/vendor/antgoods/goods/src/views/shop-category/_form.php
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+ field($model, 'name')->textInput(['maxlength' => true]) ?>
+
+ field($model, 'keywords')->textInput(['maxlength' => true]) ?>
+
+ field($model, 'desc')->textInput(['maxlength' => true]) ?>
+
+ field($model, 'sort_order')->textInput() ?>
+
+ field($model, 'iconImageId')->hiddenInput()->label('') ?>
+ field($model, 'iconImagePath')->widget(\iron\widgets\Upload::className(), [
+ 'url' => 'upload',
+ 'deleteUrl' => 'img-id-del',
+ 'dragdropWidth'=> 800,
+ 'afterSave' => 'save-file',
+ 'maxCount' => 1,
+ 'fillInAttribute' => 'iconImageId',
+ 'model' => $model,
+ 'previewConfig' => [
+ 'url' => Url::to(['image-file', 'fileidstr' => $model->iconImageId]),
+ ],
+ ])->label('类目图片') ?>
+
+ field($model, 'filter_attr')->widget(Select2::className(), ["items" => Attribute::modelColumn(), "promptText" => false, 'options' => ['multiple' => true, 'placeholder' => '请选择...'] ]) ?>
+
+ field($model, 'is_show')->widget(Icheck::className(), ["items" => $model::$isShow, 'type' => "radio"]) ?>
+
+
diff --git a/backend/views/shop-category/_search.php b/vendor/antgoods/goods/src/views/shop-category/_search.php
similarity index 100%
rename from backend/views/shop-category/_search.php
rename to vendor/antgoods/goods/src/views/shop-category/_search.php
diff --git a/backend/views/shop-category/create.php b/vendor/antgoods/goods/src/views/shop-category/create.php
similarity index 54%
rename from backend/views/shop-category/create.php
rename to vendor/antgoods/goods/src/views/shop-category/create.php
index 2fe2348..ff6a2cd 100644
--- a/backend/views/shop-category/create.php
+++ b/vendor/antgoods/goods/src/views/shop-category/create.php
@@ -3,10 +3,10 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\ShopCategory */
+/* @var $model antgoods\goods\models\ars\ShopCategory */
-$this->title = '创建 Shop Category';
-$this->params['breadcrumbs'][] = ['label' => 'Shop Categories', 'url' => ['index']];
+$this->title = '创建前端商品分类';
+$this->params['breadcrumbs'][] = ['label' => '前端商品分类', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
+ 'btn btn-success']) ?>
+ 'btn btn-info']) ?>
+
+
+
+
+
diff --git a/backend/views/shop-category/index.php b/vendor/antgoods/goods/src/views/shop-category/index.php
similarity index 87%
rename from backend/views/shop-category/index.php
rename to vendor/antgoods/goods/src/views/shop-category/index.php
index e1a7446..af3692d 100644
--- a/backend/views/shop-category/index.php
+++ b/vendor/antgoods/goods/src/views/shop-category/index.php
@@ -7,7 +7,7 @@ use iron\grid\GridView;
/* @var $searchModel common\models\searchs\ShopCategorySearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
-$this->title = 'Shop Categories';
+$this->title = '前端商品分类';
$this->params['breadcrumbs'][] = $this->title;
?>
@@ -18,7 +18,7 @@ $this->params['breadcrumbs'][] = $this->title;
'batch' => [
[
"label" => "删除",
- "url" => "shop-category/deletes"
+ "url" => "shopcategory/deletes"
],
],
'columns' => $columns
diff --git a/backend/views/shop-category/update.php b/vendor/antgoods/goods/src/views/shop-category/update.php
similarity index 52%
rename from backend/views/shop-category/update.php
rename to vendor/antgoods/goods/src/views/shop-category/update.php
index 93e68c8..d59515f 100644
--- a/backend/views/shop-category/update.php
+++ b/vendor/antgoods/goods/src/views/shop-category/update.php
@@ -3,12 +3,12 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\ShopCategory */
+/* @var $model antgoods\goods\models\ars\ShopCategory */
-$this->title = '编辑 Shop Category: ' . $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Shop Categories', 'url' => ['index']];
+$this->title = '编辑前端商品分类: ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => '前端商品分类', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = 'Update ';
+$this->params['breadcrumbs'][] = '编辑 ';
?>
diff --git a/backend/views/shop-category/view.php b/vendor/antgoods/goods/src/views/shop-category/view.php
similarity index 77%
rename from backend/views/shop-category/view.php
rename to vendor/antgoods/goods/src/views/shop-category/view.php
index b94aaa9..7157fb0 100644
--- a/backend/views/shop-category/view.php
+++ b/vendor/antgoods/goods/src/views/shop-category/view.php
@@ -4,10 +4,10 @@ use yii\helpers\Html;
use yii\widgets\DetailView;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\ShopCategory */
+/* @var $model antgoods\goods\models\ars\ShopCategory */
$this->title = $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Shop Categories', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => '前端商品分类', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
\yii\web\YiiAsset::register($this);
?>
@@ -32,8 +32,8 @@ $this->params['breadcrumbs'][] = $this->title;
'filter_attr:ntext',
'is_show',
'is_delete',
- 'created_at',
- 'updated_at',
+ 'created_at:datetime',
+ 'updated_at:datetime',
],
]) ?>
diff --git a/backend/views/supplier/_form.php b/vendor/antgoods/goods/src/views/supplier/_form.php
similarity index 84%
rename from backend/views/supplier/_form.php
rename to vendor/antgoods/goods/src/views/supplier/_form.php
index dde074b..4e074b7 100644
--- a/backend/views/supplier/_form.php
+++ b/vendor/antgoods/goods/src/views/supplier/_form.php
@@ -1,10 +1,10 @@
@@ -20,8 +20,6 @@ use yii\widgets\ActiveForm;
field($model, 'address')->textInput(['maxlength' => true]) ?>
- field($model, 'is_delete')->textInput() ?>
-
";else fileList+=fileArray[i]+"
";obj.fileCounter++}if(s.maxFileCount!=-1&&obj.selectedFiles+fileArray.length>s.maxFileCount){if(s.showError)$("![]()
").width(s.previewWidth).height(s.previewHeight).appendTo(this.statusbar).hide();this.filename=$("").appendTo(this.statusbar);this.progressDiv=$("
@@ -96,6 +99,27 @@ class Upload extends InputWidget
* 拉拽框大小
*/
public $dragdropWidth;
+ /**
+ * @var
+ * 数据模型
+ */
+ public $model;
+ /**
+ * @var
+ * 填入结果的参数
+ */
+ public $fillInAttribute;
+ /**
+ * @var
+ * 填入结果的输入框id
+ */
+ private $fillInId;
+ /**
+ * @var string Regular expression used for attribute name validation.
+ * @since 2.0.12
+ * 属性匹配规则
+ */
+ private static $attributeRegex = '/(^|.*\])([\w\.\+]+)(\[.*|$)/u';
/**
* @throws NotFoundHttpException
@@ -120,6 +144,13 @@ class Upload extends InputWidget
$this->maxCount = $this->maxCount ?: 10;//默认数量限制十张图
$this->showDelete = $this->deleteUrl ? 'true' : 'false';//默认不显示删除按钮
$this->maxSize = $this->maxSize ? $this->maxSize *= 1024 : 2 * 1024 * 1024;//默认限制2M大小;
+ if (!$this->fillInAttribute) {
+ throw new NotFoundHttpException('(fillInAttribute) 必须配置填入参数');
+ }
+ if (!$this->model) {
+ throw new NotFoundHttpException('(model) 必须配置model');
+ }
+ $this->fillInId = self::getInputId($this->model, $this->fillInAttribute);
}
/**
@@ -140,7 +171,7 @@ class Upload extends InputWidget
$view = $this->getView();
UploadAsset::register($view);
$js = <<< SCRIPT
- $("#upload-file").uploadFile({
+ $("#upload-file-{$this->attribute}").uploadFile({
url:"upload",
returnType: "json",
multiple:true,
@@ -164,6 +195,15 @@ class Upload extends InputWidget
url: "{$this->afterSave}",
dataType: "json",
data: {data: data, fileName: files},
+ success: function(data)
+ {
+ var imageval = $('#{$this->fillInId}').val();
+ if(imageval == '' || imageval == 0){
+ $('#{$this->fillInId}').val(data);
+ }else{
+ $('#{$this->fillInId}').val($('#{$this->fillInId}').val()+','+data);
+ }
+ }
});
},
onLoad:function(obj)
@@ -182,14 +222,23 @@ class Upload extends InputWidget
});
},
deleteCallback: function (data, pd) {
- for (var i = 0; i < data.length; i++) {
- $.post("{$this->deleteUrl}", {op: "delete",name: data[i]},
- function (resp,textStatus, jqXHR) {
-
- });
- }
+ $.ajax({
+ url: '{$this->deleteUrl}',
+ data: {data: data, imgid: $('#{$this->fillInId}').val()},
+ success: function(data)
+ {
+ $('#{$this->fillInId}').val(data);
+ },
+ });
+// for (var i = 0; i < data.length; i++) {
+// $.post("{$this->deleteUrl}", {op: "delete",name: data[i]},
+// function (resp,textStatus, jqXHR) {
+//
+// });
+// }
pd.statusbar.hide(); //You choice.
},
+
});
SCRIPT;
$view->registerJs($js);
@@ -201,15 +250,54 @@ SCRIPT;
*/
protected function renderUploadHtml()
{
- return '
'btn btn-success']) ?>
'btn btn-info']) ?>
diff --git a/vendor/antgoods/goods/src/views/supplier/_search.php b/vendor/antgoods/goods/src/views/supplier/_search.php
new file mode 100644
index 0000000..1f00e41
--- /dev/null
+++ b/vendor/antgoods/goods/src/views/supplier/_search.php
@@ -0,0 +1,49 @@
+
+
+ ['index'],
+ 'method' => 'get',
+ 'validateOnType' => true,
+ ]);
+?>
+");form.appendTo("body");var fileArray=[];fileArray.push(files[i].name);ajaxFormSubmit(form,ts,pd,fileArray,obj,files[i]);obj.fileCounter++}}function isFileTypeAllowed(obj,s,fileName){var fileExtensions=s.allowedTypes.toLowerCase().split(/[\s,]+/g);var ext=fileName.split(".").pop().toLowerCase();if(s.allowedTypes!="*"&&jQuery.inArray(ext,fileExtensions)<0){return false}return true}function isFileDuplicate(obj,filename){var duplicate=false;if(obj.existingFileNames.length){for(var x=0;x");var fileInputStr="";if(s.multiple){if(s.fileName.indexOf("[]")!=s.fileName.length-2){s.fileName+="[]"}fileInputStr=""}var fileInput=$(fileInputStr).appendTo(form);fileInput.change(function(){obj.errorLog.html("");var fileExtensions=s.allowedTypes.toLowerCase().split(",");var fileArray=[];if(this.files){for(i=0;i"+filenameStr+" "+s.extErrorStr+s.allowedTypes+"
").appendTo(obj.errorLog);return}flist.push({name:filenameStr,size:"NA"});if(s.onSelect(flist)==false)return}updateFileCounter(s,obj);uploadLabel.unbind("click");form.hide();createCustomInputFile(obj,group,s,uploadLabel);form.addClass(group);if(s.serialize&&feature.fileapi&&feature.formdata){form.removeClass(group);var files=this.files;form.remove();serializeAndUploadFiles(s,obj,files)}else{var fileList="";for(var i=0;i
+
+
\ No newline at end of file
diff --git a/backend/views/supplier/create.php b/vendor/antgoods/goods/src/views/supplier/create.php
similarity index 56%
rename from backend/views/supplier/create.php
rename to vendor/antgoods/goods/src/views/supplier/create.php
index eeb7fb0..86b9e63 100644
--- a/backend/views/supplier/create.php
+++ b/vendor/antgoods/goods/src/views/supplier/create.php
@@ -3,10 +3,10 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Supplier */
+/* @var $model antgoods\goods\models\ars\Supplier */
-$this->title = '创建 Supplier';
-$this->params['breadcrumbs'][] = ['label' => 'Suppliers', 'url' => ['index']];
+$this->title = '创建供应商';
+$this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
?>
+ field($model, 'id', [
+ "template" => "{input}{error}",
+ "inputOptions" => [
+ "placeholder" => "检索ID",
+ "class" => "form-control",
+ ],
+ "errorOptions" => [
+ "class" => "error-tips"
+ ]
+ ])
+ ?>
+
+
+ field($model, "created_at_range", [
+ "template" => "{input}{error}",
+ "inputOptions" => [
+ "placeholder" => "创建时间",
+ ],
+ "errorOptions" => [
+ "class" => "error-tips"
+ ]
+ ])->widget(DateRangePicker::className());
+ ?>
+
+
+ ', ['class' => 'btn btn-default']) ?>
+ ', ['class' => 'btn btn-default']) ?>
+
+
diff --git a/backend/views/supplier/index.php b/vendor/antgoods/goods/src/views/supplier/index.php
similarity index 88%
rename from backend/views/supplier/index.php
rename to vendor/antgoods/goods/src/views/supplier/index.php
index 1c15fb2..bad1e50 100644
--- a/backend/views/supplier/index.php
+++ b/vendor/antgoods/goods/src/views/supplier/index.php
@@ -1,17 +1,17 @@
title = 'Suppliers';
+$this->title = '供应商管理';
$this->params['breadcrumbs'][] = $this->title;
?>
";obj.fileCounter++}if(fileArray.length==0)return;var extraData=s.formData;if(extraData){var sData=serializeData(extraData);for(var j=0;j");form.appendTo("body");ajaxFormSubmit(form,ts,pd,fileArray,obj)}function serializeAndUploadFiles(s,obj,files){for(var i=0;i"+files[i].name+" "+s.extErrorStr+s.allowedTypes+"
").appendTo(obj.errorLog);continue}if(!s.allowDuplicates&&isFileDuplicate(obj,files[i].name)){if(s.showError)$("
- ";else fileList+=fileArray[i]+"
";obj.fileCounter++}if(s.maxFileCount!=-1&&obj.selectedFiles+fileArray.length>s.maxFileCount){if(s.showError)$("![]()
").width(s.previewWidth).height(s.previewHeight).appendTo(this.statusbar).hide();this.filename=$("").appendTo(this.statusbar);this.progressDiv=$("1){if(s.showError)$(""+files[i].name+" "+s.extErrorStr+s.allowedTypes+"
").appendTo(obj.errorLog);continue}if(s.maxFileSize!=-1&&files[i].size>s.maxFileSize){if(s.showError)$("
+ ");form.appendTo("body");var fileArray=[];fileArray.push(files[i].name);ajaxFormSubmit(form,ts,pd,fileArray,obj,files[i]);obj.fileCounter++}}function isFileTypeAllowed(obj,s,fileName){var fileExtensions=s.allowedTypes.toLowerCase().split(/[\s,]+/g);var ext=fileName.split(".").pop().toLowerCase();if(s.allowedTypes!="*"&&jQuery.inArray(ext,fileExtensions)<0){return false}return true}function isFileDuplicate(obj,filename){var duplicate=false;if(obj.existingFileNames.length){for(var x=0;x");var fileInputStr="";if(s.multiple){if(s.fileName.indexOf("[]")!=s.fileName.length-2){s.fileName+="[]"}fileInputStr=""}var fileInput=$(fileInputStr).appendTo(form);fileInput.change(function(){obj.errorLog.html("");var fileExtensions=s.allowedTypes.toLowerCase().split(",");var fileArray=[];if(this.files){for(i=0;i"+filenameStr+" "+s.extErrorStr+s.allowedTypes+"
").appendTo(obj.errorLog);return}flist.push({name:filenameStr,size:"NA"});if(s.onSelect(flist)==false)return}updateFileCounter(s,obj);uploadLabel.unbind("click");form.hide();createCustomInputFile(obj,group,s,uploadLabel);form.addClass(group);if(s.serialize&&feature.fileapi&&feature.formdata){form.removeClass(group);var files=this.files;form.remove();serializeAndUploadFiles(s,obj,files)}else{var fileList="";for(var i=0;i
$dataProvider,
'filter' => $this->render("_search", ['model' => $searchModel]),
diff --git a/backend/views/supplier/update.php b/vendor/antgoods/goods/src/views/supplier/update.php
similarity index 53%
rename from backend/views/supplier/update.php
rename to vendor/antgoods/goods/src/views/supplier/update.php
index b2b5eec..04906ee 100644
--- a/backend/views/supplier/update.php
+++ b/vendor/antgoods/goods/src/views/supplier/update.php
@@ -3,12 +3,12 @@
use yii\helpers\Html;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Supplier */
+/* @var $model antgoods\goods\models\ars\Supplier */
-$this->title = '编辑 Supplier: ' . $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Suppliers', 'url' => ['index']];
+$this->title = '编辑供应商: ' . $model->name;
+$this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = ['label' => $model->name, 'url' => ['view', 'id' => $model->id]];
-$this->params['breadcrumbs'][] = 'Update ';
+$this->params['breadcrumbs'][] = '编辑 ';
?>
";obj.fileCounter++}if(fileArray.length==0)return;var extraData=s.formData;if(extraData){var sData=serializeData(extraData);for(var j=0;j");form.appendTo("body");ajaxFormSubmit(form,ts,pd,fileArray,obj)}function serializeAndUploadFiles(s,obj,files){for(var i=0;i"+files[i].name+" "+s.extErrorStr+s.allowedTypes+"
").appendTo(obj.errorLog);continue}if(!s.allowDuplicates&&isFileDuplicate(obj,files[i].name)){if(s.showError)$("
diff --git a/backend/views/supplier/view.php b/vendor/antgoods/goods/src/views/supplier/view.php
similarity index 72%
rename from backend/views/supplier/view.php
rename to vendor/antgoods/goods/src/views/supplier/view.php
index 9fef302..f9a1fd2 100644
--- a/backend/views/supplier/view.php
+++ b/vendor/antgoods/goods/src/views/supplier/view.php
@@ -4,10 +4,10 @@ use yii\helpers\Html;
use yii\widgets\DetailView;
/* @var $this yii\web\View */
-/* @var $model common\models\ars\Supplier */
+/* @var $model antgoods\goods\models\ars\Supplier */
$this->title = $model->name;
-$this->params['breadcrumbs'][] = ['label' => 'Suppliers', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => '供应商管理', 'url' => ['index']];
$this->params['breadcrumbs'][] = $this->title;
\yii\web\YiiAsset::register($this);
?>
@@ -25,9 +25,8 @@ $this->params['breadcrumbs'][] = $this->title;
'full_name',
'phone',
'address',
- 'is_delete',
- 'created_at',
- 'updated_at',
+ 'created_at:datetime',
+ 'updated_at:datetime',
],
]) ?>
diff --git a/vendor/iron/actions/UploadAction.php b/vendor/iron/actions/UploadAction.php
index ea250fe..384b7bc 100644
--- a/vendor/iron/actions/UploadAction.php
+++ b/vendor/iron/actions/UploadAction.php
@@ -119,7 +119,7 @@ class UploadAction extends Action
// $filePath = "$savePath/$fileName.{$fileExtension}";
// file_put_contents($filePath, $bin);
}
- return ['status' => true, 'path' => "uploads/$this->path$fileName.{$file->extension}"];
+ return ['status' => true, 'path' => "uploads/$this->path$fileName.{$file->extension}", 'alias' => $fileName . '.' . $file->extension];
} catch (\Error $e) {
throw new ServerErrorHttpException($e->getMessage());
// return ['status' => false, 'info' => $e->getMessage()];
diff --git a/vendor/iron/assets/upload/js/jquery-file-upload.min.js b/vendor/iron/assets/upload/js/jquery-file-upload.min.js
index 6788a62..3f525b1 100644
--- a/vendor/iron/assets/upload/js/jquery-file-upload.min.js
+++ b/vendor/iron/assets/upload/js/jquery-file-upload.min.js
@@ -1 +1 @@
-(function($){if($.fn.ajaxForm==undefined){$.getScript(("https:"==document.location.protocol?"https://":"http://")+"malsup.github.io/jquery.form.js")}var feature={};feature.fileapi=$("").get(0).files!==undefined;feature.formdata=window.FormData!==undefined;$.fn.uploadFile=function(options){var s=$.extend({url:"",method:"POST",enctype:"multipart/form-data",returnType:null,allowDuplicates:true,duplicateStrict:false,allowedTypes:"*",acceptFiles:"*",fileName:"file",formData:false,dynamicFormData:false,maxFileSize:-1,maxFileCount:-1,multiple:true,dragDrop:true,autoSubmit:true,showCancel:true,showAbort:true,showDone:false,showDelete:false,showError:true,showStatusAfterSuccess:true,showStatusAfterError:true,showFileCounter:true,fileCounterStyle:"). ",showFileSize:true,showProgress:false,nestedForms:true,showDownload:false,onLoad:function(obj){},onSelect:function(files){return true},onSubmit:function(files,xhr){},onSuccess:function(files,response,xhr,pd){},onError:function(files,status,message,pd){},onCancel:function(files,pd){},onAbort:function(files,pd){},downloadCallback:false,deleteCallback:false,afterUploadAll:false,serialize:true,sequential:false,sequentialCount:2,customProgressBar:false,abortButtonClass:"ajax-file-upload-abort",cancelButtonClass:"ajax-file-upload-cancel",dragDropContainerClass:"ajax-upload-dragdrop",dragDropHoverClass:"state-hover",errorClass:"ajax-file-upload-error",uploadButtonClass:"ajax-file-upload",dragDropStr:"Drag & Drop Files",uploadStr:"Upload",abortStr:"Abort",cancelStr:"Cancel",deleteStr:"Delete",doneStr:"Done",multiDragErrorStr:"Multiple File Drag & Drop is not allowed.",extErrorStr:"is not allowed. Allowed extensions: ",duplicateErrorStr:"is not allowed. File already exists.",sizeErrorStr:"is not allowed. Allowed Max size: ",uploadErrorStr:"Upload is not allowed",maxFileCountErrorStr:" is not allowed. Maximum allowed files are:",downloadStr:"Download",customErrorKeyStr:"jquery-upload-file-error",showQueueDiv:false,statusBarWidth:400,dragdropWidth:400,showPreview:false,previewHeight:"auto",previewWidth:"100%",extraHTML:false,uploadQueueOrder:"top",headers:{}},options);this.fileCounter=1;this.selectedFiles=0;var formGroup="ajax-file-upload-"+(new Date).getTime();this.formGroup=formGroup;this.errorLog=$("");this.responses=[];this.existingFileNames=[];if(!feature.formdata){s.dragDrop=false}if(!feature.formdata||s.maxFileCount===1){s.multiple=false}$(this).html("");var obj=this;var uploadLabel=$("1){if(s.showError)$(""+files[i].name+" "+s.extErrorStr+s.allowedTypes+"
").appendTo(obj.errorLog);continue}if(s.maxFileSize!=-1&&files[i].size>s.maxFileSize){if(s.showError)$(""+s.uploadStr+"
");$(uploadLabel).addClass(s.uploadButtonClass);(function checkAjaxFormLoaded(){if($.fn.ajaxForm){if(s.dragDrop){var dragDrop=$('').width(s.dragdropWidth);$(obj).append(dragDrop);$(dragDrop).append(uploadLabel);$(dragDrop).append($(s.dragDropStr));setDragDropHandlers(obj,s,dragDrop)}else{$(obj).append(uploadLabel)}$(obj).append(obj.errorLog);if(s.showQueueDiv)obj.container=$("#"+s.showQueueDiv);else obj.container=$("").insertAfter($(obj));s.onLoad.call(this,obj);createCustomInputFile(obj,formGroup,s,uploadLabel)}else window.setTimeout(checkAjaxFormLoaded,10)})();this.startUpload=function(){$("form").each(function(i,items){if($(this).hasClass(obj.formGroup)){mainQ.push($(this))}});if(mainQ.length>=1)submitPendingUploads()};this.getFileCount=function(){return obj.selectedFiles};this.stopUpload=function(){$("."+s.abortButtonClass).each(function(i,items){if($(this).hasClass(obj.formGroup))$(this).click()});$("."+s.cancelButtonClass).each(function(i,items){if($(this).hasClass(obj.formGroup))$(this).click()})};this.cancelAll=function(){$("."+s.cancelButtonClass).each(function(i,items){if($(this).hasClass(obj.formGroup))$(this).click()})};this.update=function(settings){s=$.extend(s,settings);if(settings.hasOwnProperty("url")){$("form").each(function(i,items){$(this).attr("action",settings["url"])})}};this.enqueueFile=function(file){if(!(file instanceof File))return;var files=[file];serializeAndUploadFiles(s,obj,files)};this.reset=function(removeStatusBars){obj.fileCounter=1;obj.selectedFiles=0;obj.errorLog.html("");if(removeStatusBars!=false){obj.container.html("")}};this.remove=function(){obj.container.html("");$(obj).remove()};this.createProgress=function(filename,filepath,filesize){var pd=new createProgressDiv(this,s);pd.progressDiv.show();pd.progressbar.width("100%");var fileNameStr="";if(s.showFileCounter)fileNameStr=obj.fileCounter+s.fileCounterStyle+filename;else fileNameStr=filename;if(s.showFileSize)fileNameStr+=" ("+getSizeStr(filesize)+")";pd.filename.html(fileNameStr);obj.fileCounter++;obj.selectedFiles++;if(s.showPreview){pd.preview.attr("src",filepath);pd.preview.show()}if(s.showDownload){pd.download.show();pd.download.click(function(){if(s.downloadCallback)s.downloadCallback.call(obj,[filename],pd)})}if(s.showDelete){pd.del.show();pd.del.click(function(){pd.statusbar.hide().remove();var arr=[filename];if(s.deleteCallback)s.deleteCallback.call(this,arr,pd);obj.selectedFiles-=1;updateFileCounter(s,obj)})}return pd};this.getResponses=function(){return this.responses};var mainQ=[];var progressQ=[];var running=false;function submitPendingUploads(){if(running)return;running=true;(function checkPendingForms(){if(!s.sequential)s.sequentialCount=99999;if(mainQ.length==0&&progressQ.length==0){if(s.afterUploadAll)s.afterUploadAll(obj);running=false}else{if(progressQ.length"+s.multiDragErrorStr+"
").appendTo(obj.errorLog);return}if(s.onSelect(files)==false)return;serializeAndUploadFiles(s,obj,files)});ddObj.on("dragleave",function(e){$(this).removeClass(s.dragDropHoverClass)});$(document).on("dragenter",function(e){e.stopPropagation();e.preventDefault()});$(document).on("dragover",function(e){e.stopPropagation();e.preventDefault();var that=$(this);if(!that.hasClass(s.dragDropContainerClass)){that.removeClass(s.dragDropHoverClass)}});$(document).on("drop",function(e){e.stopPropagation();e.preventDefault();$(this).removeClass(s.dragDropHoverClass)})}function getSizeStr(size){var sizeStr="";var sizeKB=size/1024;if(parseInt(sizeKB)>1024){var sizeMB=sizeKB/1024;sizeStr=sizeMB.toFixed(2)+" MB"}else{sizeStr=sizeKB.toFixed(2)+" KB"}return sizeStr}function serializeData(extraData){var serialized=[];if(jQuery.type(extraData)=="string"){serialized=extraData.split("&")}else{serialized=$.param(extraData).split("&")}var len=serialized.length;var result=[];var i,part;for(i=0;i"+files[i].name+" "+s.sizeErrorStr+getSizeStr(s.maxFileSize)+"
").appendTo(obj.errorLog);continue}fd.append(fileName+"[]",files[i]);fileArray.push(files[i].name);fileListStr+=obj.fileCounter+"). "+files[i].name+"";obj.fileCounter++}if(fileArray.length==0)return;var extraData=s.formData;if(extraData){var sData=serializeData(extraData);for(var j=0;j
"+files[i].name+" "+s.duplicateErrorStr+"
").appendTo(obj.errorLog);continue}if(s.maxFileSize!=-1&&files[i].size>s.maxFileSize){if(s.showError)$(""+files[i].name+" "+s.sizeErrorStr+getSizeStr(s.maxFileSize)+"
").appendTo(obj.errorLog);continue}if(s.maxFileCount!=-1&&obj.selectedFiles>=s.maxFileCount){if(s.showError)$(""+files[i].name+" "+s.maxFileCountErrorStr+s.maxFileCount+"
").appendTo(obj.errorLog);continue}obj.selectedFiles++;obj.existingFileNames.push(files[i].name);var ts=$.extend({},s);var fd=new FormData;var fileName=s.fileName.replace("[]","");fd.append(fileName,files[i]);var extraData=s.formData;if(extraData){var sData=serializeData(extraData);for(var j=0;j";obj.fileCounter++}if(s.maxFileCount!=-1&&obj.selectedFiles+fileArray.length>s.maxFileCount){if(s.showError)$("
"+fileList+" "+s.maxFileCountErrorStr+s.maxFileCount+"
").appendTo(obj.errorLog);return}obj.selectedFiles+=fileArray.length;var pd=new createProgressDiv(obj,s);pd.filename.html(fileList);ajaxFormSubmit(form,s,pd,fileArray,obj,null)}});if(s.nestedForms){form.css({margin:0,padding:0});uploadLabel.css({position:"relative",overflow:"hidden",cursor:"default"});fileInput.css({position:"absolute",cursor:"pointer",top:"0px",width:"100%",height:"100%",left:"0px","z-index":"100",opacity:"0.0",filter:"alpha(opacity=0)","-ms-filter":"alpha(opacity=0)","-khtml-opacity":"0.0","-moz-opacity":"0.0"});form.appendTo(uploadLabel)}else{form.appendTo($("body"));form.css({margin:0,padding:0,display:"block",position:"absolute",left:"-250px"});if(navigator.appVersion.indexOf("MSIE ")!=-1){uploadLabel.attr("for",fileUploadId)}else{uploadLabel.click(function(){fileInput.click()})}}}function defaultProgressBar(obj,s){this.statusbar=$("").width(s.statusBarWidth);this.preview=$("").appendTo(this.statusbar).hide();this.progressbar=$("").appendTo(this.progressDiv);this.abort=$(""+s.uploadErrorStr+"
");pd.cancel.show();form.remove();pd.cancel.click(function(){mainQ.splice(mainQ.indexOf(form),1);removeExistingFileName(obj,fileArray);pd.statusbar.remove();s.onCancel.call(obj,fileArray,pd);obj.selectedFiles-=fileArray.length;updateFileCounter(s,obj)});return false},beforeSend:function(xhr,o){for(var key in o.headers){xhr.setRequestHeader(key,o.headers[key])}pd.progressDiv.show();pd.cancel.hide();pd.done.hide();if(s.showAbort){pd.abort.show();pd.abort.click(function(){removeExistingFileName(obj,fileArray);xhr.abort();obj.selectedFiles-=fileArray.length;s.onAbort.call(obj,fileArray,pd)})}if(!feature.formdata){pd.progressbar.width("5%")}else pd.progressbar.width("1%")},uploadProgress:function(event,position,total,percentComplete){if(percentComplete>98)percentComplete=98;var percentVal=percentComplete+"%";if(percentComplete>1)pd.progressbar.width(percentVal);if(s.showProgress){pd.progressbar.html(percentVal);pd.progressbar.css("text-align","center")}},success:function(data,message,xhr){pd.cancel.remove();progressQ.pop();if(s.returnType=="json"&&$.type(data)=="object"&&data.hasOwnProperty(s.customErrorKeyStr)){pd.abort.hide();var msg=data[s.customErrorKeyStr];s.onError.call(this,fileArray,200,msg,pd);if(s.showStatusAfterError){pd.progressDiv.hide();pd.statusbar.append("ERROR: "+msg+"")}else{pd.statusbar.hide();pd.statusbar.remove()}obj.selectedFiles-=fileArray.length;form.remove();return}obj.responses.push(data);pd.progressbar.width("100%");if(s.showProgress){pd.progressbar.html("100%");pd.progressbar.css("text-align","center")}pd.abort.hide();s.onSuccess.call(this,fileArray,data,xhr,pd);if(s.showStatusAfterSuccess){if(s.showDone){pd.done.show();pd.done.click(function(){pd.statusbar.hide("slow");pd.statusbar.remove()})}else{pd.done.hide()}if(s.showDelete){pd.del.show();pd.del.click(function(){removeExistingFileName(obj,fileArray);pd.statusbar.hide().remove();if(s.deleteCallback)s.deleteCallback.call(this,data,pd);obj.selectedFiles-=fileArray.length;updateFileCounter(s,obj)})}else{pd.del.hide()}}else{pd.statusbar.hide("slow");pd.statusbar.remove()}if(s.showDownload){pd.download.show();pd.download.click(function(){if(s.downloadCallback)s.downloadCallback(data,pd)})}form.remove()},error:function(xhr,status,errMsg){pd.cancel.remove();progressQ.pop();pd.abort.hide();if(xhr.statusText=="abort"){pd.statusbar.hide("slow").remove();updateFileCounter(s,obj)}else{s.onError.call(this,fileArray,status,errMsg,pd);if(s.showStatusAfterError){pd.progressDiv.hide();pd.statusbar.append("ERROR: "+errMsg+"")}else{pd.statusbar.hide();pd.statusbar.remove()}obj.selectedFiles-=fileArray.length}form.remove()}};if(s.showPreview&&file!=null){if(file.type.toLowerCase().split("/").shift()=="image")getSrcToPreview(file,pd.preview)}if(s.autoSubmit){form.ajaxForm(options);mainQ.push(form);submitPendingUploads()}else{if(s.showCancel){pd.cancel.show();pd.cancel.click(function(){mainQ.splice(mainQ.indexOf(form),1);removeExistingFileName(obj,fileArray);form.remove();pd.statusbar.remove();s.onCancel.call(obj,fileArray,pd);obj.selectedFiles-=fileArray.length;updateFileCounter(s,obj)})}form.ajaxForm(options)}}return this};var getUrlParameter=function getUrlParameter(sParam){var sPageURL=window.location.search.substring(1),sURLVariables=sPageURL.split("&"),sParameterName,i;for(i=0;i"+s.abortStr+"
").appendTo(this.statusbar).hide();this.cancel=$(""+s.cancelStr+"
").appendTo(this.statusbar).hide();this.done=$(""+s.doneStr+"
").appendTo(this.statusbar).hide();this.download=$(""+s.downloadStr+"
").appendTo(this.statusbar).hide();this.del=$(""+s.deleteStr+"
").appendTo(this.statusbar).hide();this.abort.addClass("ajax-file-upload-red");this.done.addClass("ajax-file-upload-green");this.download.addClass("ajax-file-upload-green");this.cancel.addClass("ajax-file-upload-red");this.del.addClass("ajax-file-upload-red");return this}function createProgressDiv(obj,s){var bar=null;if(s.customProgressBar)bar=new s.customProgressBar(obj,s);else bar=new defaultProgressBar(obj,s);bar.abort.addClass(obj.formGroup);bar.abort.addClass(s.abortButtonClass);bar.cancel.addClass(obj.formGroup);bar.cancel.addClass(s.cancelButtonClass);if(s.extraHTML)bar.extraHTML=$(""+s.extraHTML()+"
").insertAfter(bar.filename);if(s.uploadQueueOrder=="bottom")$(obj.container).append(bar.statusbar);else $(obj.container).prepend(bar.statusbar);return bar}function ajaxFormSubmit(form,s,pd,fileArray,obj,file){var currentXHR=null;var options={cache:false,contentType:false,processData:false,forceSync:false,type:s.method,data:s.formData,formData:s.fileData,dataType:s.returnType,headers:s.headers,beforeSubmit:function(formData,$form,options){if(s.onSubmit.call(this,fileArray)!=false){if(s.dynamicFormData){var sData=serializeData(s.dynamicFormData());if(sData){for(var j=0;j"+s.uploadStr+"
");$(uploadLabel).addClass(s.uploadButtonClass);(function checkAjaxFormLoaded(){if($.fn.ajaxForm){if(s.dragDrop){var dragDrop=$('').width(s.dragdropWidth);$(obj).append(dragDrop);$(dragDrop).append(uploadLabel);$(dragDrop).append($(s.dragDropStr));setDragDropHandlers(obj,s,dragDrop)}else{$(obj).append(uploadLabel)}$(obj).append(obj.errorLog);if(s.showQueueDiv)obj.container=$("#"+s.showQueueDiv);else obj.container=$("").insertAfter($(obj));s.onLoad.call(this,obj);createCustomInputFile(obj,formGroup,s,uploadLabel)}else window.setTimeout(checkAjaxFormLoaded,10)})();this.startUpload=function(){$("form").each(function(i,items){if($(this).hasClass(obj.formGroup)){mainQ.push($(this))}});if(mainQ.length>=1)submitPendingUploads()};this.getFileCount=function(){return obj.selectedFiles};this.stopUpload=function(){$("."+s.abortButtonClass).each(function(i,items){if($(this).hasClass(obj.formGroup))$(this).click()});$("."+s.cancelButtonClass).each(function(i,items){if($(this).hasClass(obj.formGroup))$(this).click()})};this.cancelAll=function(){$("."+s.cancelButtonClass).each(function(i,items){if($(this).hasClass(obj.formGroup))$(this).click()})};this.update=function(settings){s=$.extend(s,settings);if(settings.hasOwnProperty("url")){$("form").each(function(i,items){$(this).attr("action",settings["url"])})}};this.enqueueFile=function(file){if(!(file instanceof File))return;var files=[file];serializeAndUploadFiles(s,obj,files)};this.reset=function(removeStatusBars){obj.fileCounter=1;obj.selectedFiles=0;obj.errorLog.html("");if(removeStatusBars!=false){obj.container.html("")}};this.remove=function(){obj.container.html("");$(obj).remove()};this.createProgress=function(filename,filepath,filesize){var pd=new createProgressDiv(this,s);pd.progressDiv.show();pd.progressbar.width("100%");var fileNameStr="";if(s.showFileCounter)fileNameStr=obj.fileCounter+s.fileCounterStyle+filename;else fileNameStr=filename;if(s.showFileSize)fileNameStr+=" ("+getSizeStr(filesize)+")";pd.filename.html(fileNameStr);obj.fileCounter++;obj.selectedFiles++;if(s.showPreview){pd.preview.attr("src",filepath);pd.preview.show()}if(s.showDownload){pd.download.show();pd.download.click(function(){if(s.downloadCallback)s.downloadCallback.call(obj,[filename],pd)})}if(s.showDelete){pd.del.show();pd.del.click(function(){pd.statusbar.hide().remove();var arr=[filename];if(s.deleteCallback)s.deleteCallback.call(this,arr,pd);obj.selectedFiles-=1;updateFileCounter(s,obj)})}return pd};this.getResponses=function(){return this.responses};var mainQ=[];var progressQ=[];var running=false;function submitPendingUploads(){if(running)return;running=true;(function checkPendingForms(){if(!s.sequential)s.sequentialCount=99999;if(mainQ.length==0&&progressQ.length==0){if(s.afterUploadAll)s.afterUploadAll(obj);running=false}else{if(progressQ.length"+s.multiDragErrorStr+"
").appendTo(obj.errorLog);return}if(s.onSelect(files)==false)return;serializeAndUploadFiles(s,obj,files)});ddObj.on("dragleave",function(e){$(this).removeClass(s.dragDropHoverClass)});$(document).on("dragenter",function(e){e.stopPropagation();e.preventDefault()});$(document).on("dragover",function(e){e.stopPropagation();e.preventDefault();var that=$(this);if(!that.hasClass(s.dragDropContainerClass)){that.removeClass(s.dragDropHoverClass)}});$(document).on("drop",function(e){e.stopPropagation();e.preventDefault();$(this).removeClass(s.dragDropHoverClass)})}function getSizeStr(size){var sizeStr="";var sizeKB=size/1024;if(parseInt(sizeKB)>1024){var sizeMB=sizeKB/1024;sizeStr=sizeMB.toFixed(2)+" MB"}else{sizeStr=sizeKB.toFixed(2)+" KB"}return sizeStr}function serializeData(extraData){var serialized=[];if(jQuery.type(extraData)=="string"){serialized=extraData.split("&")}else{serialized=$.param(extraData).split("&")}var len=serialized.length;var result=[];var i,part;for(i=0;i"+files[i].name+" "+s.sizeErrorStr+getSizeStr(s.maxFileSize)+"
").appendTo(obj.errorLog);continue}fd.append(fileName+"[]",files[i]);fileArray.push(files[i].name);fileListStr+=obj.fileCounter+"). "+files[i].name+"";obj.fileCounter++}if(fileArray.length==0)return;var extraData=s.formData;if(extraData){var sData=serializeData(extraData);for(var j=0;j
"+files[i].name+" "+s.duplicateErrorStr+"
").appendTo(obj.errorLog);continue}if(s.maxFileSize!=-1&&files[i].size>s.maxFileSize){if(s.showError)$(""+files[i].name+" "+s.sizeErrorStr+getSizeStr(s.maxFileSize)+"
").appendTo(obj.errorLog);continue}if(s.maxFileCount!=-1&&obj.selectedFiles>=s.maxFileCount){if(s.showError)$(""+files[i].name+" "+s.maxFileCountErrorStr+s.maxFileCount+"
").appendTo(obj.errorLog);continue}obj.selectedFiles++;obj.existingFileNames.push(files[i].name);var ts=$.extend({},s);var fd=new FormData;var fileName=s.fileName.replace("[]","");fd.append(fileName,files[i]);var extraData=s.formData;if(extraData){var sData=serializeData(extraData);for(var j=0;j";obj.fileCounter++}if(s.maxFileCount!=-1&&obj.selectedFiles+fileArray.length>s.maxFileCount){if(s.showError)$("
"+fileList+" "+s.maxFileCountErrorStr+s.maxFileCount+"
").appendTo(obj.errorLog);return}obj.selectedFiles+=fileArray.length;var pd=new createProgressDiv(obj,s);pd.filename.html(fileList);ajaxFormSubmit(form,s,pd,fileArray,obj,null)}});if(s.nestedForms){form.css({margin:0,padding:0});uploadLabel.css({position:"relative",overflow:"hidden",cursor:"default"});fileInput.css({position:"absolute",cursor:"pointer",top:"0px",width:"100%",height:"100%",left:"0px","z-index":"100",opacity:"0.0",filter:"alpha(opacity=0)","-ms-filter":"alpha(opacity=0)","-khtml-opacity":"0.0","-moz-opacity":"0.0"});form.appendTo(uploadLabel)}else{form.appendTo($("body"));form.css({margin:0,padding:0,display:"block",position:"absolute",left:"-250px"});if(navigator.appVersion.indexOf("MSIE ")!=-1){uploadLabel.attr("for",fileUploadId)}else{uploadLabel.click(function(){fileInput.click()})}}}function defaultProgressBar(obj,s){this.statusbar=$("").width(s.statusBarWidth);this.preview=$("").appendTo(this.statusbar).hide();this.progressbar=$("").appendTo(this.progressDiv);this.abort=$(""+s.uploadErrorStr+"
");pd.cancel.show();form.remove();pd.cancel.click(function(){mainQ.splice(mainQ.indexOf(form),1);removeExistingFileName(obj,fileArray);pd.statusbar.remove();s.onCancel.call(obj,fileArray,pd);obj.selectedFiles-=fileArray.length;updateFileCounter(s,obj)});return false},beforeSend:function(xhr,o){for(var key in o.headers){xhr.setRequestHeader(key,o.headers[key])}pd.progressDiv.show();pd.cancel.hide();pd.done.hide();if(s.showAbort){pd.abort.show();pd.abort.click(function(){removeExistingFileName(obj,fileArray);xhr.abort();obj.selectedFiles-=fileArray.length;s.onAbort.call(obj,fileArray,pd)})}if(!feature.formdata){pd.progressbar.width("5%")}else pd.progressbar.width("1%")},uploadProgress:function(event,position,total,percentComplete){if(percentComplete>98)percentComplete=98;var percentVal=percentComplete+"%";if(percentComplete>1)pd.progressbar.width(percentVal);if(s.showProgress){pd.progressbar.html(percentVal);pd.progressbar.css("text-align","center")}},success:function(data,message,xhr){pd.cancel.remove();progressQ.pop();if(s.returnType=="json"&&$.type(data)=="object"&&data.hasOwnProperty(s.customErrorKeyStr)){pd.abort.hide();var msg=data[s.customErrorKeyStr];s.onError.call(this,fileArray,200,msg,pd);if(s.showStatusAfterError){pd.progressDiv.hide();pd.statusbar.append("ERROR: "+msg+"")}else{pd.statusbar.hide();pd.statusbar.remove()}obj.selectedFiles-=fileArray.length;form.remove();return}obj.responses.push(data);pd.progressbar.width("100%");if(s.showProgress){pd.progressbar.html("100%");pd.progressbar.css("text-align","center")}pd.abort.hide();s.onSuccess.call(this,fileArray,data,xhr,pd);if(s.showStatusAfterSuccess){if(s.showDone){pd.done.show();pd.done.click(function(){pd.statusbar.hide("slow");pd.statusbar.remove()})}else{pd.done.hide()}if(s.showDelete){pd.del.show();pd.del.click(function(){removeExistingFileName(obj,fileArray);pd.statusbar.hide().remove();if(s.deleteCallback)s.deleteCallback.call(this,data,pd);obj.selectedFiles-=fileArray.length;updateFileCounter(s,obj)})}else{pd.del.hide()}}else{pd.statusbar.hide("slow");pd.statusbar.remove()}if(s.showDownload){pd.download.show();pd.download.click(function(){if(s.downloadCallback)s.downloadCallback(data,pd)})}form.remove()},error:function(xhr,status,errMsg){pd.cancel.remove();progressQ.pop();pd.abort.hide();if(xhr.statusText=="abort"){pd.statusbar.hide("slow").remove();updateFileCounter(s,obj)}else{s.onError.call(this,fileArray,status,errMsg,pd);if(s.showStatusAfterError){pd.progressDiv.hide();pd.statusbar.append("ERROR: "+errMsg+"")}else{pd.statusbar.hide();pd.statusbar.remove()}obj.selectedFiles-=fileArray.length}form.remove()}};if(s.showPreview&&file!=null){if(file.type.toLowerCase().split("/").shift()=="image")getSrcToPreview(file,pd.preview)}if(s.autoSubmit){form.ajaxForm(options);mainQ.push(form);submitPendingUploads()}else{if(s.showCancel){pd.cancel.show();pd.cancel.click(function(){mainQ.splice(mainQ.indexOf(form),1);removeExistingFileName(obj,fileArray);form.remove();pd.statusbar.remove();s.onCancel.call(obj,fileArray,pd);obj.selectedFiles-=fileArray.length;updateFileCounter(s,obj)})}form.ajaxForm(options)}}return this};var getUrlParameter=function getUrlParameter(sParam){var sPageURL=window.location.search.substring(1),sURLVariables=sPageURL.split("&"),sParameterName,i;for(i=0;i"+s.abortStr+"
").appendTo(this.statusbar).hide();this.cancel=$(""+s.cancelStr+"
").appendTo(this.statusbar).hide();this.done=$(""+s.doneStr+"
").appendTo(this.statusbar).hide();this.download=$(""+s.downloadStr+"
").appendTo(this.statusbar).hide();this.del=$(""+s.deleteStr+"
").appendTo(this.statusbar).hide();this.abort.addClass("ajax-file-upload-red");this.done.addClass("ajax-file-upload-green");this.download.addClass("ajax-file-upload-green");this.cancel.addClass("ajax-file-upload-red");this.del.addClass("ajax-file-upload-red");return this}function createProgressDiv(obj,s){var bar=null;if(s.customProgressBar)bar=new s.customProgressBar(obj,s);else bar=new defaultProgressBar(obj,s);bar.abort.addClass(obj.formGroup);bar.abort.addClass(s.abortButtonClass);bar.cancel.addClass(obj.formGroup);bar.cancel.addClass(s.cancelButtonClass);if(s.extraHTML)bar.extraHTML=$(""+s.extraHTML()+"
").insertAfter(bar.filename);if(s.uploadQueueOrder=="bottom")$(obj.container).append(bar.statusbar);else $(obj.container).prepend(bar.statusbar);return bar}function ajaxFormSubmit(form,s,pd,fileArray,obj,file){var currentXHR=null;var options={cache:false,contentType:false,processData:false,forceSync:false,type:s.method,data:s.formData,formData:s.fileData,dataType:s.returnType,headers:s.headers,beforeSubmit:function(formData,$form,options){if(s.onSubmit.call(this,fileArray)!=false){if(s.dynamicFormData){var sData=serializeData(s.dynamicFormData());if(sData){for(var j=0;j
-
-
- Drag & Drop Files
-
- ';
+ return '
+
+
+
+ Drag & Drop Files
+
+
+
';
+ }
+
+ /**
+ * @param $model
+ * @param $attribute
+ * @return string
+ * 获取要填入属性的输入框name
+ */
+ private static function getInputName($model, $attribute)
+ {
+ $formName = $model->formName();
+ if (!preg_match(static::$attributeRegex, $attribute, $matches)) {
+ throw new InvalidArgumentException('Attribute name must contain word characters only.');
+ }
+ $prefix = $matches[1];
+ $attribute = $matches[2];
+ $suffix = $matches[3];
+ if ($formName === '' && $prefix === '') {
+ return $attribute . $suffix;
+ } elseif ($formName !== '') {
+ return $formName . $prefix . "[$attribute]" . $suffix;
+ }
+
+ throw new InvalidArgumentException(get_class($model) . '::formName() cannot be empty for tabular inputs.');
+ }
+
+ /**
+ * @param $model
+ * @param $attribute
+ * @return mixed
+ * 获取要填入属性的输入框id
+ */
+ private static function getInputId($model, $attribute)
+ {
+ $charset = Yii::$app ? Yii::$app->charset : 'UTF-8';
+ $name = mb_strtolower(static::getInputName($model, $attribute), $charset);
+ return str_replace(['[]', '][', '[', ']', ' ', '.'], ['', '-', '-', '', '-', '-'], $name);
}
}
diff --git a/vendor/linyao/generators/crud/Generator.php b/vendor/linyao/generators/crud/Generator.php
deleted file mode 100644
index 5a15825..0000000
--- a/vendor/linyao/generators/crud/Generator.php
+++ /dev/null
@@ -1,555 +0,0 @@
- 'trim'],
- [['modelClass', 'controllerClass', 'baseControllerClass', 'indexWidgetType'], 'required'],
- [['searchModelClass'], 'compare', 'compareAttribute' => 'modelClass', 'operator' => '!==', 'message' => 'Search Model Class must not be equal to Model Class.'],
- [['modelClass', 'controllerClass', 'baseControllerClass', 'searchModelClass'], 'match', 'pattern' => '/^[\w\\\\]*$/', 'message' => 'Only word characters and backslashes are allowed.'],
- [['modelClass'], 'validateClass', 'params' => ['extends' => BaseActiveRecord::className()]],
- [['baseControllerClass'], 'validateClass', 'params' => ['extends' => Controller::className()]],
- [['controllerClass'], 'match', 'pattern' => '/Controller$/', 'message' => 'Controller class name must be suffixed with "Controller".'],
- [['controllerClass'], 'match', 'pattern' => '/(^|\\\\)[A-Z][^\\\\]+Controller$/', 'message' => 'Controller class name must start with an uppercase letter.'],
- [['controllerClass', 'searchModelClass'], 'validateNewClass'],
- [['indexWidgetType'], 'in', 'range' => ['grid', 'list']],
- [['modelClass'], 'validateModelClass'],
- [['enableI18N', 'enablePjax'], 'boolean'],
- [['messageCategory'], 'validateMessageCategory', 'skipOnEmpty' => false],
- ['viewPath', 'safe'],
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function attributeLabels() {
- return array_merge(parent::attributeLabels(), [
- 'modelClass' => 'Model Class',
- 'controllerClass' => 'Controller Class',
- 'viewPath' => 'View Path',
- 'baseControllerClass' => 'Base Controller Class',
- 'indexWidgetType' => 'Widget Used in Index Page',
- 'searchModelClass' => 'Search Model Class',
- 'enablePjax' => 'Enable Pjax',
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function hints() {
- return array_merge(parent::hints(), [
- 'modelClass' => 'This is the ActiveRecord class associated with the table that CRUD will be built upon.
- You should provide a fully qualified class name, e.g., app\models\Post.',
- 'controllerClass' => 'This is the name of the controller class to be generated. You should
- provide a fully qualified namespaced class (e.g. app\controllers\PostController),
- and class name should be in CamelCase with an uppercase first letter. Make sure the class
- is using the same namespace as specified by your application\'s controllerNamespace property.',
- 'viewPath' => 'Specify the directory for storing the view scripts for the controller. You may use path alias here, e.g.,
- /var/www/basic/controllers/views/post, @app/views/post. If not set, it will default
- to @app/views/ControllerID',
- 'baseControllerClass' => 'This is the class that the new CRUD controller class will extend from.
- You should provide a fully qualified class name, e.g., yii\web\Controller.',
- 'indexWidgetType' => 'This is the widget type to be used in the index page to display list of the models.
- You may choose either GridView or ListView',
- 'searchModelClass' => 'This is the name of the search model class to be generated. You should provide a fully
- qualified namespaced class name, e.g., app\models\PostSearch.',
- 'enablePjax' => 'This indicates whether the generator should wrap the GridView or ListView
- widget on the index page with yii\widgets\Pjax widget. Set this to true if you want to get
- sorting, filtering and pagination without page refreshing.',
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function requiredTemplates() {
- return ['controller.php'];
- }
-
- /**
- * {@inheritdoc}
- */
- public function stickyAttributes() {
- return array_merge(parent::stickyAttributes(), ['baseControllerClass', 'indexWidgetType']);
- }
-
- /**
- * Checks if model class is valid
- */
- public function validateModelClass() {
- /* @var $class ActiveRecord */
- $class = $this->modelClass;
- $pk = $class::primaryKey();
- if (empty($pk)) {
- $this->addError('modelClass', "The table associated with $class must have primary key(s).");
- }
- }
-
- /**
- * {@inheritdoc}
- */
- public function generate() {
- $controllerFile = Yii::getAlias('@' . str_replace('\\', '/', ltrim($this->controllerClass, '\\')) . '.php');
-
- $files = [
- new CodeFile($controllerFile, $this->render('controller.php')),
- ];
-
- if (!empty($this->searchModelClass)) {
- $searchModel = Yii::getAlias('@' . str_replace('\\', '/', ltrim($this->searchModelClass, '\\') . '.php'));
- $files[] = new CodeFile($searchModel, $this->render('search.php'));
- }
-
- $viewPath = $this->getViewPath();
- $templatePath = $this->getTemplatePath() . '/views';
- foreach (scandir($templatePath) as $file) {
- if (empty($this->searchModelClass) && $file === '_search.php') {
- continue;
- }
- if (is_file($templatePath . '/' . $file) && pathinfo($file, PATHINFO_EXTENSION) === 'php') {
- $files[] = new CodeFile("$viewPath/$file", $this->render("views/$file"));
- }
- }
-
- return $files;
- }
-
- /**
- * @return string the controller ID (without the module ID prefix)
- */
- public function getControllerID() {
- $pos = strrpos($this->controllerClass, '\\');
- $class = substr(substr($this->controllerClass, $pos + 1), 0, -10);
-
- return Inflector::camel2id($class, '-', $this->strictInflector);
- }
-
- /**
- * @return string the controller view path
- */
- public function getViewPath() {
- if (empty($this->viewPath)) {
- return Yii::getAlias('@app/views/' . $this->getControllerID());
- }
-
- return Yii::getAlias(str_replace('\\', '/', $this->viewPath));
- }
-
- /**
- * @return string
- */
- public function getNameAttribute() {
- foreach ($this->getColumnNames() as $name) {
- if (!strcasecmp($name, 'name') || !strcasecmp($name, 'title')) {
- return $name;
- }
- }
- /* @var $class \yii\db\ActiveRecord */
- $class = $this->modelClass;
- $pk = $class::primaryKey();
-
- return $pk[0];
- }
-
- /**
- * Generates code for active field
- * @param string $attribute
- * @return string
- */
- public function generateActiveField($attribute) {
- $tableSchema = $this->getTableSchema();
- if ($tableSchema === false || !isset($tableSchema->columns[$attribute])) {
- if (preg_match('/^(password|pass|passwd|passcode)$/i', $attribute)) {
- return "\$form->field(\$model, '$attribute')->passwordInput()";
- }
-
- return "\$form->field(\$model, '$attribute')";
- }
- $column = $tableSchema->columns[$attribute];
- if ($column->phpType === 'boolean') {
- return "\$form->field(\$model, '$attribute')->checkbox()";
- }
-
- if ($column->type === 'text') {
- return "\$form->field(\$model, '$attribute')->textarea(['rows' => 6])";
- }
-
- if (preg_match('/^(password|pass|passwd|passcode)$/i', $column->name)) {
- $input = 'passwordInput';
- } else {
- $input = 'textInput';
- }
-
- if (is_array($column->enumValues) && count($column->enumValues) > 0) {
- $dropDownOptions = [];
- foreach ($column->enumValues as $enumValue) {
- $dropDownOptions[$enumValue] = Inflector::humanize($enumValue);
- }
- return "\$form->field(\$model, '$attribute')->dropDownList("
- . preg_replace("/\n\s*/", ' ', VarDumper::export($dropDownOptions)) . ", ['prompt' => ''])";
- }
-
- if ($column->phpType !== 'string' || $column->size === null) {
- return "\$form->field(\$model, '$attribute')->$input()";
- }
-
- return "\$form->field(\$model, '$attribute')->$input(['maxlength' => true])";
- }
-
- /**
- * Generates column format
- * @param \yii\db\ColumnSchema $column
- * @return string
- */
- public function generateColumnFormat($column) {
- if ($column->phpType === 'boolean') {
- return 'boolean';
- }
-
- if ($column->type === 'text') {
- return 'ntext';
- }
-
- if (stripos($column->name, 'time') !== false && $column->phpType === 'integer') {
- return 'datetime';
- }
-
- if (stripos($column->name, 'email') !== false) {
- return 'email';
- }
-
- if (preg_match('/(\b|[_-])url(\b|[_-])/i', $column->name)) {
- return 'url';
- }
-
- return 'text';
- }
-
- /**
- * Generates validation rules for the search model.
- * @return array the generated validation rules
- */
- public function generateSearchRules()
- {
- if (($table = $this->getTableSchema()) === false) {
- return ["[['" . implode("', '", $this->getColumnNames()) . "'], 'safe']"];
- }
- $types = [];
- foreach ($table->columns as $column) {
- switch ($column->type) {
- case Schema::TYPE_TINYINT:
- case Schema::TYPE_SMALLINT:
- case Schema::TYPE_INTEGER:
- case Schema::TYPE_BIGINT:
- $types['integer'][] = $column->name;
- break;
- case Schema::TYPE_BOOLEAN:
- $types['boolean'][] = $column->name;
- break;
- case Schema::TYPE_FLOAT:
- case Schema::TYPE_DOUBLE:
- case Schema::TYPE_DECIMAL:
- case Schema::TYPE_MONEY:
- $types['number'][] = $column->name;
- break;
- case Schema::TYPE_DATE:
- case Schema::TYPE_TIME:
- case Schema::TYPE_DATETIME:
- case Schema::TYPE_TIMESTAMP:
- default:
- $types['safe'][] = $column->name;
- break;
- }
- }
-
- $rules = [];
- foreach ($types as $type => $columns) {
- $rules[] = "[['" . implode("', '", $columns) . "'], '$type']";
- }
-
- return $rules;
- }
-
- /**
- * @return array searchable attributes
- */
- public function getSearchAttributes()
- {
- return $this->getColumnNames();
- }
-
- /**
- * Generates the attribute labels for the search model.
- * @return array the generated attribute labels (name => label)
- */
- public function generateSearchLabels()
- {
- /* @var $model \yii\base\Model */
- $model = new $this->modelClass();
- $attributeLabels = $model->attributeLabels();
- $labels = [];
- foreach ($this->getColumnNames() as $name) {
- if (isset($attributeLabels[$name])) {
- $labels[$name] = $attributeLabels[$name];
- } else {
- if (!strcasecmp($name, 'id')) {
- $labels[$name] = 'ID';
- } else {
- $label = Inflector::camel2words($name);
- if (!empty($label) && substr_compare($label, ' id', -3, 3, true) === 0) {
- $label = substr($label, 0, -3) . ' ID';
- }
- $labels[$name] = $label;
- }
- }
- }
-
- return $labels;
- }
-
- /**
- * Generates search conditions
- * @return array
- */
- public function generateSearchConditions()
- {
- $columns = [];
- if (($table = $this->getTableSchema()) === false) {
- $class = $this->modelClass;
- /* @var $model \yii\base\Model */
- $model = new $class();
- foreach ($model->attributes() as $attribute) {
- $columns[$attribute] = 'unknown';
- }
- } else {
- foreach ($table->columns as $column) {
- $columns[$column->name] = $column->type;
- }
- }
-
- $likeConditions = [];
- $hashConditions = [];
- foreach ($columns as $column => $type) {
- switch ($type) {
- case Schema::TYPE_TINYINT:
- case Schema::TYPE_SMALLINT:
- case Schema::TYPE_INTEGER:
- case Schema::TYPE_BIGINT:
- case Schema::TYPE_BOOLEAN:
- case Schema::TYPE_FLOAT:
- case Schema::TYPE_DOUBLE:
- case Schema::TYPE_DECIMAL:
- case Schema::TYPE_MONEY:
- case Schema::TYPE_DATE:
- case Schema::TYPE_TIME:
- case Schema::TYPE_DATETIME:
- case Schema::TYPE_TIMESTAMP:
- $hashConditions[] = "'{$column}' => \$this->{$column},";
- break;
- default:
- $likeKeyword = $this->getClassDbDriverName() === 'pgsql' ? 'ilike' : 'like';
- $likeConditions[] = "->andFilterWhere(['{$likeKeyword}', '{$column}', \$this->{$column}])";
- break;
- }
- }
-
- $conditions = [];
- if (!empty($hashConditions)) {
- $conditions[] = "\$query->andFilterWhere([\n"
- . str_repeat(' ', 12) . implode("\n" . str_repeat(' ', 12), $hashConditions)
- . "\n" . str_repeat(' ', 8) . "]);\n";
- }
- if (!empty($likeConditions)) {
- $conditions[] = "\$query" . implode("\n" . str_repeat(' ', 12), $likeConditions) . ";\n";
- }
-
- return $conditions;
- }
-
- /**
- * Generates URL parameters
- * @return string
- */
- public function generateUrlParams() {
- /* @var $class ActiveRecord */
- $class = $this->modelClass;
- $pks = $class::primaryKey();
- if (count($pks) === 1) {
- if (is_subclass_of($class, 'yii\mongodb\ActiveRecord')) {
- return "'id' => (string)\$model->{$pks[0]}";
- }
-
- return "'id' => \$model->{$pks[0]}";
- }
-
- $params = [];
- foreach ($pks as $pk) {
- if (is_subclass_of($class, 'yii\mongodb\ActiveRecord')) {
- $params[] = "'$pk' => (string)\$model->$pk";
- } else {
- $params[] = "'$pk' => \$model->$pk";
- }
- }
-
- return implode(', ', $params);
- }
-
- /**
- * Generates action parameters
- * @return string
- */
- public function generateActionParams() {
- /* @var $class ActiveRecord */
- $class = $this->modelClass;
- $pks = $class::primaryKey();
- if (count($pks) === 1) {
- return '$id';
- }
-
- return '$' . implode(', $', $pks);
- }
-
- /**
- * Generates parameter tags for phpdoc
- * @return array parameter tags for phpdoc
- */
- public function generateActionParamComments() {
- /* @var $class ActiveRecord */
- $class = $this->modelClass;
- $pks = $class::primaryKey();
- if (($table = $this->getTableSchema()) === false) {
- $params = [];
- foreach ($pks as $pk) {
- $params[] = '@param ' . (strtolower(substr($pk, -2)) === 'id' ? 'integer' : 'string') . ' $' . $pk;
- }
-
- return $params;
- }
- if (count($pks) === 1) {
- return ['@param ' . $table->columns[$pks[0]]->phpType . ' $id'];
- }
-
- $params = [];
- foreach ($pks as $pk) {
- $params[] = '@param ' . $table->columns[$pk]->phpType . ' $' . $pk;
- }
-
- return $params;
- }
-
- /**
- * Returns table schema for current model class or false if it is not an active record
- * @return bool|\yii\db\TableSchema
- */
- public function getTableSchema() {
- /* @var $class ActiveRecord */
- $class = $this->modelClass;
- if (is_subclass_of($class, 'yii\db\ActiveRecord')) {
- return $class::getTableSchema();
- }
-
- return false;
- }
-
- /**
- * @return array model column names
- */
- public function getColumnNames() {
- /* @var $class ActiveRecord */
- $class = $this->modelClass;
- if (is_subclass_of($class, 'yii\db\ActiveRecord')) {
- return $class::getTableSchema()->getColumnNames();
- }
-
- /* @var $model \yii\base\Model */
- $model = new $class();
-
- return $model->attributes();
- }
-
- /**
- * @return string|null driver name of modelClass db connection.
- * In case db is not instance of \yii\db\Connection null will be returned.
- * @since 2.0.6
- */
- protected function getClassDbDriverName() {
- /* @var $class ActiveRecord */
- $class = $this->modelClass;
- $db = $class::getDb();
- return $db instanceof \yii\db\Connection ? $db->driverName : null;
- }
-
-}
diff --git a/vendor/linyao/generators/crud/default/controller.php b/vendor/linyao/generators/crud/default/controller.php
deleted file mode 100644
index b7049e7..0000000
--- a/vendor/linyao/generators/crud/default/controller.php
+++ /dev/null
@@ -1,179 +0,0 @@
-controllerClass);
-$modelClass = StringHelper::basename($generator->modelClass);
-$searchModelClass = StringHelper::basename($generator->searchModelClass);
-if ($modelClass === $searchModelClass) {
- $searchModelAlias = $searchModelClass . 'Search';
-}
-
-/* @var $class ActiveRecordInterface */
-$class = $generator->modelClass;
-$pks = $class::primaryKey();
-$urlParams = $generator->generateUrlParams();
-$actionParams = $generator->generateActionParams();
-$actionParamComments = $generator->generateActionParamComments();
-
-echo "
-
-namespace controllerClass, '\\')) ?>;
-
-use Yii;
-use modelClass, '\\') ?>;
-searchModelClass)): ?>
-use searchModelClass, '\\') . (isset($searchModelAlias) ? " as $searchModelAlias" : "") ?>;
-
-use yii\data\ActiveDataProvider;
-
-use baseControllerClass, '\\') ?>;
-use yii\web\NotFoundHttpException;
-use yii\filters\VerbFilter;
-
-/**
- * implements the CRUD actions for model.
- */
-class extends baseControllerClass) . "\n" ?>
-{
- /**
- * {@inheritdoc}
- */
- public function behaviors()
- {
- return [
- 'verbs' => [
- 'class' => VerbFilter::className(),
- 'actions' => [
- 'delete' => ['POST'],
- ],
- ],
- ];
- }
-
- /**
- * Lists all models.
- * @return mixed
- */
- public function actionIndex()
- {
-searchModelClass)): ?>
- $searchModel = new ();
- $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
-
- return $this->render('index', [
- 'searchModel' => $searchModel,
- 'dataProvider' => $dataProvider,
- ]);
-
- $dataProvider = new ActiveDataProvider([
- 'query' => ::find(),
- ]);
-
- return $this->render('index', [
- 'dataProvider' => $dataProvider,
- ]);
-
- }
-
- /**
- * Displays a single model.
- *
- * @return mixed
- * @throws NotFoundHttpException if the model cannot be found
- */
- public function actionView()
- {
- return $this->render('view', [
- 'model' => $this->findModel(),
- ]);
- }
-
- /**
- * Creates a new model.
- * If creation is successful, the browser will be redirected to the 'view' page.
- * @return mixed
- */
- public function actionCreate()
- {
- $model = new ();
-
- if ($model->load(Yii::$app->request->post()) && $model->save()) {
- return $this->redirect(['view', ]);
- }
-
- return $this->render('create', [
- 'model' => $model,
- ]);
- }
-
- /**
- * Updates an existing model.
- * If update is successful, the browser will be redirected to the 'view' page.
- *
- * @return mixed
- * @throws NotFoundHttpException if the model cannot be found
- */
- public function actionUpdate()
- {
- $model = $this->findModel();
-
- if ($model->load(Yii::$app->request->post()) && $model->save()) {
- return $this->redirect(['view', ]);
- }
-
- return $this->render('update', [
- 'model' => $model,
- ]);
- }
-
- /**
- * Deletes an existing model.
- * If deletion is successful, the browser will be redirected to the 'index' page.
- *
- * @return mixed
- * @throws NotFoundHttpException if the model cannot be found
- */
- public function actionDelete()
- {
- $this->findModel()->delete();
-
- return $this->redirect(['index']);
- }
-
- /**
- * Finds the model based on its primary key value.
- * If the model is not found, a 404 HTTP exception will be thrown.
- *
- * @return the loaded model
- * @throws NotFoundHttpException if the model cannot be found
- */
- protected function findModel()
- {
- \$$pk";
- }
- $condition = '[' . implode(', ', $condition) . ']';
-}
-?>
- if (($model = ::findOne()) !== null) {
- return $model;
- }
-
- throw new NotFoundHttpException(generateString('The requested page does not exist.') ?>);
- }
-}
diff --git a/vendor/linyao/generators/crud/default/search.php b/vendor/linyao/generators/crud/default/search.php
deleted file mode 100644
index 0ca91d4..0000000
--- a/vendor/linyao/generators/crud/default/search.php
+++ /dev/null
@@ -1,86 +0,0 @@
-modelClass);
-$searchModelClass = StringHelper::basename($generator->searchModelClass);
-if ($modelClass === $searchModelClass) {
- $modelAlias = $modelClass . 'Model';
-}
-$rules = $generator->generateSearchRules();
-$labels = $generator->generateSearchLabels();
-$searchAttributes = $generator->getSearchAttributes();
-$searchConditions = $generator->generateSearchConditions();
-
-echo "
-
-namespace searchModelClass, '\\')) ?>;
-
-use yii\base\Model;
-use yii\data\ActiveDataProvider;
-use modelClass, '\\') . (isset($modelAlias) ? " as $modelAlias" : "") ?>;
-
-/**
- * represents the model behind the search form of `modelClass ?>`.
- */
-class extends
-
-{
- /**
- * {@inheritdoc}
- */
- public function rules()
- {
- return [
- ,
- ];
- }
-
- /**
- * {@inheritdoc}
- */
- public function scenarios()
- {
- // bypass scenarios() implementation in the parent class
- return Model::scenarios();
- }
-
- /**
- * Creates data provider instance with search query applied
- *
- * @param array $params
- *
- * @return ActiveDataProvider
- */
- public function search($params)
- {
- $query = ::find();
-
- // add conditions that should always apply here
-
- $dataProvider = new ActiveDataProvider([
- 'query' => $query,
- ]);
-
- $this->load($params);
-
- if (!$this->validate()) {
- // uncomment the following line if you do not want to return any records when validation fails
- // $query->where('0=1');
- return $dataProvider;
- }
-
- // grid filtering conditions
-
-
- return $dataProvider;
- }
-}
diff --git a/vendor/linyao/generators/crud/default/views/_form.php b/vendor/linyao/generators/crud/default/views/_form.php
deleted file mode 100644
index b370036..0000000
--- a/vendor/linyao/generators/crud/default/views/_form.php
+++ /dev/null
@@ -1,43 +0,0 @@
-modelClass();
-$safeAttributes = $model->safeAttributes();
-if (empty($safeAttributes)) {
- $safeAttributes = $model->attributes();
-}
-
-echo "
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model modelClass, '\\') ?> */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-
-
- $form = ActiveForm::begin(); ?>
-
-getColumnNames() as $attribute) {
- if (in_array($attribute, $safeAttributes)) {
- echo " generateActiveField($attribute) . " ?>\n\n";
- }
-} ?>
-
diff --git a/vendor/linyao/generators/crud/default/views/_search.php b/vendor/linyao/generators/crud/default/views/_search.php
deleted file mode 100644
index e7efb17..0000000
--- a/vendor/linyao/generators/crud/default/views/_search.php
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-use yii\helpers\Html;
-use yii\widgets\ActiveForm;
-
-/* @var $this yii\web\View */
-/* @var $model searchModelClass, '\\') ?> */
-/* @var $form yii\widgets\ActiveForm */
-?>
-
-$form = ActiveForm::begin([
- 'action' => ['index'],
- 'method' => 'get',
- 'validateOnType' => true,
- ]);
-?>
-
- Html::submitButton(generateString('保存') ?>, ['class' => 'btn btn-success']) ?>
- Html::a(generateString('返回') ?>, ['index'], ['class' => 'btn btn-info']) ?>
-
-
- ActiveForm::end(); ?>
-
-
-
-ActiveForm::end(); ?>
\ No newline at end of file
diff --git a/vendor/linyao/generators/crud/default/views/create.php b/vendor/linyao/generators/crud/default/views/create.php
deleted file mode 100644
index af66141..0000000
--- a/vendor/linyao/generators/crud/default/views/create.php
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-use yii\helpers\Html;
-
-/* @var $this yii\web\View */
-/* @var $model modelClass, '\\') ?> */
-
-$this->title = generateString('创建 ' . Inflector::camel2words(StringHelper::basename($generator->modelClass))) ?>;
-$this->params['breadcrumbs'][] = ['label' => generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
-?>
-
- $form->field($model, 'id', [
- "template" => "{input}{error}",
- "inputOptions" => [
- "placeholder" => "检索ID",
- "class" => "form-control",
- ],
- "errorOptions" => [
- "class" => "error-tips"
- ]
- ])
- ?>
-
-
- Html::submitButton('', ['class' => 'btn btn-default']) ?>
- Html::resetButton('', ['class' => 'btn btn-default']) ?>
-
-
-
- $this->render('_form', [
- 'model' => $model,
- ]) ?>
-
-
diff --git a/vendor/linyao/generators/crud/default/views/index.php b/vendor/linyao/generators/crud/default/views/index.php
deleted file mode 100644
index 3a21f39..0000000
--- a/vendor/linyao/generators/crud/default/views/index.php
+++ /dev/null
@@ -1,61 +0,0 @@
-generateUrlParams();
-$nameAttribute = $generator->getNameAttribute();
-
-echo "
-
-use yii\helpers\Html;
-use blobt\grid\GridView;
-
-/* @var $this yii\web\View */
-searchModelClass) ? "/* @var \$searchModel " . ltrim($generator->searchModelClass, '\\') . " */\n" : '' ?>
-/* @var $dataProvider yii\data\ActiveDataProvider */
-
-$this->title = generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>;
-$this->params['breadcrumbs'][] = $this->title;
-?>
-
-
\ No newline at end of file
diff --git a/vendor/linyao/generators/crud/default/views/update.php b/vendor/linyao/generators/crud/default/views/update.php
deleted file mode 100644
index 9fee001..0000000
--- a/vendor/linyao/generators/crud/default/views/update.php
+++ /dev/null
@@ -1,38 +0,0 @@
-generateUrlParams();
-$modelClassName = Inflector::camel2words(StringHelper::basename($generator->modelClass));
-$nameAttributeTemplate = '$model->' . $generator->getNameAttribute();
-$titleTemplate = $generator->generateString('编辑 ' . $modelClassName . ': {name}', ['name' => '{nameAttribute}']);
-if ($generator->enableI18N) {
- $title = strtr($titleTemplate, ['\'{nameAttribute}\'' => $nameAttributeTemplate]);
-} else {
- $title = strtr($titleTemplate, ['{nameAttribute}\'' => '\' . ' . $nameAttributeTemplate]);
-}
-
-echo "
-
-use yii\helpers\Html;
-
-/* @var $this yii\web\View */
-/* @var $model modelClass, '\\') ?> */
-
-$this->title = ;
-$this->params['breadcrumbs'][] = ['label' => generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
-$this->params['breadcrumbs'][] = ['label' => $model->getNameAttribute() ?>, 'url' => ['view', ]];
-$this->params['breadcrumbs'][] = generateString('Update ') ?>;
-?>
-
- GridView::widget([
- 'dataProvider' => $dataProvider,
- 'filter' => $this->render("_search", ['model' => $searchModel]),
- 'batch' => [
- [
- "label" => "删除",
- "url" => "controllerID?>/deletes"
- ],
- ],
- 'columns' => [
- [
- 'class' => 'blobt\grid\CheckboxColumn',
- 'width' => '2%',
- 'align' => 'center'
- ],
-getColumnNames() as $name) {
- if (++$count < 6) {
- echo " '" . $name . "',\n";
- } else {
- echo " //'" . $name . "',\n";
- }
- }
-?>
- [
- 'class' => 'blobt\grid\ActionColumn',
- 'align' => 'center'
- ],
- ]
- ]);
- " ?>
-
-
-
- $this->render('_form', [
- 'model' => $model,
- ]) ?>
-
-
diff --git a/vendor/linyao/generators/crud/default/views/view.php b/vendor/linyao/generators/crud/default/views/view.php
deleted file mode 100644
index 609d5bb..0000000
--- a/vendor/linyao/generators/crud/default/views/view.php
+++ /dev/null
@@ -1,49 +0,0 @@
-generateUrlParams();
-
-echo "
-
-use yii\helpers\Html;
-use yii\widgets\DetailView;
-
-/* @var $this yii\web\View */
-/* @var $model modelClass, '\\') ?> */
-
-$this->title = $model->getNameAttribute() ?>;
-$this->params['breadcrumbs'][] = ['label' => generateString(Inflector::pluralize(Inflector::camel2words(StringHelper::basename($generator->modelClass)))) ?>, 'url' => ['index']];
-$this->params['breadcrumbs'][] = $this->title;
-\yii\web\YiiAsset::register($this);
-?>
-
-
-
diff --git a/vendor/linyao/generators/crud/form.php b/vendor/linyao/generators/crud/form.php
deleted file mode 100644
index 4f59b8b..0000000
--- a/vendor/linyao/generators/crud/form.php
+++ /dev/null
@@ -1,17 +0,0 @@
-field($generator, 'modelClass');
-echo $form->field($generator, 'searchModelClass');
-echo $form->field($generator, 'controllerClass');
-echo $form->field($generator, 'viewPath');
-echo $form->field($generator, 'baseControllerClass');
-echo $form->field($generator, 'indexWidgetType')->dropDownList([
- 'grid' => 'GridView',
- 'list' => 'ListView',
-]);
-echo $form->field($generator, 'enableI18N')->checkbox();
-echo $form->field($generator, 'enablePjax')->checkbox();
-echo $form->field($generator, 'messageCategory');
diff --git a/vendor/linyao/generators/model/Generator.php b/vendor/linyao/generators/model/Generator.php
deleted file mode 100644
index be3097f..0000000
--- a/vendor/linyao/generators/model/Generator.php
+++ /dev/null
@@ -1,995 +0,0 @@
-
- * @since 2.0
- */
-class Generator extends \yii\gii\Generator
-{
- const RELATIONS_NONE = 'none';
- const RELATIONS_ALL = 'all';
- const RELATIONS_ALL_INVERSE = 'all-inverse';
-
- public $db = 'db';
- public $ns = 'app\models';
- public $tableName;
- public $modelClass;
- public $baseClass = 'yii\db\ActiveRecord';
- public $generateRelations = self::RELATIONS_ALL;
- public $generateRelationsFromCurrentSchema = true;
- public $generateLabelsFromComments = false;
- public $useTablePrefix = false;
- public $standardizeCapitals = false;
- public $singularize = false;
- public $useSchemaName = true;
- public $generateQuery = false;
- public $queryNs = 'app\models';
- public $queryClass;
- public $queryBaseClass = 'yii\db\ActiveQuery';
-
-
- /**
- * {@inheritdoc}
- */
- public function getName()
- {
- return 'Model Generator';
- }
-
- /**
- * {@inheritdoc}
- */
- public function getDescription()
- {
- return 'This generator generates an ActiveRecord class for the specified database table.';
- }
-
- /**
- * {@inheritdoc}
- */
- public function rules()
- {
- return array_merge(parent::rules(), [
- [['db', 'ns', 'tableName', 'modelClass', 'baseClass', 'queryNs', 'queryClass', 'queryBaseClass'], 'filter', 'filter' => 'trim'],
- [['ns', 'queryNs'], 'filter', 'filter' => function ($value) { return trim($value, '\\'); }],
-
- [['db', 'ns', 'tableName', 'baseClass', 'queryNs', 'queryBaseClass'], 'required'],
- [['db', 'modelClass', 'queryClass'], 'match', 'pattern' => '/^\w+$/', 'message' => 'Only word characters are allowed.'],
- [['ns', 'baseClass', 'queryNs', 'queryBaseClass'], 'match', 'pattern' => '/^[\w\\\\]+$/', 'message' => 'Only word characters and backslashes are allowed.'],
- [['tableName'], 'match', 'pattern' => '/^([\w ]+\.)?([\w\* ]+)$/', 'message' => 'Only word characters, and optionally spaces, an asterisk and/or a dot are allowed.'],
- [['db'], 'validateDb'],
- [['ns', 'queryNs'], 'validateNamespace'],
- [['tableName'], 'validateTableName'],
- [['modelClass'], 'validateModelClass', 'skipOnEmpty' => false],
- [['baseClass'], 'validateClass', 'params' => ['extends' => ActiveRecord::className()]],
- [['queryBaseClass'], 'validateClass', 'params' => ['extends' => ActiveQuery::className()]],
- [['generateRelations'], 'in', 'range' => [self::RELATIONS_NONE, self::RELATIONS_ALL, self::RELATIONS_ALL_INVERSE]],
- [['generateLabelsFromComments', 'useTablePrefix', 'useSchemaName', 'generateQuery', 'generateRelationsFromCurrentSchema'], 'boolean'],
- [['enableI18N', 'standardizeCapitals', 'singularize'], 'boolean'],
- [['messageCategory'], 'validateMessageCategory', 'skipOnEmpty' => false],
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function attributeLabels()
- {
- return array_merge(parent::attributeLabels(), [
- 'ns' => 'Namespace',
- 'db' => 'Database Connection ID',
- 'tableName' => 'Table Name',
- 'standardizeCapitals' => 'Standardize Capitals',
- 'singularize' => 'Singularize',
- 'modelClass' => 'Model Class Name',
- 'baseClass' => 'Base Class',
- 'generateRelations' => 'Generate Relations',
- 'generateRelationsFromCurrentSchema' => 'Generate Relations from Current Schema',
- 'generateLabelsFromComments' => 'Generate Labels from DB Comments',
- 'generateQuery' => 'Generate ActiveQuery',
- 'queryNs' => 'ActiveQuery Namespace',
- 'queryClass' => 'ActiveQuery Class',
- 'queryBaseClass' => 'ActiveQuery Base Class',
- 'useSchemaName' => 'Use Schema Name',
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function hints()
- {
- return array_merge(parent::hints(), [
- 'ns' => 'This is the namespace of the ActiveRecord class to be generated, e.g., - Html::a(generateString('返回列表') ?>, ['index'], ['class' => 'btn btn-success']) ?> -
- - DetailView::widget([ - 'model' => $model, - 'attributes' => [ -getTableSchema()) === false) { - foreach ($generator->getColumnNames() as $name) { - echo " '" . $name . "',\n"; - } -} else { - foreach ($generator->getTableSchema()->columns as $column) { - $format = $generator->generateColumnFormat($column); - echo " '" . $column->name . ($format === 'text' ? "" : ":" . $format) . "',\n"; - } -} -?> - ], - ]) ?> - -app\models',
- 'db' => 'This is the ID of the DB application component.',
- 'tableName' => 'This is the name of the DB table that the new ActiveRecord class is associated with, e.g. post.
- The table name may consist of the DB schema part if needed, e.g. public.post.
- The table name may end with asterisk to match multiple table names, e.g. tbl_*
- will match tables who name starts with tbl_. In this case, multiple ActiveRecord classes
- will be generated, one for each matching table name; and the class names will be generated from
- the matching characters. For example, table tbl_post will generate Post
- class.',
- 'modelClass' => 'This is the name of the ActiveRecord class to be generated. The class name should not contain
- the namespace part as it is specified in "Namespace". You do not need to specify the class name
- if "Table Name" ends with asterisk, in which case multiple ActiveRecord classes will be generated.',
- 'standardizeCapitals' => 'This indicates whether the generated class names should have standardized capitals. For example,
- table names like SOME_TABLE or Other_Table will have class names SomeTable
- and OtherTable, respectively. If not checked, the same tables will have class names SOMETABLE
- and OtherTable instead.',
- 'singularize' => 'This indicates whether the generated class names should be singularized. For example,
- table names like some_tables will have class names SomeTable.',
- 'baseClass' => 'This is the base class of the new ActiveRecord class. It should be a fully qualified namespaced class name.',
- 'generateRelations' => 'This indicates whether the generator should generate relations based on
- foreign key constraints it detects in the database. Note that if your database contains too many tables,
- you may want to uncheck this option to accelerate the code generation process.',
- 'generateRelationsFromCurrentSchema' => 'This indicates whether the generator should generate relations from current schema or from all available schemas.',
- 'generateLabelsFromComments' => 'This indicates whether the generator should generate attribute labels
- by using the comments of the corresponding DB columns.',
- 'useTablePrefix' => 'This indicates whether the table name returned by the generated ActiveRecord class
- should consider the tablePrefix setting of the DB connection. For example, if the
- table name is tbl_post and tablePrefix=tbl_, the ActiveRecord class
- will return the table name as {{%post}}.',
- 'useSchemaName' => 'This indicates whether to include the schema name in the ActiveRecord class
- when it\'s auto generated. Only non default schema would be used.',
- 'generateQuery' => 'This indicates whether to generate ActiveQuery for the ActiveRecord class.',
- 'queryNs' => 'This is the namespace of the ActiveQuery class to be generated, e.g., app\models',
- 'queryClass' => 'This is the name of the ActiveQuery class to be generated. The class name should not contain
- the namespace part as it is specified in "ActiveQuery Namespace". You do not need to specify the class name
- if "Table Name" ends with asterisk, in which case multiple ActiveQuery classes will be generated.',
- 'queryBaseClass' => 'This is the base class of the new ActiveQuery class. It should be a fully qualified namespaced class name.',
- ]);
- }
-
- /**
- * {@inheritdoc}
- */
- public function autoCompleteData()
- {
- $db = $this->getDbConnection();
- if ($db !== null) {
- return [
- 'tableName' => function () use ($db) {
- return $db->getSchema()->getTableNames();
- },
- ];
- }
-
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function requiredTemplates()
- {
- // @todo make 'query.php' to be required before 2.1 release
- return ['model.php'/*, 'query.php'*/];
- }
-
- /**
- * {@inheritdoc}
- */
- public function stickyAttributes()
- {
- return array_merge(parent::stickyAttributes(), ['ns', 'db', 'baseClass', 'generateRelations', 'generateLabelsFromComments', 'queryNs', 'queryBaseClass', 'useTablePrefix', 'generateQuery']);
- }
-
- /**
- * Returns the `tablePrefix` property of the DB connection as specified
- *
- * @return string
- * @since 2.0.5
- * @see getDbConnection
- */
- public function getTablePrefix()
- {
- $db = $this->getDbConnection();
- if ($db !== null) {
- return $db->tablePrefix;
- }
-
- return '';
- }
-
- /**
- * {@inheritdoc}
- */
- public function generate()
- {
- $files = [];
- $relations = $this->generateRelations();
- $db = $this->getDbConnection();
- foreach ($this->getTableNames() as $tableName) {
- // model :
- $modelClassName = $this->generateClassName($tableName);
- $queryClassName = ($this->generateQuery) ? $this->generateQueryClassName($modelClassName) : false;
- $tableSchema = $db->getTableSchema($tableName);
- $params = [
- 'tableName' => $tableName,
- 'className' => $modelClassName,
- 'queryClassName' => $queryClassName,
- 'tableSchema' => $tableSchema,
- 'properties' => $this->generateProperties($tableSchema),
- 'labels' => $this->generateLabels($tableSchema),
- 'rules' => $this->generateRules($tableSchema),
- 'relations' => isset($relations[$tableName]) ? $relations[$tableName] : [],
- ];
- $files[] = new CodeFile(
- Yii::getAlias('@' . str_replace('\\', '/', $this->ns)) . '/' . $modelClassName . '.php',
- $this->render('model.php', $params)
- );
-
- // query :
- if ($queryClassName) {
- $params['className'] = $queryClassName;
- $params['modelClassName'] = $modelClassName;
- $files[] = new CodeFile(
- Yii::getAlias('@' . str_replace('\\', '/', $this->queryNs)) . '/' . $queryClassName . '.php',
- $this->render('query.php', $params)
- );
- }
- }
-
- return $files;
- }
-
- /**
- * Generates the properties for the specified table.
- * @param \yii\db\TableSchema $table the table schema
- * @return array the generated properties (property => type)
- * @since 2.0.6
- */
- protected function generateProperties($table)
- {
- $properties = [];
- foreach ($table->columns as $column) {
- $columnPhpType = $column->phpType;
- if ($columnPhpType === 'integer') {
- $type = 'int';
- } elseif ($columnPhpType === 'boolean') {
- $type = 'bool';
- } else {
- $type = $columnPhpType;
- }
- $properties[$column->name] = [
- 'type' => $type,
- 'name' => $column->name,
- 'comment' => $column->comment,
- ];
- }
-
- return $properties;
- }
-
- /**
- * Generates the attribute labels for the specified table.
- * @param \yii\db\TableSchema $table the table schema
- * @return array the generated attribute labels (name => label)
- */
- public function generateLabels($table)
- {
-// $labels = [];
-// foreach ($table->columns as $column) {
-// if ($this->generateLabelsFromComments && !empty($column->comment)) {
-// $labels[$column->name] = $column->comment;
-// } elseif (!strcasecmp($column->name, 'id')) {
-// $labels[$column->name] = 'ID';
-// } else {
-// $label = Inflector::camel2words($column->name);
-// if (!empty($label) && substr_compare($label, ' id', -3, 3, true) === 0) {
-// $label = substr($label, 0, -3) . ' ID';
-// }
-// $labels[$column->name] = $label;
-// }
-// }
-//
-// return $labels;
-
- $labels=array();
-
- $sql ="SELECT COLUMN_NAME, COLUMN_COMMENT FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = '$table->name'";
-
- $res = Yii::$app->getDb()->createCommand($sql)->query();
-
- foreach ($res as $column){
-
- if (!empty($column['COLUMN_COMMENT']))
-
- $labels[$column['COLUMN_NAME']]= $column['COLUMN_COMMENT'];
-
- else
-
- $labels[$column['COLUMN_NAME']]= $column['COLUMN_NAME'];
-
- }
-
- return $labels;
- }
-
- /**
- * Generates validation rules for the specified table.
- * @param \yii\db\TableSchema $table the table schema
- * @return array the generated validation rules
- */
- public function generateRules($table)
- {
- $types = [];
- $lengths = [];
- foreach ($table->columns as $column) {
- if($column->name == 'created_at' || $column->name == 'updated_at') {
- continue;
- }
- if ($column->autoIncrement) {
- continue;
- }
- if (!$column->allowNull && $column->defaultValue === null) {
- $types['required'][] = $column->name;
- }
- switch ($column->type) {
- case Schema::TYPE_SMALLINT:
- case Schema::TYPE_INTEGER:
- case Schema::TYPE_BIGINT:
- case Schema::TYPE_TINYINT:
- $types['integer'][] = $column->name;
- break;
- case Schema::TYPE_BOOLEAN:
- $types['boolean'][] = $column->name;
- break;
- case Schema::TYPE_FLOAT:
- case Schema::TYPE_DOUBLE:
- case Schema::TYPE_DECIMAL:
- case Schema::TYPE_MONEY:
- $types['number'][] = $column->name;
- break;
- case Schema::TYPE_DATE:
- case Schema::TYPE_TIME:
- case Schema::TYPE_DATETIME:
- case Schema::TYPE_TIMESTAMP:
- case Schema::TYPE_JSON:
- $types['safe'][] = $column->name;
- break;
- default: // strings
- if ($column->size > 0) {
- $lengths[$column->size][] = $column->name;
- } else {
- $types['string'][] = $column->name;
- }
- }
- }
- $rules = [];
- $driverName = $this->getDbDriverName();
- foreach ($types as $type => $columns) {
- if ($driverName === 'pgsql' && $type === 'integer') {
- $rules[] = "[['" . implode("', '", $columns) . "'], 'default', 'value' => null]";
- }
- $rules[] = "[['" . implode("', '", $columns) . "'], '$type']";
- }
- foreach ($lengths as $length => $columns) {
- $rules[] = "[['" . implode("', '", $columns) . "'], 'string', 'max' => $length]";
- }
-
- $db = $this->getDbConnection();
-
- // Unique indexes rules
- try {
- $uniqueIndexes = array_merge($db->getSchema()->findUniqueIndexes($table), [$table->primaryKey]);
- $uniqueIndexes = array_unique($uniqueIndexes, SORT_REGULAR);
- foreach ($uniqueIndexes as $uniqueColumns) {
- // Avoid validating auto incremental columns
- if (!$this->isColumnAutoIncremental($table, $uniqueColumns)) {
- $attributesCount = count($uniqueColumns);
-
- if ($attributesCount === 1) {
- $rules[] = "[['" . $uniqueColumns[0] . "'], 'unique']";
- } elseif ($attributesCount > 1) {
- $columnsList = implode("', '", $uniqueColumns);
- $rules[] = "[['$columnsList'], 'unique', 'targetAttribute' => ['$columnsList']]";
- }
- }
- }
- } catch (NotSupportedException $e) {
- // doesn't support unique indexes information...do nothing
- }
-
- // Exist rules for foreign keys
- foreach ($table->foreignKeys as $refs) {
- $refTable = $refs[0];
- $refTableSchema = $db->getTableSchema($refTable);
- if ($refTableSchema === null) {
- // Foreign key could point to non-existing table: https://github.com/yiisoft/yii2-gii/issues/34
- continue;
- }
- $refClassName = $this->generateClassName($refTable);
- unset($refs[0]);
- $attributes = implode("', '", array_keys($refs));
- $targetAttributes = [];
- foreach ($refs as $key => $value) {
- $targetAttributes[] = "'$key' => '$value'";
- }
- $targetAttributes = implode(', ', $targetAttributes);
- $rules[] = "[['$attributes'], 'exist', 'skipOnError' => true, 'targetClass' => $refClassName::className(), 'targetAttribute' => [$targetAttributes]]";
- }
-
- return $rules;
- }
-
- /**
- * Generates relations using a junction table by adding an extra viaTable().
- * @param \yii\db\TableSchema the table being checked
- * @param array $fks obtained from the checkJunctionTable() method
- * @param array $relations
- * @return array modified $relations
- */
- private function generateManyManyRelations($table, $fks, $relations)
- {
- $db = $this->getDbConnection();
-
- foreach ($fks as $pair) {
- list($firstKey, $secondKey) = $pair;
- $table0 = $firstKey[0];
- $table1 = $secondKey[0];
- unset($firstKey[0], $secondKey[0]);
- $className0 = $this->generateClassName($table0);
- $className1 = $this->generateClassName($table1);
- $table0Schema = $db->getTableSchema($table0);
- $table1Schema = $db->getTableSchema($table1);
-
- // @see https://github.com/yiisoft/yii2-gii/issues/166
- if ($table0Schema === null || $table1Schema === null) {
- continue;
- }
-
- $link = $this->generateRelationLink(array_flip($secondKey));
- $viaLink = $this->generateRelationLink($firstKey);
- $relationName = $this->generateRelationName($relations, $table0Schema, key($secondKey), true);
- $relations[$table0Schema->fullName][$relationName] = [
- "return \$this->hasMany($className1::className(), $link)->viaTable('"
- . $this->generateTableName($table->name) . "', $viaLink);",
- $className1,
- true,
- ];
-
- $link = $this->generateRelationLink(array_flip($firstKey));
- $viaLink = $this->generateRelationLink($secondKey);
- $relationName = $this->generateRelationName($relations, $table1Schema, key($firstKey), true);
- $relations[$table1Schema->fullName][$relationName] = [
- "return \$this->hasMany($className0::className(), $link)->viaTable('"
- . $this->generateTableName($table->name) . "', $viaLink);",
- $className0,
- true,
- ];
- }
-
- return $relations;
- }
-
- /**
- * @return string[] all db schema names or an array with a single empty string
- * @throws NotSupportedException
- * @since 2.0.5
- */
- protected function getSchemaNames()
- {
- $db = $this->getDbConnection();
-
- if ($this->generateRelationsFromCurrentSchema) {
- if ($db->schema->defaultSchema !== null) {
- return [$db->schema->defaultSchema];
- }
- return [''];
- }
-
- $schema = $db->getSchema();
- if ($schema->hasMethod('getSchemaNames')) { // keep BC to Yii versions < 2.0.4
- try {
- $schemaNames = $schema->getSchemaNames();
- } catch (NotSupportedException $e) {
- // schema names are not supported by schema
- }
- }
- if (!isset($schemaNames)) {
- if (($pos = strpos($this->tableName, '.')) !== false) {
- $schemaNames = [substr($this->tableName, 0, $pos)];
- } else {
- $schemaNames = [''];
- }
- }
- return $schemaNames;
- }
-
- /**
- * @return array the generated relation declarations
- */
- protected function generateRelations()
- {
- if ($this->generateRelations === self::RELATIONS_NONE) {
- return [];
- }
-
- $db = $this->getDbConnection();
- $relations = [];
- $schemaNames = $this->getSchemaNames();
- foreach ($schemaNames as $schemaName) {
- foreach ($db->getSchema()->getTableSchemas($schemaName) as $table) {
- $className = $this->generateClassName($table->fullName);
- foreach ($table->foreignKeys as $refs) {
- $refTable = $refs[0];
- $refTableSchema = $db->getTableSchema($refTable);
- if ($refTableSchema === null) {
- // Foreign key could point to non-existing table: https://github.com/yiisoft/yii2-gii/issues/34
- continue;
- }
- unset($refs[0]);
- $fks = array_keys($refs);
- $refClassName = $this->generateClassName($refTable);
-
- // Add relation for this table
- $link = $this->generateRelationLink(array_flip($refs));
- $relationName = $this->generateRelationName($relations, $table, $fks[0], false);
- $relations[$table->fullName][$relationName] = [
- "return \$this->hasOne($refClassName::className(), $link);",
- $refClassName,
- false,
- ];
-
- // Add relation for the referenced table
- $hasMany = $this->isHasManyRelation($table, $fks);
- $link = $this->generateRelationLink($refs);
- $relationName = $this->generateRelationName($relations, $refTableSchema, $className, $hasMany);
- $relations[$refTableSchema->fullName][$relationName] = [
- "return \$this->" . ($hasMany ? 'hasMany' : 'hasOne') . "($className::className(), $link);",
- $className,
- $hasMany,
- ];
- }
-
- if (($junctionFks = $this->checkJunctionTable($table)) === false) {
- continue;
- }
-
- $relations = $this->generateManyManyRelations($table, $junctionFks, $relations);
- }
- }
-
- if ($this->generateRelations === self::RELATIONS_ALL_INVERSE) {
- return $this->addInverseRelations($relations);
- }
-
- return $relations;
- }
-
- /**
- * Adds inverse relations
- *
- * @param array $relations relation declarations
- * @return array relation declarations extended with inverse relation names
- * @since 2.0.5
- */
- protected function addInverseRelations($relations)
- {
- $db = $this->getDbConnection();
- $relationNames = [];
-
- $schemaNames = $this->getSchemaNames();
- foreach ($schemaNames as $schemaName) {
- foreach ($db->schema->getTableSchemas($schemaName) as $table) {
- $className = $this->generateClassName($table->fullName);
- foreach ($table->foreignKeys as $refs) {
- $refTable = $refs[0];
- $refTableSchema = $db->getTableSchema($refTable);
- if ($refTableSchema === null) {
- // Foreign key could point to non-existing table: https://github.com/yiisoft/yii2-gii/issues/34
- continue;
- }
- unset($refs[0]);
- $fks = array_keys($refs);
-
- $leftRelationName = $this->generateRelationName($relationNames, $table, $fks[0], false);
- $relationNames[$table->fullName][$leftRelationName] = true;
- $hasMany = $this->isHasManyRelation($table, $fks);
- $rightRelationName = $this->generateRelationName(
- $relationNames,
- $refTableSchema,
- $className,
- $hasMany
- );
- $relationNames[$refTableSchema->fullName][$rightRelationName] = true;
-
- $relations[$table->fullName][$leftRelationName][0] =
- rtrim($relations[$table->fullName][$leftRelationName][0], ';')
- . "->inverseOf('".lcfirst($rightRelationName)."');";
- $relations[$refTableSchema->fullName][$rightRelationName][0] =
- rtrim($relations[$refTableSchema->fullName][$rightRelationName][0], ';')
- . "->inverseOf('".lcfirst($leftRelationName)."');";
- }
- }
- }
- return $relations;
- }
-
- /**
- * Determines if relation is of has many type
- *
- * @param TableSchema $table
- * @param array $fks
- * @return bool
- * @since 2.0.5
- */
- protected function isHasManyRelation($table, $fks)
- {
- $uniqueKeys = [$table->primaryKey];
- try {
- $uniqueKeys = array_merge($uniqueKeys, $this->getDbConnection()->getSchema()->findUniqueIndexes($table));
- } catch (NotSupportedException $e) {
- // ignore
- }
- foreach ($uniqueKeys as $uniqueKey) {
- if (count(array_diff(array_merge($uniqueKey, $fks), array_intersect($uniqueKey, $fks))) === 0) {
- return false;
- }
- }
- return true;
- }
-
- /**
- * Generates the link parameter to be used in generating the relation declaration.
- * @param array $refs reference constraint
- * @return string the generated link parameter.
- */
- protected function generateRelationLink($refs)
- {
- $pairs = [];
- foreach ($refs as $a => $b) {
- $pairs[] = "'$a' => '$b'";
- }
-
- return '[' . implode(', ', $pairs) . ']';
- }
-
- /**
- * Checks if the given table is a junction table, that is it has at least one pair of unique foreign keys.
- * @param \yii\db\TableSchema the table being checked
- * @return array|bool all unique foreign key pairs if the table is a junction table,
- * or false if the table is not a junction table.
- */
- protected function checkJunctionTable($table)
- {
- if (count($table->foreignKeys) < 2) {
- return false;
- }
- $uniqueKeys = [$table->primaryKey];
- try {
- $uniqueKeys = array_merge($uniqueKeys, $this->getDbConnection()->getSchema()->findUniqueIndexes($table));
- } catch (NotSupportedException $e) {
- // ignore
- }
- $result = [];
- // find all foreign key pairs that have all columns in an unique constraint
- $foreignKeys = array_values($table->foreignKeys);
- $foreignKeysCount = count($foreignKeys);
-
- for ($i = 0; $i < $foreignKeysCount; $i++) {
- $firstColumns = $foreignKeys[$i];
- unset($firstColumns[0]);
-
- for ($j = $i + 1; $j < $foreignKeysCount; $j++) {
- $secondColumns = $foreignKeys[$j];
- unset($secondColumns[0]);
-
- $fks = array_merge(array_keys($firstColumns), array_keys($secondColumns));
- foreach ($uniqueKeys as $uniqueKey) {
- if (count(array_diff(array_merge($uniqueKey, $fks), array_intersect($uniqueKey, $fks))) === 0) {
- // save the foreign key pair
- $result[] = [$foreignKeys[$i], $foreignKeys[$j]];
- break;
- }
- }
- }
- }
- return empty($result) ? false : $result;
- }
-
- /**
- * Generate a relation name for the specified table and a base name.
- * @param array $relations the relations being generated currently.
- * @param \yii\db\TableSchema $table the table schema
- * @param string $key a base name that the relation name may be generated from
- * @param bool $multiple whether this is a has-many relation
- * @return string the relation name
- */
- protected function generateRelationName($relations, $table, $key, $multiple)
- {
- static $baseModel;
- /* @var $baseModel \yii\db\ActiveRecord */
- if ($baseModel === null) {
- $baseClass = $this->baseClass;
- $baseClassReflector = new \ReflectionClass($baseClass);
- if ($baseClassReflector->isAbstract()) {
- $baseClassWrapper =
- 'namespace ' . __NAMESPACE__ . ';'.
- 'class GiiBaseClassWrapper extends \\' . $baseClass . ' {' .
- 'public static function tableName(){' .
- 'return "' . addslashes($table->fullName) . '";' .
- '}' .
- '};' .
- 'return new GiiBaseClassWrapper();';
- $baseModel = eval($baseClassWrapper);
- } else {
- $baseModel = new $baseClass();
- }
- $baseModel->setAttributes([]);
- }
-
- if (!empty($key) && strcasecmp($key, 'id')) {
- if (substr_compare($key, 'id', -2, 2, true) === 0) {
- $key = rtrim(substr($key, 0, -2), '_');
- } elseif (substr_compare($key, 'id', 0, 2, true) === 0) {
- $key = ltrim(substr($key, 2, strlen($key)), '_');
- }
- }
- if ($multiple) {
- $key = Inflector::pluralize($key);
- }
- $name = $rawName = Inflector::id2camel($key, '_');
- $i = 0;
- while ($baseModel->hasProperty(lcfirst($name))) {
- $name = $rawName . ($i++);
- }
- while (isset($table->columns[lcfirst($name)])) {
- $name = $rawName . ($i++);
- }
- while (isset($relations[$table->fullName][$name])) {
- $name = $rawName . ($i++);
- }
-
- return $name;
- }
-
- /**
- * Validates the [[db]] attribute.
- */
- public function validateDb()
- {
- if (!Yii::$app->has($this->db)) {
- $this->addError('db', 'There is no application component named "db".');
- } elseif (!Yii::$app->get($this->db) instanceof Connection) {
- $this->addError('db', 'The "db" application component must be a DB connection instance.');
- }
- }
-
- /**
- * Validates the namespace.
- *
- * @param string $attribute Namespace variable.
- */
- public function validateNamespace($attribute)
- {
- $value = $this->$attribute;
- $value = ltrim($value, '\\');
- $path = Yii::getAlias('@' . str_replace('\\', '/', $value), false);
- if ($path === false) {
- $this->addError($attribute, 'Namespace must be associated with an existing directory.');
- }
- }
-
- /**
- * Validates the [[modelClass]] attribute.
- */
- public function validateModelClass()
- {
- if ($this->isReservedKeyword($this->modelClass)) {
- $this->addError('modelClass', 'Class name cannot be a reserved PHP keyword.');
- }
- if ((empty($this->tableName) || substr_compare($this->tableName, '*', -1, 1)) && $this->modelClass == '') {
- $this->addError('modelClass', 'Model Class cannot be blank if table name does not end with asterisk.');
- }
- }
-
- /**
- * Validates the [[tableName]] attribute.
- */
- public function validateTableName()
- {
- if (strpos($this->tableName, '*') !== false && substr_compare($this->tableName, '*', -1, 1)) {
- $this->addError('tableName', 'Asterisk is only allowed as the last character.');
-
- return;
- }
- $tables = $this->getTableNames();
- if (empty($tables)) {
- $this->addError('tableName', "Table '{$this->tableName}' does not exist.");
- } else {
- foreach ($tables as $table) {
- $class = $this->generateClassName($table);
- if ($this->isReservedKeyword($class)) {
- $this->addError('tableName', "Table '$table' will generate a class which is a reserved PHP keyword.");
- break;
- }
- }
- }
- }
-
- protected $tableNames;
- protected $classNames;
-
- /**
- * @return array the table names that match the pattern specified by [[tableName]].
- */
- protected function getTableNames()
- {
- if ($this->tableNames !== null) {
- return $this->tableNames;
- }
- $db = $this->getDbConnection();
- if ($db === null) {
- return [];
- }
- $tableNames = [];
- if (strpos($this->tableName, '*') !== false) {
- if (($pos = strrpos($this->tableName, '.')) !== false) {
- $schema = substr($this->tableName, 0, $pos);
- $pattern = '/^' . str_replace('*', '\w+', substr($this->tableName, $pos + 1)) . '$/';
- } else {
- $schema = '';
- $pattern = '/^' . str_replace('*', '\w+', $this->tableName) . '$/';
- }
-
- foreach ($db->schema->getTableNames($schema) as $table) {
- if (preg_match($pattern, $table)) {
- $tableNames[] = $schema === '' ? $table : ($schema . '.' . $table);
- }
- }
- } elseif (($table = $db->getTableSchema($this->tableName, true)) !== null) {
- $tableNames[] = $this->tableName;
- $this->classNames[$this->tableName] = $this->modelClass;
- }
-
- return $this->tableNames = $tableNames;
- }
-
- /**
- * Generates the table name by considering table prefix.
- * If [[useTablePrefix]] is false, the table name will be returned without change.
- * @param string $tableName the table name (which may contain schema prefix)
- * @return string the generated table name
- */
- public function generateTableName($tableName)
- {
- if (!$this->useTablePrefix) {
- return $tableName;
- }
-
- $db = $this->getDbConnection();
- if (preg_match("/^{$db->tablePrefix}(.*?)$/", $tableName, $matches)) {
- $tableName = '{{%' . $matches[1] . '}}';
- } elseif (preg_match("/^(.*?){$db->tablePrefix}$/", $tableName, $matches)) {
- $tableName = '{{' . $matches[1] . '%}}';
- }
- return $tableName;
- }
-
- /**
- * Generates a class name from the specified table name.
- * @param string $tableName the table name (which may contain schema prefix)
- * @param bool $useSchemaName should schema name be included in the class name, if present
- * @return string the generated class name
- */
- protected function generateClassName($tableName, $useSchemaName = null)
- {
- if (isset($this->classNames[$tableName])) {
- return $this->classNames[$tableName];
- }
-
- $schemaName = '';
- $fullTableName = $tableName;
- if (($pos = strrpos($tableName, '.')) !== false) {
- if (($useSchemaName === null && $this->useSchemaName) || $useSchemaName) {
- $schemaName = substr($tableName, 0, $pos) . '_';
- }
- $tableName = substr($tableName, $pos + 1);
- }
-
- $db = $this->getDbConnection();
- $patterns = [];
- $patterns[] = "/^{$db->tablePrefix}(.*?)$/";
- $patterns[] = "/^(.*?){$db->tablePrefix}$/";
- if (strpos($this->tableName, '*') !== false) {
- $pattern = $this->tableName;
- if (($pos = strrpos($pattern, '.')) !== false) {
- $pattern = substr($pattern, $pos + 1);
- }
- $patterns[] = '/^' . str_replace('*', '(\w+)', $pattern) . '$/';
- }
- $className = $tableName;
- foreach ($patterns as $pattern) {
- if (preg_match($pattern, $tableName, $matches)) {
- $className = $matches[1];
- break;
- }
- }
-
- if ($this->standardizeCapitals) {
- $schemaName = ctype_upper(preg_replace('/[_-]/', '', $schemaName)) ? strtolower($schemaName) : $schemaName;
- $className = ctype_upper(preg_replace('/[_-]/', '', $className)) ? strtolower($className) : $className;
- $this->classNames[$fullTableName] = Inflector::camelize(Inflector::camel2words($schemaName.$className));
- } else {
- $this->classNames[$fullTableName] = Inflector::id2camel($schemaName.$className, '_');
- }
-
- if ($this->singularize) {
- $this->classNames[$fullTableName] = Inflector::singularize($this->classNames[$fullTableName]);
- }
-
- return $this->classNames[$fullTableName];
- }
-
- /**
- * Generates a query class name from the specified model class name.
- * @param string $modelClassName model class name
- * @return string generated class name
- */
- protected function generateQueryClassName($modelClassName)
- {
- $queryClassName = $this->queryClass;
- if (empty($queryClassName) || strpos($this->tableName, '*') !== false) {
- $queryClassName = $modelClassName . 'Query';
- }
- return $queryClassName;
- }
-
- /**
- * @return Connection the DB connection as specified by [[db]].
- */
- protected function getDbConnection()
- {
- return Yii::$app->get($this->db, false);
- }
-
- /**
- * @return string|null driver name of db connection.
- * In case db is not instance of \yii\db\Connection null will be returned.
- * @since 2.0.6
- */
- protected function getDbDriverName()
- {
- /** @var Connection $db */
- $db = $this->getDbConnection();
- return $db instanceof \yii\db\Connection ? $db->driverName : null;
- }
-
- /**
- * Checks if any of the specified columns is auto incremental.
- * @param \yii\db\TableSchema $table the table schema
- * @param array $columns columns to check for autoIncrement property
- * @return bool whether any of the specified columns is auto incremental.
- */
- protected function isColumnAutoIncremental($table, $columns)
- {
- foreach ($columns as $column) {
- if (isset($table->columns[$column]) && $table->columns[$column]->autoIncrement) {
- return true;
- }
- }
-
- return false;
- }
-}
diff --git a/vendor/linyao/generators/model/default/model.php b/vendor/linyao/generators/model/default/model.php
deleted file mode 100644
index a04b695..0000000
--- a/vendor/linyao/generators/model/default/model.php
+++ /dev/null
@@ -1,124 +0,0 @@
- [type, name. comment]) */
-/* @var $labels string[] list of attribute labels (name => label) */
-/* @var $rules string[] list of validation rules */
-/* @var $relations array list of relations (name => relation declaration) */
-
-echo "
-
-namespace ns ?>;
-
-use Yii;
-use yii\behaviors\TimestampBehavior;
-
-/**
- * This is the model class for table "generateTableName($tableName) ?>".
- *
- $data): ?>
- * @property ' ']) : '') . "\n" ?>
-
-
- *
- $relation): ?>
- * @property
-
-
- */
-class extends baseClass, '\\') . "\n" ?>
-{
- /**
- * {@inheritdoc}
- */
- public static function tableName()
- {
- return 'generateTableName($tableName) ?>';
- }
-db !== 'db'): ?>
-
- /**
- * @return \yii\db\Connection the database connection used by this AR class.
- */
- public static function getDb()
- {
- return Yii::$app->get('db ?>');
- }
-
-
- /**
- * {@inheritdoc}
- */
- public function rules()
- {
- return [];
- }
-
- /**
- * {@inheritdoc}
- */
- public function attributeLabels()
- {
- return [
- $label): ?>
- " . $generator->generateString($label) . ",\n" ?>
-
- ];
- }
- $relation): ?>
-
- /**
- * @return \yii\db\ActiveQuery
- */
- public function get()
- {
-
- }
-
-
-ns === $generator->queryNs) ? $queryClassName : '\\' . $generator->queryNs . '\\' . $queryClassName;
- echo "\n";
-?>
- /**
- * {@inheritdoc}
- * @return the active query used by this AR class.
- */
- public static function find()
- {
- return new (get_called_class());
- }
-
-
-
- /**
- * @author linyao
- * @email 602604991@qq.com
- * @created Nov 8, 2019
- *
- * 行为存储创建时间和更新时间
- */
- public function behaviors()
- {
- return [
- [
- 'class' => TimestampBehavior::className(),
- 'createdAtAttribute' => 'created_at',
- 'updatedAtAttribute' => 'updated_at',
- 'value' => function() {
- return time();
- },
- ],
- ];
- }
-
-}
diff --git a/vendor/linyao/generators/model/default/query.php b/vendor/linyao/generators/model/default/query.php
deleted file mode 100644
index c362dfe..0000000
--- a/vendor/linyao/generators/model/default/query.php
+++ /dev/null
@@ -1,56 +0,0 @@
- label) */
-/* @var $rules string[] list of validation rules */
-/* @var $relations array list of relations (name => relation declaration) */
-/* @var $className string class name */
-/* @var $modelClassName string related model class name */
-
-$modelFullClassName = $modelClassName;
-if ($generator->ns !== $generator->queryNs) {
- $modelFullClassName = '\\' . $generator->ns . '\\' . $modelFullClassName;
-}
-
-echo "
-
-namespace queryNs ?>;
-
-/**
- * This is the ActiveQuery class for [[]].
- *
- * @see
- */
-class extends queryBaseClass, '\\') . "\n" ?>
-{
- /*public function active()
- {
- return $this->andWhere('[[status]]=1');
- }*/
-
- /**
- * {@inheritdoc}
- * @return []|array
- */
- public function all($db = null)
- {
- return parent::all($db);
- }
-
- /**
- * {@inheritdoc}
- * @return |array|null
- */
- public function one($db = null)
- {
- return parent::one($db);
- }
-}
diff --git a/vendor/linyao/generators/model/form.php b/vendor/linyao/generators/model/form.php
deleted file mode 100644
index 2fa118f..0000000
--- a/vendor/linyao/generators/model/form.php
+++ /dev/null
@@ -1,30 +0,0 @@
-field($generator, 'tableName')->textInput(['table_prefix' => $generator->getTablePrefix()]);
-echo $form->field($generator, 'modelClass');
-echo $form->field($generator, 'standardizeCapitals')->checkbox();
-echo $form->field($generator, 'singularize')->checkbox();
-echo $form->field($generator, 'ns');
-echo $form->field($generator, 'baseClass');
-echo $form->field($generator, 'db');
-echo $form->field($generator, 'useTablePrefix')->checkbox();
-echo $form->field($generator, 'generateRelations')->dropDownList([
- Generator::RELATIONS_NONE => 'No relations',
- Generator::RELATIONS_ALL => 'All relations',
- Generator::RELATIONS_ALL_INVERSE => 'All relations with inverse',
-]);
-echo $form->field($generator, 'generateRelationsFromCurrentSchema')->checkbox();
-echo $form->field($generator, 'generateLabelsFromComments')->checkbox();
-echo $form->field($generator, 'generateQuery')->checkbox();
-echo $form->field($generator, 'queryNs');
-echo $form->field($generator, 'queryClass');
-echo $form->field($generator, 'queryBaseClass');
-echo $form->field($generator, 'enableI18N')->checkbox();
-echo $form->field($generator, 'messageCategory');
-echo $form->field($generator, 'useSchemaName')->checkbox();