完善 VueRouteAction 组件

SmallRuralDog · SmallRuralDog · commit a6a6d2427778 · 2020-03-11T20:09:42.000+08:00
diff --git a/public/app.js b/public/app.js
@@ -2337,7 +2337,10 @@ __webpack_require__.r(__webpack_exports__);
   },
   methods: {
     onHandle: function onHandle() {
-      if (this.action.httpPath) {} else {//this.$router.push(this.path);
+      if (this.action.httpPath) {
+        window.location.href = this.http_path;
+      } else {
+        this.$router.push(this.path);
       }
     }
   },
@@ -2353,7 +2356,17 @@ __webpack_require__.r(__webpack_exports__);
 
       return path;
     },
-    http_path: function http_path() {},
+    http_path: function http_path() {
+      var _this2 = this;
+
+      var path = this.action.httpPath;
+
+      this._.forEach(this.row, function (value, key) {
+        path = _this2._.replace(path, "{" + key + "}", value);
+      });
+
+      return path;
+    },
     colum: function colum() {
       return this.scope.colum;
     },
@@ -5760,7 +5773,7 @@ exports = module.exports = __webpack_require__(/*! ../../../node_modules/css-loa
 
 
 // module
-exports.push([module.i, "#app,\nbody,\nhtml {\n  height: 100%;\n}\n\nbody {\n  background-color: #f7f7f7;\n  font-size: 14px;\n}\n\n.ml-2 {\n  margin-left: 2px;\n}\n\n.ml-5 {\n  margin-left: 5px;\n}\n\n.mr-5 {\n  margin-right: 5px;\n}\n\n.mt-5 {\n  margin-top: 5px;\n}\n\n.m-10 {\n  margin: 10px;\n}\n\n.ml-10 {\n  margin-left: 10px;\n}\n\n.mr-10 {\n  margin-right: 10px;\n}\n\n.mb-10 {\n  margin-bottom: 10px;\n}\n\n.mt-10 {\n  margin-top: 10px;\n}\n\n.m-15 {\n  margin: 15px;\n}\n\n.mb-15 {\n  margin-bottom: 15px;\n}\n\n.ml-20 {\n  margin-left: 20px;\n}\n\n.mt-30 {\n  margin-top: 30px;\n}\n\n.mt-50 {\n  margin-top: 50px;\n}\n\n.fs-12 {\n  font-size: 12px;\n}\n\n.fs-14 {\n  font-size: 14px;\n}\n\n.fs-16 {\n  font-size: 16px;\n}\n\n.fs-18 {\n  font-size: 18px;\n}\n\n.fs-20 {\n  font-size: 20px;\n}\n\n.fs-22 {\n  font-size: 22px;\n}\n\n.fs-24 {\n  font-size: 24px;\n}\n\n.fs-25 {\n  font-size: 25px;\n}\n\n.hover {\n  cursor: pointer;\n}\n\n.flex {\n  display: flex;\n  flex-wrap: wrap;\n}\n\n.flex-s {\n  display: flex;\n  align-items: flex-start;\n  flex-wrap: wrap;\n}\n\n.flex-c {\n  display: flex;\n  align-items: center;\n  flex-wrap: wrap;\n}\n\n.flex-c-c {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  flex-wrap: wrap;\n}\n\n.flex-c-sb {\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  flex-wrap: wrap;\n}\n\n.flex-1 {\n  flex: 1;\n}\n\n/**********************************/\n.page-account {\n  display: flex;\n  flex-direction: column;\n  height: 100vh;\n  overflow: auto;\n}\n\n.el-card {\n  border: none;\n}\n\n.el-popconfirm__main {\n  margin: 10px 0;\n}\n\n.el-image-viewer__close {\n  color: white;\n}\n\n.el-upload-list__item img {\n  object-fit: cover;\n}\n\n.el-select-dropdown__item {\n  padding: 0 10px;\n}\n\n/*************************************************/\n/*fade*/\n.fade-enter-active,\n.fade-leave-active {\n  -webkit-transition: opacity 0.1s;\n  transition: opacity 0.1s;\n}\n\n.fade-enter,\n.fade-leave-active {\n  opacity: 0;\n}\n\n/*fade-transform*/\n.fade-transform-leave-active,\n.fade-transform-enter-active {\n  -webkit-transition: all 0.5s;\n  transition: all 0.5s;\n}\n\n.fade-transform-enter {\n  opacity: 0;\n  -webkit-transform: translateX(-20px);\n  transform: translateX(-20px);\n}\n\n.fade-transform-leave-to {\n  opacity: 0;\n  -webkit-transform: translateX(20px);\n  transform: translateX(20px);\n}", ""]);
+exports.push([module.i, "#app,\nbody,\nhtml {\n  height: 100%;\n}\n\nbody {\n  background-color: #f7f7f7;\n  font-size: 14px;\n}\n\n.ml-2 {\n  margin-left: 2px;\n}\n\n.ml-5 {\n  margin-left: 5px;\n}\n\n.mr-5 {\n  margin-right: 5px;\n}\n\n.mt-5 {\n  margin-top: 5px;\n}\n\n.m-10 {\n  margin: 10px;\n}\n\n.ml-10 {\n  margin-left: 10px;\n}\n\n.mr-10 {\n  margin-right: 10px;\n}\n\n.mb-10 {\n  margin-bottom: 10px;\n}\n\n.mt-10 {\n  margin-top: 10px;\n}\n\n.m-15 {\n  margin: 15px;\n}\n\n.mb-15 {\n  margin-bottom: 15px;\n}\n\n.mt-15 {\n  margin-top: 15px;\n}\n\n.ml-20 {\n  margin-left: 20px;\n}\n\n.mt-30 {\n  margin-top: 30px;\n}\n\n.mt-50 {\n  margin-top: 50px;\n}\n\n.fs-12 {\n  font-size: 12px;\n}\n\n.fs-14 {\n  font-size: 14px;\n}\n\n.fs-16 {\n  font-size: 16px;\n}\n\n.fs-18 {\n  font-size: 18px;\n}\n\n.fs-20 {\n  font-size: 20px;\n}\n\n.fs-22 {\n  font-size: 22px;\n}\n\n.fs-24 {\n  font-size: 24px;\n}\n\n.fs-25 {\n  font-size: 25px;\n}\n\n.hover {\n  cursor: pointer;\n}\n\n.flex {\n  display: flex;\n  flex-wrap: wrap;\n}\n\n.flex-s {\n  display: flex;\n  align-items: flex-start;\n  flex-wrap: wrap;\n}\n\n.flex-c {\n  display: flex;\n  align-items: center;\n  flex-wrap: wrap;\n}\n\n.flex-c-c {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  flex-wrap: wrap;\n}\n\n.flex-c-sb {\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  flex-wrap: wrap;\n}\n\n.flex-1 {\n  flex: 1;\n}\n\n/**********************************/\n.page-account {\n  display: flex;\n  flex-direction: column;\n  height: 100vh;\n  overflow: auto;\n}\n\n.el-card {\n  border: none;\n}\n\n.el-popconfirm__main {\n  margin: 10px 0;\n}\n\n.el-image-viewer__close {\n  color: white;\n}\n\n.el-upload-list__item img {\n  object-fit: cover;\n}\n\n.el-select-dropdown__item {\n  padding: 0 10px;\n}\n\n/*************************************************/\n/*fade*/\n.fade-enter-active,\n.fade-leave-active {\n  -webkit-transition: opacity 0.1s;\n  transition: opacity 0.1s;\n}\n\n.fade-enter,\n.fade-leave-active {\n  opacity: 0;\n}\n\n/*fade-transform*/\n.fade-transform-leave-active,\n.fade-transform-enter-active {\n  -webkit-transition: all 0.5s;\n  transition: all 0.5s;\n}\n\n.fade-transform-enter {\n  opacity: 0;\n  -webkit-transform: translateX(-20px);\n  transform: translateX(-20px);\n}\n\n.fade-transform-leave-to {\n  opacity: 0;\n  -webkit-transform: translateX(20px);\n  transform: translateX(20px);\n}", ""]);
 
 // exports
 
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/app.js": "/app.js?id=1be6ff1deacba4b06103",
+    "/app.js": "/app.js?id=16f9cb98a45761e057b8",
     "/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",
     "/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"
 }
diff --git a/resources/js/components/widgets/Actions/VueRouteAction.vue b/resources/js/components/widgets/Actions/VueRouteAction.vue
@@ -13,8 +13,9 @@ export default {
   methods: {
     onHandle() {
       if (this.action.httpPath) {
+        window.location.href = this.http_path;
       } else {
-        //this.$router.push(this.path);
+        this.$router.push(this.path);
       }
     }
   },
@@ -26,7 +27,13 @@ export default {
       });
       return path;
     },
-    http_path() {},
+    http_path() {
+      let path = this.action.httpPath;
+      this._.forEach(this.row, (value, key) => {
+        path = this._.replace(path, "{" + key + "}", value);
+      });
+      return path;
+    },
     colum() {
       return this.scope.colum;
     },
diff --git a/resources/js/styles/admin.scss b/resources/js/styles/admin.scss
@@ -20,12 +20,15 @@ body {
 .mr-5 {
     margin-right: 5px;
 }
-.mt-5{
+
+.mt-5 {
     margin-top: 5px;
 }
-.m-10{
+
+.m-10 {
     margin: 10px;
 }
+
 .ml-10 {
     margin-left: 10px;
 }
@@ -42,13 +45,18 @@ body {
     margin-top: 10px;
 }
 
-.m-15{
+.m-15 {
     margin: 15px;
 }
+
 .mb-15 {
     margin-bottom: 15px;
 }
 
+.mt-15 {
+    margin-top: 15px;
+}
+
 .ml-20 {
     margin-left: 20px;
 }
@@ -101,11 +109,13 @@ body {
     display: flex;
     flex-wrap: wrap;
 }
+
 .flex-s {
     display: flex;
     align-items: flex-start;
     flex-wrap: wrap;
 }
+
 .flex-c {
     display: flex;
     align-items: center;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "/app.js": "/app.js?id=1be6ff1deacba4b06103",`
	`2`	`+ "/app.js": "/app.js?id=16f9cb98a45761e057b8",`
`3`	`3`	`"/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",`
`4`	`4`	`"/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"`
`5`	`5`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,12 +20,15 @@ body {`
`20`	`20`	`.mr-5 {`
`21`	`21`	`margin-right: 5px;`
`22`	`22`	`}`
`23`		`-.mt-5{`
	`23`	`+`
	`24`	`+.mt-5 {`
`24`	`25`	`margin-top: 5px;`
`25`	`26`	`}`
`26`		`-.m-10{`
	`27`	`+`
	`28`	`+.m-10 {`
`27`	`29`	`margin: 10px;`
`28`	`30`	`}`
	`31`	`+`
`29`	`32`	`.ml-10 {`
`30`	`33`	`margin-left: 10px;`
`31`	`34`	`}`
`@@ -42,13 +45,18 @@ body {`
`42`	`45`	`margin-top: 10px;`
`43`	`46`	`}`
`44`	`47`
`45`		`-.m-15{`
	`48`	`+.m-15 {`
`46`	`49`	`margin: 15px;`
`47`	`50`	`}`
	`51`	`+`
`48`	`52`	`.mb-15 {`
`49`	`53`	`margin-bottom: 15px;`
`50`	`54`	`}`
`51`	`55`
	`56`	`+.mt-15 {`
	`57`	`+ margin-top: 15px;`
	`58`	`+}`
	`59`	`+`
`52`	`60`	`.ml-20 {`
`53`	`61`	`margin-left: 20px;`
`54`	`62`	`}`
`@@ -101,11 +109,13 @@ body {`
`101`	`109`	`display: flex;`
`102`	`110`	`flex-wrap: wrap;`
`103`	`111`	`}`
	`112`	`+`
`104`	`113`	`.flex-s {`
`105`	`114`	`display: flex;`
`106`	`115`	`align-items: flex-start;`
`107`	`116`	`flex-wrap: wrap;`
`108`	`117`	`}`
	`118`	`+`
`109`	`119`	`.flex-c {`
`110`	`120`	`display: flex;`
`111`	`121`	`align-items: center;`