修复grid avatar 组件

添加grid 值前缀后缀

Author: SmallRuralDog

public/app.js

@@ -1184,6 +1184,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 //
 //
 //
+//
 
 
 
@@ -1790,6 +1791,7 @@ __webpack_require__.r(__webpack_exports__);
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../../utils */ "./resources/js/utils.js");
 //
 //
 //
@@ -1803,15 +1805,24 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+
 /* harmony default export */ __webpack_exports__["default"] = ({
   props: {
     attrs: Object,
+    row: Object,
+    column_value: {
+      "default": null
+    },
     value: {
       "default": null
     }
   },
   mounted: function mounted() {},
-  computed: {}
+  computed: {
+    src: function src() {
+      return Object(_utils__WEBPACK_IMPORTED_MODULE_0__["getFileUrl"])(this.attrs.host, this.value);
+    }
+  }
 });
 
 /***/ }),
@@ -2641,16 +2652,16 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
 /* harmony default export */ __webpack_exports__["default"] = ({
   props: {
     attrs: Object,
     value: {
-      "default": null
+      "default": 0
     }
   },
   data: function data() {
     return {
-      vm: this.attrs.componentValue,
       options: this.attrs.options
     };
   },
@@ -27694,6 +27705,7 @@ var render = function() {
                     ? _c(
                         "el-table-column",
                         {
+                          attrs: { label: "操作" },
                           scopedSlots: _vm._u(
                             [
                               {
@@ -28268,7 +28280,7 @@ var render = function() {
       icon: _vm.attrs.icon,
       size: _vm.attrs.size,
       shape: _vm.attrs.shape,
-      src: _vm.value,
+      src: _vm.src,
       srcSet: _vm.attrs.srcSet,
       alt: _vm.attrs.alt,
       fit: _vm.attrs.fit
@@ -28998,6 +29010,7 @@ var render = function() {
     class: _vm.attrs.className,
     style: _vm.attrs.style,
     attrs: {
+      value: _vm.value,
       min: _vm.attrs.min,
       max: _vm.attrs.max,
       disabled: _vm.attrs.disabled,
@@ -29013,14 +29026,7 @@ var render = function() {
       label: _vm.attrs.label,
       "tooltip-class": _vm.attrs.tooltipClass
     },
-    on: { change: _vm.onChange },
-    model: {
-      value: _vm.vm,
-      callback: function($$v) {
-        _vm.vm = $$v
-      },
-      expression: "vm"
-    }
+    on: { input: _vm.onChange }
   })
 }
 var staticRenderFns = []

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=0a3b5ac8e5d7716acd24",
+    "/app.js": "/app.js?id=d54eb76abc4d506cfc53",
     "/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",
     "/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"
 }

resources/js/components/grid/Table.vue

@@ -135,7 +135,8 @@
               </template>
             </el-table-column>
           </template>
-          <el-table-column v-if="!attrs.actions.hide">
+          <el-table-column v-if="!attrs.actions.hide" label="操作">
+            
             <template slot="header"></template>
             <template slot-scope="scope">
               <Actions

resources/js/components/widgets/Avatar.vue

@@ -5,21 +5,30 @@
     :icon="attrs.icon"
     :size="attrs.size"
     :shape="attrs.shape"
-    :src="value"
+    :src="src"
     :srcSet="attrs.srcSet"
     :alt="attrs.alt"
     :fit="attrs.fit"
   />
 </template>
 <script>
+import { getFileUrl } from "../../utils";
 export default {
   props: {
     attrs: Object,
+    row: Object,
+    column_value: {
+      default: null
+    },
     value: {
       default: null
     }
   },
   mounted() {},
-  computed: {}
+  computed: {
+    src() {
+      return getFileUrl(this.attrs.host, this.value);
+    }
+  }
 };
-</script>
+</script>

resources/js/components/widgets/Slider.vue

@@ -1,6 +1,6 @@
 <template>
   <el-slider
-    v-model="vm"
+    :value="value"
     :style="attrs.style"
     :class="attrs.className"
     :min="attrs.min"
@@ -17,20 +17,20 @@
     :height="attrs.height"
     :label="attrs.label"
     :tooltip-class="attrs.tooltipClass"
-    @change="onChange"
+   
+    @input="onChange"
   ></el-slider>
 </template>
 <script>
 export default {
   props: {
     attrs: Object,
     value: {
-      default: null
+      default: 0
     }
   },
   data() {
     return {
-      vm: this.attrs.componentValue,
       options: this.attrs.options
     };
   },
@@ -40,8 +40,9 @@ export default {
   },
   methods: {
     onChange(value) {
+    
       this.$emit("change", value);
     }
   }
 };
-</script>
+</script>

src/Components/Avatar.php

@@ -7,6 +7,8 @@
 class Avatar extends GridComponent
 {
     protected $componentName = "Avatar";
+
+    protected $host = "";
     /**
      * @var string
      */
@@ -36,6 +38,12 @@ class Avatar extends GridComponent
      */
     protected $fit = "cover";
 
+    public function __construct($value = null)
+    {
+        $this->host = \Storage::disk(config('admin.upload.disk'))->url('/');
+
+        $this->componentValue($value);
+    }
 
 
 

src/Controllers/ScriptController.php

@@ -13,9 +13,7 @@ class ScriptController extends Controller
     public function show($script)
     {
         $path = Arr::get(Admin::scripts(), $script);
-
         abort_if(is_null($path), 404);
-
         return response(
             file_get_contents($path),
             200,

src/Grid/Column/Attributes.php

@@ -71,13 +71,19 @@ class Attributes
     public $filterMultiple = true;
 
 
-
     public $displayComponentAttrs;
 
 
-
-
-
+    /**
+     * 值前缀
+     * @var string
+     */
+    public $itemPrefix;
+    /**
+     * 后缀
+     * @var string
+     */
+    public $itemSuffix;
 
 
 }

src/Grid/Concerns/HasColumnAttributes.php

@@ -5,8 +5,7 @@
 
 
 use SmallRuralDog\Admin\Components\GridComponent;
-use SmallRuralDog\Admin\Components\Link;
-use SmallRuralDog\Admin\Components\Tag;
+use SmallRuralDog\Admin\Grid\Column\Attributes;
 
 trait HasColumnAttributes
 {
@@ -28,7 +27,6 @@ public function type($type)
     }
 
 
-
     /**
      * column 的 key
      * @param string $columnKey
@@ -213,6 +211,28 @@ public function filterMultiple(bool $filterMultiple)
     }
 
 
+    /**
+     * 前缀
+     * @param string $itemPrefix
+     * @return $this
+     */
+    public function itemPrefix(string $itemPrefix)
+    {
+        $this->attributes->itemPrefix = $itemPrefix;
+        return $this;
+    }
+
+    /**
+     * 后缀
+     * @param string $itemSuffix
+     * @return $this
+     */
+    public function itemSuffix(string $itemSuffix)
+    {
+        $this->attributes->itemSuffix = $itemSuffix;
+        return $this;
+    }
+
     /**
      * @param $displayComponentAttrs
      * @return $this
@@ -222,4 +242,6 @@ private function displayComponentAttrs(GridComponent $displayComponentAttrs)
         $this->attributes->displayComponentAttrs = $displayComponentAttrs;
         return $this;
     }
+
+
 }