Skip to content

Commit c25d350

Browse files
committed
Select 添加远程搜索事件
Upload 修改class
1 parent bc551df commit c25d350

File tree

6 files changed

+33
-12
lines changed

6 files changed

+33
-12
lines changed

public/app.js

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2153,6 +2153,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
21532153
//
21542154
//
21552155
//
2156+
//
21562157
/* harmony default export */ __webpack_exports__["default"] = ({
21572158
data: function data() {
21582159
return {
@@ -2347,7 +2348,6 @@ __webpack_require__.r(__webpack_exports__);
23472348
//
23482349
//
23492350
//
2350-
//
23512351
/* harmony default export */ __webpack_exports__["default"] = ({
23522352
props: {
23532353
scope: Object,
@@ -3482,6 +3482,17 @@ __webpack_require__.r(__webpack_exports__);
34823482
methods: {
34833483
onChange: function onChange(value) {
34843484
this.$emit("change", value);
3485+
},
3486+
remoteMethod: function remoteMethod(query) {
3487+
var _this = this;
3488+
3489+
this.$http.get(this.attrs.remoteUrl, {
3490+
params: {
3491+
query: query
3492+
}
3493+
}).then(function (res) {
3494+
_this.options = res.data;
3495+
});
34853496
}
34863497
}
34873498
});
@@ -6218,7 +6229,7 @@ exports = module.exports = __webpack_require__(/*! ../../../../node_modules/css-
62186229

62196230

62206231
// module
6221-
exports.push([module.i, ".upload-component {\n display: flex;\n flex-wrap: wrap;\n}\n.upload-component .upload-images {\n display: flex;\n flex-wrap: wrap;\n}\n.upload-component .upload-images .upload-images-item + .upload-images-item {\n margin-right: 10px;\n}\n.upload-component .upload-images .upload-images-item {\n position: relative;\n line-height: 1;\n}\n.upload-component .upload-images .upload-images-item img {\n line-height: 1;\n vertical-align: middle;\n}\n.upload-component .upload-images .upload-images-item .el-image {\n cursor: zoom-in;\n}\n.upload-component .upload-images .upload-images-item .el-icon-document-checked {\n font-size: 30px;\n}\n.upload-component .upload-images .upload-images-item .mask {\n position: absolute;\n transition: all 0.3s ease-in-out;\n opacity: 0;\n background: rgba(0, 0, 0, 0.3);\n color: white;\n font-size: 20px;\n padding: 5px;\n top: 50%;\n left: 50%;\n cursor: pointer;\n transform: translate(-50%, -50%);\n}\n.upload-component .upload-images .upload-images-item:hover .mask {\n opacity: 1;\n}\n.upload-component .upload-images .upload-show-image {\n border: 1px solid #dcdfe6;\n padding: 2px;\n}\n.upload-component .upload-block .el-upload-dragger {\n width: unset;\n height: unset;\n border: none;\n border-radius: 0;\n}\n.upload-component .upload-block .avatar {\n border-radius: 50%;\n}\n.upload-component .upload-block .image,\n.upload-component .upload-block .file {\n border-radius: 0;\n}", ""]);
6232+
exports.push([module.i, ".upload-component {\n display: flex;\n flex-wrap: wrap;\n}\n.upload-component .upload-images {\n display: flex;\n flex-wrap: wrap;\n}\n.upload-component .upload-images .upload-images-item + .upload-images-item {\n margin-left: 10px;\n}\n.upload-component .upload-images .upload-images-item {\n position: relative;\n line-height: 1;\n}\n.upload-component .upload-images .upload-images-item img {\n line-height: 1;\n vertical-align: middle;\n}\n.upload-component .upload-images .upload-images-item .el-image {\n cursor: zoom-in;\n}\n.upload-component .upload-images .upload-images-item .el-icon-document-checked {\n font-size: 30px;\n}\n.upload-component .upload-images .upload-images-item .mask {\n position: absolute;\n transition: all 0.3s ease-in-out;\n opacity: 0;\n background: rgba(0, 0, 0, 0.3);\n color: white;\n font-size: 20px;\n padding: 5px;\n top: 50%;\n left: 50%;\n cursor: pointer;\n transform: translate(-50%, -50%);\n}\n.upload-component .upload-images .upload-images-item:hover .mask {\n opacity: 1;\n}\n.upload-component .upload-images .upload-show-image {\n border: 1px solid #dcdfe6;\n padding: 2px;\n}\n.upload-component .upload-block .el-upload-dragger {\n width: unset;\n height: unset;\n border: none;\n border-radius: 0;\n}\n.upload-component .upload-block .avatar {\n border-radius: 50%;\n}\n.upload-component .upload-block .image,\n.upload-component .upload-block .file {\n border-radius: 0;\n}", ""]);
62226233

62236234
// exports
62246235

@@ -29395,8 +29406,11 @@ var render = function() {
2939529406
expression: "loading"
2939629407
}
2939729408
],
29398-
staticStyle: { "min-height": "100px" },
29399-
attrs: { "element-loading-background": "rgba(0, 0, 0, 0)" }
29409+
staticStyle: { "min-height": "150px" },
29410+
attrs: {
29411+
"element-loading-spinner": "el-icon-loading",
29412+
"element-loading-background": "rgba(0, 0, 0, 0)"
29413+
}
2940029414
},
2940129415
[
2940229416
!_vm.loading
@@ -29621,7 +29635,6 @@ var render = function() {
2962129635
return _c(
2962229636
"el-button",
2962329637
{
29624-
staticClass: "mr-10",
2962529638
attrs: {
2962629639
type: _vm.action.type,
2962729640
size: _vm.action.size,
@@ -30478,7 +30491,8 @@ var render = function() {
3047830491
"reserve-keyword": _vm.attrs.reserveKeyword,
3047930492
"default-first-option": _vm.attrs.defaultFirstOption,
3048030493
"popper-append-to-body": _vm.attrs.popperAppendToBody,
30481-
"automatic-dropdown": _vm.attrs.automaticDropdown
30494+
"automatic-dropdown": _vm.attrs.automaticDropdown,
30495+
"remote-method": _vm.remoteMethod
3048230496
},
3048330497
on: { change: _vm.onChange }
3048430498
},

public/mix-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=23a4859c644d4b2b623b",
2+
"/app.js": "/app.js?id=518c74882b2887781e7e",
33
"/manifest.js": "/manifest.js?id=d9708e48a6c10ccee4bb",
44
"/vendor.js": "/vendor.js?id=f4679ac178c0e413cb28"
55
}

resources/js/components/layout/Base.vue

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<template>
22
<div
3-
style="min-height:100px;"
3+
style="min-height:150px;"
44
v-loading="loading"
5+
element-loading-spinner="el-icon-loading"
56
element-loading-background="rgba(0, 0, 0, 0)"
67
>
78
<component

resources/js/components/widgets/Actions/ActionButton.vue

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
:icon="action.icon"
1010
:autofocus="action.autofocus"
1111
:loading="loading"
12-
class="mr-10"
1312
@click="onClick"
1413
>{{ action.content }}</el-button
1514
>

resources/js/components/widgets/Select.vue

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
:default-first-option="attrs.defaultFirstOption"
2525
:popper-append-to-body="attrs.popperAppendToBody"
2626
:automatic-dropdown="attrs.automaticDropdown"
27+
:remote-method="remoteMethod"
2728
@change="onChange"
2829
>
2930
<el-option
@@ -33,7 +34,6 @@
3334
:value="item.value"
3435
:disabled="item.disabled"
3536
>
36-
3737
<div class="flex-c-sb">
3838
<div class="flex-c">
3939
<el-avatar
@@ -53,7 +53,7 @@
5353
export default {
5454
props: {
5555
attrs: Object,
56-
form_data:Object,
56+
form_data: Object,
5757
value: {
5858
default: null
5959
}
@@ -70,6 +70,13 @@ export default {
7070
methods: {
7171
onChange(value) {
7272
this.$emit("change", value);
73+
},
74+
remoteMethod(query) {
75+
this.$http
76+
.get(this.attrs.remoteUrl, { params: { query: query } })
77+
.then(res => {
78+
this.options = res.data;
79+
});
7380
}
7481
}
7582
};

resources/js/components/widgets/Upload.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export default {
197197
display: flex;
198198
flex-wrap: wrap;
199199
.upload-images-item + .upload-images-item {
200-
margin-right: 10px;
200+
margin-left: 10px;
201201
}
202202
.upload-images-item {
203203
position: relative;

0 commit comments

Comments
 (0)