修复一对多

修复上传组件一对多
修复级联选择器

Author: SmallRuralDog

docs/components.md

@@ -134,6 +134,50 @@ Icon::make()
 ### InputNumber 计数器
 ### Select 选择器
 ### Cascader 级联选择器
+
+当一个数据集合有清晰的层级结构时，可通过级联选择器逐级查看并选择
+
+#### 基础用法
+
+```php
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use SmallRuralDog\Admin\Traits\ModelTree;
+
+class GoodsClass extends Model
+{
+    use ModelTree;
+
+    public function children()
+    {
+        return $this->hasMany(get_class($this), 'parent_id')->orderBy('order');
+    }
+}
+```
+
+
+
+```php
+$form->item("goods_class_id", "产品分类")->displayComponent(function () {
+    $goods_class = new GoodsClass();
+    $allNodes = $goods_class->toTree();
+    return Cascader::make()->options($allNodes)->value("id")->label("name")->expandTrigger("hover");
+}),
+```
+
+#### 属性
+
+显示为面板模式
+
+```php
+Cascader::make()->panel(true)
+```
+
+
+
 ### Switch 开关
 ### Slider 滑块
 ### TimePicker 时间选择器
@@ -161,7 +205,9 @@ $form->item('avatar', '头像')->displayComponent(function(){
 #### 支持多文件
 支持多个文件上传，数据格式为数组
 ```php
- Upload::make()->multiple()
+ Upload::make()->multiple();
+//如果是一对多情况下，并且是对象数组，需要指定文件路径的字段
+ Upload::make()->multiple(true,"keyName");
 ```
 #### 上传附加数据
 ```php
@@ -207,7 +253,7 @@ $form->item('avatar', '头像')->displayComponent(function(){
 ```php
  Upload::make()->width(150)
  Upload::make()->height(120)
- ```
+```
 ### Rate 评分
 ### ColorPicker 颜色选择器
 ### Transfer 穿梭框

public/app.js

@@ -2040,11 +2040,11 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
     attrs: Object,
     value: {
       "default": null
-    }
+    },
+    form_data: Object
   },
   data: function data() {
     return {
-      vm: 0,
       props: {},
       options: []
     };
@@ -2533,7 +2533,7 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 /* harmony default export */ __webpack_exports__["default"] = ({
-  props: ['attrs', 'value'],
+  props: ['attrs', 'value', 'form_data'],
   data: function data() {
     return {};
   },
@@ -3246,6 +3246,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 /* harmony default export */ __webpack_exports__["default"] = ({
   props: ["attrs", "value", "form_data"],
@@ -3270,7 +3279,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       if (this._.isArray(this.value)) {
         var t_value = this._.clone(this.value);
 
-        t_value.splice(index, 1);
+        t_value[index][this.attrs.remove_flag_name] = 1;
         this.onChange(t_value);
       } else {
         this.onChange(null);
@@ -3284,12 +3293,38 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
         var t_value = this._.clone(this.value);
 
         t_value = this._.isArray(t_value) ? t_value : [];
-        t_value.push(response.data.path);
+        t_value.push(this.getObject(response.data.path, 0));
         this.onChange(t_value);
       }
     },
     onExceed: function onExceed() {
       this.$Message.error("超出上传数量");
+    },
+    getObject: function getObject(path, id) {
+      var keyName = this.attrs.keyName;
+      var valueName = this.attrs.valueName;
+      var remove_flag_name = this.attrs.remove_flag_name;
+      var obj = {};
+
+      if (keyName != null && valueName != null) {
+        obj[keyName] = id;
+        obj[valueName] = path;
+        obj["name"] = Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileName"])(path);
+        obj[remove_flag_name] = 0;
+        return obj;
+      } else {
+        return path;
+      }
+    },
+    getObjectPath: function getObjectPath(item) {
+      var keyName = this.attrs.keyName;
+      var valueName = this.attrs.valueName;
+
+      if (keyName != null && valueName != null) {
+        return item[valueName];
+      }
+
+      return item;
     }
   },
   watch: {},
@@ -3298,19 +3333,33 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
       var _this = this;
 
       if (this._.isArray(this.value)) {
-        return this.value.map(function (item) {
+        return this.value.filter(function (item) {
+          if (item[_this.attrs.remove_flag_name]) {
+            return item[_this.attrs.remove_flag_name] == 0;
+          }
+
+          return true;
+        }).map(function (item) {
+          var itemPath = _this.getObjectPath(item);
+
           return {
-            name: Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileName"])(item),
-            path: item,
-            url: Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileUrl"])(_this.attrs.host, item)
+            name: Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileName"])(itemPath),
+            path: itemPath,
+            url: Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileUrl"])(_this.attrs.host, itemPath)
           };
         });
       } else {
         if (!this.value) return [];
+        var itemPath = this.value;
+
+        if (this._.isObject()) {
+          itemPath = this.getObjectPath(this.value);
+        }
+
         return [{
-          name: Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileName"])(this.value),
-          path: this.value,
-          url: Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileUrl"])(this.attrs.host, this.value)
+          name: Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileName"])(itemPath),
+          path: itemPath,
+          url: Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileUrl"])(this.attrs.host, itemPath)
         }];
       }
     },
@@ -28688,6 +28737,7 @@ var render = function() {
         class: _vm.attrs.className,
         style: _vm.attrs.style,
         attrs: {
+          value: _vm.value,
           size: _vm.attrs.size,
           placeholder: _vm.attrs.placeholder,
           disabled: _vm.attrs.disabled,
@@ -28701,19 +28751,13 @@ var render = function() {
           props: _vm.props,
           options: _vm.options
         },
-        on: { change: _vm.onChange },
-        model: {
-          value: _vm.vm,
-          callback: function($$v) {
-            _vm.vm = $$v
-          },
-          expression: "vm"
-        }
+        on: { change: _vm.onChange }
       })
     : _c("el-cascader", {
         class: _vm.attrs.className,
         style: _vm.attrs.style,
         attrs: {
+          value: _vm.value,
           size: _vm.attrs.size,
           placeholder: _vm.attrs.placeholder,
           disabled: _vm.attrs.disabled,
@@ -28727,14 +28771,7 @@ var render = function() {
           props: _vm.props,
           options: _vm.options
         },
-        on: { change: _vm.onChange },
-        model: {
-          value: _vm.vm,
-          callback: function($$v) {
-            _vm.vm = $$v
-          },
-          expression: "vm"
-        }
+        on: { change: _vm.onChange }
       })
 }
 var staticRenderFns = []

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=36a6a47ee23854bc15ef",
+    "/app.js": "/app.js?id=581268bd1a7f4061f926",
     "/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",
     "/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"
 }

resources/js/components/widgets/Cascader.vue

@@ -3,7 +3,7 @@
     v-if="attrs.panel"
     :style="attrs.style"
     :class="attrs.className"
-    v-model="vm"
+    :value="value"
     :size="attrs.size"
     :placeholder="attrs.placeholder"
     :disabled="attrs.disabled"
@@ -22,7 +22,7 @@
     v-else
     :style="attrs.style"
     :class="attrs.className"
-    v-model="vm"
+    :value="value"
     :size="attrs.size"
     :placeholder="attrs.placeholder"
     :disabled="attrs.disabled"
@@ -44,11 +44,11 @@ export default {
     attrs: Object,
     value: {
       default: null
-    }
+    },
+    form_data: Object
   },
   data() {
     return {
-      vm: 0,
       props: {},
       options: []
     };
@@ -82,4 +82,4 @@ export default {
     }
   }
 };
-</script>
+</script>

resources/js/components/widgets/Input.vue

@@ -32,7 +32,7 @@
 </template>
 <script>
 export default {
-  props: ['attrs', 'value'],
+  props: ['attrs', 'value','form_data'],
   data() {
     return {};
   },