Skip to content

Commit 45948fc

Browse files
newpanjingnewpanjing
authored
Merge pull request #135 from newpanjing/dev
2.7
2 parents bd1e05f + 34868c9 commit 45948fc

File tree

293 files changed

+16318
-6991
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

293 files changed

+16318
-6991
lines changed

‎simpleui/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
def get_version():
2-
return '2.6'
2+
return '2.7'

‎simpleui/static/admin/simpleui-x/css/index.css

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

‎simpleui/static/admin/simpleui-x/css/index.css.map

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

‎simpleui/static/admin/simpleui-x/css/index.less

+19-2
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,13 @@ html, body {
203203
width: 100%;
204204
}
205205

206+
#home {
207+
.upgrade {
208+
color: #1db393;
209+
font-size: 16px;
210+
}
211+
}
212+
206213
.el-breadcrumb__item .fas {
207214
margin-right: 5px;
208215
}
@@ -357,6 +364,14 @@ html, body {
357364
margin: 10px;
358365
border: #FFF 1px solid;
359366

367+
.card-name {
368+
height: 25px;
369+
overflow: hidden;
370+
display: block;
371+
text-overflow: ellipsis;
372+
white-space: nowrap;
373+
}
374+
360375
.icon {
361376
display: block;
362377
text-align: center;
@@ -388,11 +403,13 @@ html, body {
388403
}
389404

390405
.menu {
391-
overflow-x:hidden ;
406+
overflow-x: hidden;
392407
/*滚动条样式*/
393-
.el-icon-arrow-right{
408+
409+
.el-icon-arrow-right {
394410
display: none;
395411
}
412+
396413
&::-webkit-scrollbar {
397414
width: 4px;
398415
}

‎simpleui/static/admin/simpleui-x/elementui/alert.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ module.exports =
8282
/******/
8383
/******/
8484
/******/ // Load entry module and return exports
85-
/******/ return __webpack_require__(__webpack_require__.s = 83);
85+
/******/ return __webpack_require__(__webpack_require__.s = 97);
8686
/******/ })
8787
/************************************************************************/
8888
/******/ ({
@@ -189,13 +189,13 @@ function normalizeComponent (
189189

190190
/***/ }),
191191

192-
/***/ 83:
192+
/***/ 97:
193193
/***/ (function(module, __webpack_exports__, __webpack_require__) {
194194

195195
"use strict";
196196
__webpack_require__.r(__webpack_exports__);
197197

198-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/alert/src/main.vue?vue&type=template&id=6e53341b&
198+
// CONCATENATED MODULE: ./node_modules/[email protected]@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/[email protected]@vue-loader/lib??vue-loader-options!./packages/alert/src/main.vue?vue&type=template&id=6e53341b&
199199
var render = function() {
200200
var _vm = this
201201
var _h = _vm.$createElement
@@ -284,7 +284,7 @@ render._withStripped = true
284284

285285
// CONCATENATED MODULE: ./packages/alert/src/main.vue?vue&type=template&id=6e53341b&
286286

287-
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/alert/src/main.vue?vue&type=script&lang=js&
287+
// CONCATENATED MODULE: ./node_modules/[email protected]@babel-loader/lib!./node_modules/[email protected]@vue-loader/lib??vue-loader-options!./packages/alert/src/main.vue?vue&type=script&lang=js&
288288
//
289289
//
290290
//
@@ -378,7 +378,7 @@ var TYPE_CLASSES_MAP = {
378378
});
379379
// CONCATENATED MODULE: ./packages/alert/src/main.vue?vue&type=script&lang=js&
380380
/* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
381-
// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
381+
// EXTERNAL MODULE: ./node_modules/[email protected]@vue-loader/lib/runtime/componentNormalizer.js
382382
var componentNormalizer = __webpack_require__(0);
383383

384384
// CONCATENATED MODULE: ./packages/alert/src/main.vue

‎simpleui/static/admin/simpleui-x/elementui/aside.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ module.exports =
8282
/******/
8383
/******/
8484
/******/ // Load entry module and return exports
85-
/******/ return __webpack_require__(__webpack_require__.s = 80);
85+
/******/ return __webpack_require__(__webpack_require__.s = 113);
8686
/******/ })
8787
/************************************************************************/
8888
/******/ ({
@@ -189,13 +189,13 @@ function normalizeComponent (
189189

190190
/***/ }),
191191

192-
/***/ 80:
192+
/***/ 113:
193193
/***/ (function(module, __webpack_exports__, __webpack_require__) {
194194

195195
"use strict";
196196
__webpack_require__.r(__webpack_exports__);
197197

198-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/aside/src/main.vue?vue&type=template&id=03411dbf&
198+
// CONCATENATED MODULE: ./node_modules/[email protected]@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/[email protected]@vue-loader/lib??vue-loader-options!./packages/aside/src/main.vue?vue&type=template&id=03411dbf&
199199
var render = function() {
200200
var _vm = this
201201
var _h = _vm.$createElement
@@ -213,7 +213,7 @@ render._withStripped = true
213213

214214
// CONCATENATED MODULE: ./packages/aside/src/main.vue?vue&type=template&id=03411dbf&
215215

216-
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/aside/src/main.vue?vue&type=script&lang=js&
216+
// CONCATENATED MODULE: ./node_modules/[email protected]@babel-loader/lib!./node_modules/[email protected]@vue-loader/lib??vue-loader-options!./packages/aside/src/main.vue?vue&type=script&lang=js&
217217
//
218218
//
219219
//
@@ -235,7 +235,7 @@ render._withStripped = true
235235
});
236236
// CONCATENATED MODULE: ./packages/aside/src/main.vue?vue&type=script&lang=js&
237237
/* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
238-
// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
238+
// EXTERNAL MODULE: ./node_modules/[email protected]@vue-loader/lib/runtime/componentNormalizer.js
239239
var componentNormalizer = __webpack_require__(0);
240240

241241
// CONCATENATED MODULE: ./packages/aside/src/main.vue

‎simpleui/static/admin/simpleui-x/elementui/autocomplete.js

+27-27
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ module.exports =
8282
/******/
8383
/******/
8484
/******/ // Load entry module and return exports
85-
/******/ return __webpack_require__(__webpack_require__.s = 56);
85+
/******/ return __webpack_require__(__webpack_require__.s = 62);
8686
/******/ })
8787
/************************************************************************/
8888
/******/ ({
@@ -199,25 +199,32 @@ module.exports = require("element-ui/lib/mixins/migrating");
199199
/***/ 11:
200200
/***/ (function(module, exports) {
201201

202+
module.exports = require("element-ui/lib/input");
203+
204+
/***/ }),
205+
206+
/***/ 12:
207+
/***/ (function(module, exports) {
208+
202209
module.exports = require("element-ui/lib/utils/clickoutside");
203210

204211
/***/ }),
205212

206213
/***/ 13:
207214
/***/ (function(module, exports) {
208215

209-
module.exports = require("throttle-debounce/debounce");
216+
module.exports = require("element-ui/lib/scrollbar");
210217

211218
/***/ }),
212219

213-
/***/ 17:
220+
/***/ 16:
214221
/***/ (function(module, exports) {
215222

216-
module.exports = require("element-ui/lib/scrollbar");
223+
module.exports = require("throttle-debounce/debounce");
217224

218225
/***/ }),
219226

220-
/***/ 19:
227+
/***/ 21:
221228
/***/ (function(module, exports) {
222229

223230
module.exports = require("element-ui/lib/mixins/focus");
@@ -227,14 +234,14 @@ module.exports = require("element-ui/lib/mixins/focus");
227234
/***/ 3:
228235
/***/ (function(module, exports) {
229236

230-
module.exports = require("element-ui/lib/mixins/emitter");
237+
module.exports = require("element-ui/lib/utils/util");
231238

232239
/***/ }),
233240

234241
/***/ 4:
235242
/***/ (function(module, exports) {
236243

237-
module.exports = require("element-ui/lib/utils/util");
244+
module.exports = require("element-ui/lib/mixins/emitter");
238245

239246
/***/ }),
240247

@@ -245,13 +252,13 @@ module.exports = require("element-ui/lib/utils/vue-popper");
245252

246253
/***/ }),
247254

248-
/***/ 56:
255+
/***/ 62:
249256
/***/ (function(module, __webpack_exports__, __webpack_require__) {
250257

251258
"use strict";
252259
__webpack_require__.r(__webpack_exports__);
253260

254-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete.vue?vue&type=template&id=152f2ee6&
261+
// CONCATENATED MODULE: ./node_modules/[email protected]@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/[email protected]@vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete.vue?vue&type=template&id=152f2ee6&
255262
var render = function() {
256263
var _vm = this
257264
var _h = _vm.$createElement
@@ -411,18 +418,18 @@ render._withStripped = true
411418
// CONCATENATED MODULE: ./packages/autocomplete/src/autocomplete.vue?vue&type=template&id=152f2ee6&
412419

413420
// EXTERNAL MODULE: external "throttle-debounce/debounce"
414-
var debounce_ = __webpack_require__(13);
421+
var debounce_ = __webpack_require__(16);
415422
var debounce_default = /*#__PURE__*/__webpack_require__.n(debounce_);
416423

417424
// EXTERNAL MODULE: external "element-ui/lib/input"
418-
var input_ = __webpack_require__(9);
425+
var input_ = __webpack_require__(11);
419426
var input_default = /*#__PURE__*/__webpack_require__.n(input_);
420427

421428
// EXTERNAL MODULE: external "element-ui/lib/utils/clickoutside"
422-
var clickoutside_ = __webpack_require__(11);
429+
var clickoutside_ = __webpack_require__(12);
423430
var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
424431

425-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete-suggestions.vue?vue&type=template&id=cd10dcf0&
432+
// CONCATENATED MODULE: ./node_modules/[email protected]@vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/[email protected]@vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete-suggestions.vue?vue&type=template&id=cd10dcf0&
426433
var autocomplete_suggestionsvue_type_template_id_cd10dcf0_render = function() {
427434
var _vm = this
428435
var _h = _vm.$createElement
@@ -483,14 +490,14 @@ var vue_popper_ = __webpack_require__(5);
483490
var vue_popper_default = /*#__PURE__*/__webpack_require__.n(vue_popper_);
484491

485492
// EXTERNAL MODULE: external "element-ui/lib/mixins/emitter"
486-
var emitter_ = __webpack_require__(3);
493+
var emitter_ = __webpack_require__(4);
487494
var emitter_default = /*#__PURE__*/__webpack_require__.n(emitter_);
488495

489496
// EXTERNAL MODULE: external "element-ui/lib/scrollbar"
490-
var scrollbar_ = __webpack_require__(17);
497+
var scrollbar_ = __webpack_require__(13);
491498
var scrollbar_default = /*#__PURE__*/__webpack_require__.n(scrollbar_);
492499

493-
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete-suggestions.vue?vue&type=script&lang=js&
500+
// CONCATENATED MODULE: ./node_modules/[email protected]@babel-loader/lib!./node_modules/[email protected]@vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete-suggestions.vue?vue&type=script&lang=js&
494501
//
495502
//
496503
//
@@ -571,7 +578,7 @@ var scrollbar_default = /*#__PURE__*/__webpack_require__.n(scrollbar_);
571578
});
572579
// CONCATENATED MODULE: ./packages/autocomplete/src/autocomplete-suggestions.vue?vue&type=script&lang=js&
573580
/* harmony default export */ var src_autocomplete_suggestionsvue_type_script_lang_js_ = (autocomplete_suggestionsvue_type_script_lang_js_);
574-
// EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
581+
// EXTERNAL MODULE: ./node_modules/[email protected]@vue-loader/lib/runtime/componentNormalizer.js
575582
var componentNormalizer = __webpack_require__(0);
576583

577584
// CONCATENATED MODULE: ./packages/autocomplete/src/autocomplete-suggestions.vue
@@ -602,13 +609,13 @@ var migrating_ = __webpack_require__(10);
602609
var migrating_default = /*#__PURE__*/__webpack_require__.n(migrating_);
603610

604611
// EXTERNAL MODULE: external "element-ui/lib/utils/util"
605-
var util_ = __webpack_require__(4);
612+
var util_ = __webpack_require__(3);
606613

607614
// EXTERNAL MODULE: external "element-ui/lib/mixins/focus"
608-
var focus_ = __webpack_require__(19);
615+
var focus_ = __webpack_require__(21);
609616
var focus_default = /*#__PURE__*/__webpack_require__.n(focus_);
610617

611-
// CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete.vue?vue&type=script&lang=js&
618+
// CONCATENATED MODULE: ./node_modules/[email protected]@babel-loader/lib!./node_modules/[email protected]@vue-loader/lib??vue-loader-options!./packages/autocomplete/src/autocomplete.vue?vue&type=script&lang=js&
612619
//
613620
//
614621
//
@@ -935,13 +942,6 @@ autocomplete.install = function (Vue) {
935942

936943
/* harmony default export */ var packages_autocomplete = __webpack_exports__["default"] = (autocomplete);
937944

938-
/***/ }),
939-
940-
/***/ 9:
941-
/***/ (function(module, exports) {
942-
943-
module.exports = require("element-ui/lib/input");
944-
945945
/***/ })
946946

947947
/******/ });

0 commit comments

Comments
 (0)