Skip to content

Commit 1f6a40e

Browse files
SmallRuralDogSmallRuralDog
committed
修复根布局内边距失效问题
1 parent ba55f3a commit 1f6a40e

File tree

7 files changed

+566
-4
lines changed

7 files changed

+566
-4
lines changed

‎public/1.js

+281
Large diffs are not rendered by default.

‎public/2.js

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[2],{
2+
3+
/***/ "./node_modules/babel-loader/lib/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/antv/AntvArea.vue?vue&type=script&lang=js&":
4+
/*!************************************************************************************************************************************************************************!*\
5+
!*** ./node_modules/babel-loader/lib??ref--4-0!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/components/antv/AntvArea.vue?vue&type=script&lang=js& ***!
6+
\************************************************************************************************************************************************************************/
7+
/*! exports provided: default */
8+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
9+
10+
"use strict";
11+
__webpack_require__.r(__webpack_exports__);
12+
/* harmony import */ var _antv_g2plot__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @antv/g2plot */ "./node_modules/@antv/g2plot/esm/index.js");
13+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
14+
15+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
16+
17+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
18+
19+
//
20+
//
21+
//
22+
23+
/* harmony default export */ __webpack_exports__["default"] = ({
24+
props: {
25+
attrs: Object
26+
},
27+
data: function data() {
28+
return {
29+
antv: null
30+
};
31+
},
32+
mounted: function mounted() {
33+
this.antv = new _antv_g2plot__WEBPACK_IMPORTED_MODULE_0__["Area"](this.attrs.canvasId, _objectSpread({
34+
data: this.attrs.data
35+
}, this.attrs.config));
36+
this.antv.render();
37+
},
38+
updated: function updated() {
39+
this.antv.changeData(this.attrs.data);
40+
},
41+
destroyed: function destroyed() {//this.antv.destory();
42+
}
43+
});
44+
45+
/***/ }),
46+
47+
/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/antv/AntvArea.vue?vue&type=template&id=8f3a15be&":
48+
/*!****************************************************************************************************************************************************************************************************************!*\
49+
!*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/components/antv/AntvArea.vue?vue&type=template&id=8f3a15be& ***!
50+
\****************************************************************************************************************************************************************************************************************/
51+
/*! exports provided: render, staticRenderFns */
52+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
53+
54+
"use strict";
55+
__webpack_require__.r(__webpack_exports__);
56+
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
57+
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
58+
var render = function() {
59+
var _vm = this
60+
var _h = _vm.$createElement
61+
var _c = _vm._self._c || _h
62+
return _c("div", { attrs: { id: _vm.attrs.canvasId } })
63+
}
64+
var staticRenderFns = []
65+
render._withStripped = true
66+
67+
68+
69+
/***/ }),
70+
71+
/***/ "./resources/js/components/antv/AntvArea.vue":
72+
/*!***************************************************!*\
73+
!*** ./resources/js/components/antv/AntvArea.vue ***!
74+
\***************************************************/
75+
/*! exports provided: default */
76+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
77+
78+
"use strict";
79+
__webpack_require__.r(__webpack_exports__);
80+
/* harmony import */ var _AntvArea_vue_vue_type_template_id_8f3a15be___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./AntvArea.vue?vue&type=template&id=8f3a15be& */ "./resources/js/components/antv/AntvArea.vue?vue&type=template&id=8f3a15be&");
81+
/* harmony import */ var _AntvArea_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./AntvArea.vue?vue&type=script&lang=js& */ "./resources/js/components/antv/AntvArea.vue?vue&type=script&lang=js&");
82+
/* empty/unused harmony star reexport *//* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js */ "./node_modules/vue-loader/lib/runtime/componentNormalizer.js");
83+
84+
85+
86+
87+
88+
/* normalize component */
89+
90+
var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
91+
_AntvArea_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
92+
_AntvArea_vue_vue_type_template_id_8f3a15be___WEBPACK_IMPORTED_MODULE_0__["render"],
93+
_AntvArea_vue_vue_type_template_id_8f3a15be___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
94+
false,
95+
null,
96+
null,
97+
null
98+
99+
)
100+
101+
/* hot reload */
102+
if (false) { var api; }
103+
component.options.__file = "resources/js/components/antv/AntvArea.vue"
104+
/* harmony default export */ __webpack_exports__["default"] = (component.exports);
105+
106+
/***/ }),
107+
108+
/***/ "./resources/js/components/antv/AntvArea.vue?vue&type=script&lang=js&":
109+
/*!****************************************************************************!*\
110+
!*** ./resources/js/components/antv/AntvArea.vue?vue&type=script&lang=js& ***!
111+
\****************************************************************************/
112+
/*! exports provided: default */
113+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
114+
115+
"use strict";
116+
__webpack_require__.r(__webpack_exports__);
117+
/* harmony import */ var _node_modules_babel_loader_lib_index_js_ref_4_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvArea_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../node_modules/babel-loader/lib??ref--4-0!../../../../node_modules/vue-loader/lib??vue-loader-options!./AntvArea.vue?vue&type=script&lang=js& */ "./node_modules/babel-loader/lib/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/antv/AntvArea.vue?vue&type=script&lang=js&");
118+
/* empty/unused harmony star reexport */ /* harmony default export */ __webpack_exports__["default"] = (_node_modules_babel_loader_lib_index_js_ref_4_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvArea_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__["default"]);
119+
120+
/***/ }),
121+
122+
/***/ "./resources/js/components/antv/AntvArea.vue?vue&type=template&id=8f3a15be&":
123+
/*!**********************************************************************************!*\
124+
!*** ./resources/js/components/antv/AntvArea.vue?vue&type=template&id=8f3a15be& ***!
125+
\**********************************************************************************/
126+
/*! exports provided: render, staticRenderFns */
127+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
128+
129+
"use strict";
130+
__webpack_require__.r(__webpack_exports__);
131+
/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvArea_vue_vue_type_template_id_8f3a15be___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../node_modules/vue-loader/lib??vue-loader-options!./AntvArea.vue?vue&type=template&id=8f3a15be& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/antv/AntvArea.vue?vue&type=template&id=8f3a15be&");
132+
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvArea_vue_vue_type_template_id_8f3a15be___WEBPACK_IMPORTED_MODULE_0__["render"]; });
133+
134+
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvArea_vue_vue_type_template_id_8f3a15be___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
135+
136+
137+
138+
/***/ })
139+
140+
}]);

‎public/3.js

+140
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
(window["webpackJsonp"] = window["webpackJsonp"] || []).push([[3],{
2+
3+
/***/ "./node_modules/babel-loader/lib/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/antv/AntvColumn.vue?vue&type=script&lang=js&":
4+
/*!**************************************************************************************************************************************************************************!*\
5+
!*** ./node_modules/babel-loader/lib??ref--4-0!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/components/antv/AntvColumn.vue?vue&type=script&lang=js& ***!
6+
\**************************************************************************************************************************************************************************/
7+
/*! exports provided: default */
8+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
9+
10+
"use strict";
11+
__webpack_require__.r(__webpack_exports__);
12+
/* harmony import */ var _antv_g2plot__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @antv/g2plot */ "./node_modules/@antv/g2plot/esm/index.js");
13+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
14+
15+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
16+
17+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
18+
19+
//
20+
//
21+
//
22+
23+
/* harmony default export */ __webpack_exports__["default"] = ({
24+
props: {
25+
attrs: Object
26+
},
27+
data: function data() {
28+
return {
29+
antv: null
30+
};
31+
},
32+
mounted: function mounted() {
33+
this.antv = new _antv_g2plot__WEBPACK_IMPORTED_MODULE_0__["Column"](this.attrs.canvasId, _objectSpread({
34+
data: this.attrs.data
35+
}, this.attrs.config));
36+
this.antv.render();
37+
},
38+
updated: function updated() {
39+
this.antv.changeData(this.attrs.data);
40+
},
41+
destroyed: function destroyed() {//this.antv.destory();
42+
}
43+
});
44+
45+
/***/ }),
46+
47+
/***/ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/antv/AntvColumn.vue?vue&type=template&id=8955872c&":
48+
/*!******************************************************************************************************************************************************************************************************************!*\
49+
!*** ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./resources/js/components/antv/AntvColumn.vue?vue&type=template&id=8955872c& ***!
50+
\******************************************************************************************************************************************************************************************************************/
51+
/*! exports provided: render, staticRenderFns */
52+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
53+
54+
"use strict";
55+
__webpack_require__.r(__webpack_exports__);
56+
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "render", function() { return render; });
57+
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return staticRenderFns; });
58+
var render = function() {
59+
var _vm = this
60+
var _h = _vm.$createElement
61+
var _c = _vm._self._c || _h
62+
return _c("div", { attrs: { id: _vm.attrs.canvasId } })
63+
}
64+
var staticRenderFns = []
65+
render._withStripped = true
66+
67+
68+
69+
/***/ }),
70+
71+
/***/ "./resources/js/components/antv/AntvColumn.vue":
72+
/*!*****************************************************!*\
73+
!*** ./resources/js/components/antv/AntvColumn.vue ***!
74+
\*****************************************************/
75+
/*! exports provided: default */
76+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
77+
78+
"use strict";
79+
__webpack_require__.r(__webpack_exports__);
80+
/* harmony import */ var _AntvColumn_vue_vue_type_template_id_8955872c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./AntvColumn.vue?vue&type=template&id=8955872c& */ "./resources/js/components/antv/AntvColumn.vue?vue&type=template&id=8955872c&");
81+
/* harmony import */ var _AntvColumn_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./AntvColumn.vue?vue&type=script&lang=js& */ "./resources/js/components/antv/AntvColumn.vue?vue&type=script&lang=js&");
82+
/* empty/unused harmony star reexport *//* harmony import */ var _node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../../../../node_modules/vue-loader/lib/runtime/componentNormalizer.js */ "./node_modules/vue-loader/lib/runtime/componentNormalizer.js");
83+
84+
85+
86+
87+
88+
/* normalize component */
89+
90+
var component = Object(_node_modules_vue_loader_lib_runtime_componentNormalizer_js__WEBPACK_IMPORTED_MODULE_2__["default"])(
91+
_AntvColumn_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_1__["default"],
92+
_AntvColumn_vue_vue_type_template_id_8955872c___WEBPACK_IMPORTED_MODULE_0__["render"],
93+
_AntvColumn_vue_vue_type_template_id_8955872c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"],
94+
false,
95+
null,
96+
null,
97+
null
98+
99+
)
100+
101+
/* hot reload */
102+
if (false) { var api; }
103+
component.options.__file = "resources/js/components/antv/AntvColumn.vue"
104+
/* harmony default export */ __webpack_exports__["default"] = (component.exports);
105+
106+
/***/ }),
107+
108+
/***/ "./resources/js/components/antv/AntvColumn.vue?vue&type=script&lang=js&":
109+
/*!******************************************************************************!*\
110+
!*** ./resources/js/components/antv/AntvColumn.vue?vue&type=script&lang=js& ***!
111+
\******************************************************************************/
112+
/*! exports provided: default */
113+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
114+
115+
"use strict";
116+
__webpack_require__.r(__webpack_exports__);
117+
/* harmony import */ var _node_modules_babel_loader_lib_index_js_ref_4_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvColumn_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../node_modules/babel-loader/lib??ref--4-0!../../../../node_modules/vue-loader/lib??vue-loader-options!./AntvColumn.vue?vue&type=script&lang=js& */ "./node_modules/babel-loader/lib/index.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/antv/AntvColumn.vue?vue&type=script&lang=js&");
118+
/* empty/unused harmony star reexport */ /* harmony default export */ __webpack_exports__["default"] = (_node_modules_babel_loader_lib_index_js_ref_4_0_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvColumn_vue_vue_type_script_lang_js___WEBPACK_IMPORTED_MODULE_0__["default"]);
119+
120+
/***/ }),
121+
122+
/***/ "./resources/js/components/antv/AntvColumn.vue?vue&type=template&id=8955872c&":
123+
/*!************************************************************************************!*\
124+
!*** ./resources/js/components/antv/AntvColumn.vue?vue&type=template&id=8955872c& ***!
125+
\************************************************************************************/
126+
/*! exports provided: render, staticRenderFns */
127+
/***/ (function(module, __webpack_exports__, __webpack_require__) {
128+
129+
"use strict";
130+
__webpack_require__.r(__webpack_exports__);
131+
/* harmony import */ var _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvColumn_vue_vue_type_template_id_8955872c___WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! -!../../../../node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!../../../../node_modules/vue-loader/lib??vue-loader-options!./AntvColumn.vue?vue&type=template&id=8955872c& */ "./node_modules/vue-loader/lib/loaders/templateLoader.js?!./node_modules/vue-loader/lib/index.js?!./resources/js/components/antv/AntvColumn.vue?vue&type=template&id=8955872c&");
132+
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "render", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvColumn_vue_vue_type_template_id_8955872c___WEBPACK_IMPORTED_MODULE_0__["render"]; });
133+
134+
/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "staticRenderFns", function() { return _node_modules_vue_loader_lib_loaders_templateLoader_js_vue_loader_options_node_modules_vue_loader_lib_index_js_vue_loader_options_AntvColumn_vue_vue_type_template_id_8955872c___WEBPACK_IMPORTED_MODULE_0__["staticRenderFns"]; });
135+
136+
137+
138+
/***/ })
139+
140+
}]);

‎public/app.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎public/mix-manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"/app.js": "/app.js?id=df856329fcfbbd195706",
2+
"/app.js": "/app.js?id=beb2afa4a0bcd20be1f4",
33
"/manifest.js": "/manifest.js?id=8991394a854ee5cdffc3",
44
"/vendor.js": "/vendor.js?id=19cf768af01908eb256c"
55
}

‎resources/js/components/layout/Base.vue

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ export default {
4242
4343
this.pathKey = this.path + queryKey;
4444
45-
console.log(this.pathKey);
4645
4746
this.$store.commit("setPath", this.pathKey);
4847

‎resources/js/styles/admin.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,9 @@ body {
201201
.tool-button+.tool-button {
202202
margin-left: 10px;
203203
}
204-
204+
.el-main{
205+
padding: 0;
206+
}
205207
/*************************************************/
206208

207209
/*fade*/

0 commit comments

Comments
 (0)