From b6c59fbddd0da5a20388806aa8940580f08d81fa Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sun, 10 Mar 2019 19:09:30 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E4=B8=AD=E6=96=87=E6=8F=90=E7=A4=BA=20?= =?UTF-8?q?=E6=9B=B4=E5=AE=B9=E6=98=93=E7=90=86=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 046a788f98caf7819b7445d8f49e0f33ced48a4a [formerly 432dd0e37f094a7e4a4c95812c9ef843cf2782c8] [formerly 046a788f98caf7819b7445d8f49e0f33ced48a4a [formerly 432dd0e37f094a7e4a4c95812c9ef843cf2782c8] [formerly 046a788f98caf7819b7445d8f49e0f33ced48a4a [formerly 432dd0e37f094a7e4a4c95812c9ef843cf2782c8] [formerly 432dd0e37f094a7e4a4c95812c9ef843cf2782c8 [formerly bda14f5cf291d6f0ecc086956ca1abb406851c06 [formerly b6d7571437a028e3c728f2cffab3dc42951fb536]]]]] Former-commit-id: d571fe0fc453ef9677ead40418bd0e68d166660a Former-commit-id: 200dfde6b83195221507c2342861190ac53529d4 Former-commit-id: d1a1448ebef547266b614800adbfee26a74c1f90 [formerly 86055d4ed7c9fe0f5234880bbe32e63746b2b158] Former-commit-id: 972ef283ca045158d4df78887390ba3f4152d57b Former-commit-id: 542e9baad2bf833d039910143e678c8f246297d7 Former-commit-id: 49db0f17e06e1bd5c6e335726825503544c18a11 Former-commit-id: ea43ace084bdc26b4b36d223b4608302c96d9d50 Former-commit-id: 85cc561f04f76222f963ea29e612d806b910eacb --- src/components/d2-container/components/d2-source.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/d2-container/components/d2-source.vue b/src/components/d2-container/components/d2-source.vue index 5cb52e4b..0ce2b05a 100644 --- a/src/components/d2-container/components/d2-source.vue +++ b/src/components/d2-container/components/d2-source.vue @@ -4,7 +4,7 @@ class="d2-source" :class="{ 'd2-source--active': isActive }" @click="handleClick"> - SourceCode + 本页源码 From f9b836afe19e3b50f7508b45d2f84bbe761b2f37 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sun, 10 Mar 2019 19:09:38 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E7=9A=84=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 4b1c56fae4f368adc79e17a24a27f01162dfccfe [formerly 7458f74936d81e67918d6ca9580ba8fa23d82499] [formerly 4b1c56fae4f368adc79e17a24a27f01162dfccfe [formerly 7458f74936d81e67918d6ca9580ba8fa23d82499] [formerly 4b1c56fae4f368adc79e17a24a27f01162dfccfe [formerly 7458f74936d81e67918d6ca9580ba8fa23d82499] [formerly 7458f74936d81e67918d6ca9580ba8fa23d82499 [formerly 92520cb6755ccc0bd975fd9a138d9fa3825bca67 [formerly 6b876c08d5ff77073d3369a87bfdf451f27fc9d2]]]]] Former-commit-id: 4d7c3c28cbbd3e38b3b71fc94d81591545f82121 Former-commit-id: a1cb919e8a1aa781690b31b29c02ae6154f34b68 Former-commit-id: e2ae5cb8ae0bd205ca5974a772db4dfe896eb8d0 [formerly 804cb702dcf0b6a9c55810669175bf0e77e2f495] Former-commit-id: f450b68c4b3436c4f6189a3386728cec28b216ff Former-commit-id: da98b0b8869d9d69494350f06a5fbd98dd45e7fa Former-commit-id: c722efba6981d8676bf21f16b00a54aa6ec24071 Former-commit-id: 4a138b06b9d28ed997cd16bc9b343452fc30532b Former-commit-id: 7e5b558610440e103b8a0ca5ac75fe56f7d16b21 --- src/pages/demo/filters/day/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/pages/demo/filters/day/index.vue b/src/pages/demo/filters/day/index.vue index 4b15aba4..91ec9d77 100644 --- a/src/pages/demo/filters/day/index.vue +++ b/src/pages/demo/filters/day/index.vue @@ -75,6 +75,9 @@ + From 5445389c5492b8120bc0471d753f5b18e8032214 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Sun, 10 Mar 2019 20:29:19 +0800 Subject: [PATCH 03/22] https://github.com/lgarron/clipboard-polyfill/issues/101 Former-commit-id: ca494cb31ffa1fba2259ddc833f4aeb007ccb429 [formerly ca494cb31ffa1fba2259ddc833f4aeb007ccb429 [formerly ca494cb31ffa1fba2259ddc833f4aeb007ccb429 [formerly ca494cb31ffa1fba2259ddc833f4aeb007ccb429 [formerly 14c889472f284c2da7272bddf3aab1e9127e643e [formerly 1b6612342b3fc9666b06ab2218d1409bd162776f]]]]] Former-commit-id: e9d276a3a3a23e5de2e8b6755937d0ade92ba35b Former-commit-id: dcab9b5f77b9234ac8fc15d9b9497c297dac8036 Former-commit-id: 63726e165e5883345a5d4bf5d03d5de74f83194f [formerly 588f7b1977f8d0f32762b501785e79717afb4ec2] Former-commit-id: f21ec3acdab14753774464eb49fce709fde0d395 Former-commit-id: 07f8da3b4473a0a749361e2da67ecd41114b7730 Former-commit-id: e086ae19c330f870990770d8d50bde50d9617b23 Former-commit-id: 23b40b20b52293630d022e18f046a28a4b0b66fb Former-commit-id: 44f9abb8762fa5510d0d36f7eba89510e25c6eae --- src/pages/demo/components/icon/components/d2-icon-cell.vue | 2 +- src/pages/demo/filters/day/components/code-and-result.vue | 2 +- src/pages/demo/plugins/clipboard-polyfill/index.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/demo/components/icon/components/d2-icon-cell.vue b/src/pages/demo/components/icon/components/d2-icon-cell.vue index b4a13f63..68a8cea0 100644 --- a/src/pages/demo/components/icon/components/d2-icon-cell.vue +++ b/src/pages/demo/components/icon/components/d2-icon-cell.vue @@ -37,7 +37,7 @@ diff --git a/src/layout/header-aside/components/header-error-log/components/list/index.vue b/src/layout/header-aside/components/header-error-log/components/list/index.vue deleted file mode 100644 index 2a3815bb..00000000 --- a/src/layout/header-aside/components/header-error-log/components/list/index.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - - diff --git a/src/layout/header-aside/components/header-error-log/index.vue b/src/layout/header-aside/components/header-log/index.vue similarity index 64% rename from src/layout/header-aside/components/header-error-log/index.vue rename to src/layout/header-aside/components/header-log/index.vue index 960c9bd2..c7a6ca81 100644 --- a/src/layout/header-aside/components/header-error-log/index.vue +++ b/src/layout/header-aside/components/header-log/index.vue @@ -23,34 +23,12 @@ style="font-size: 20px"/> - -
- - - 清空 - -
- - + From 806079df8dbea82cf3120ec7eba9cb06e55cdd71 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Mar 2019 20:41:01 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E6=96=B0=E7=9A=84=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 7ae55705cd5cf9c92f1e0a88c0b1de6c7e487fab [formerly 7ae55705cd5cf9c92f1e0a88c0b1de6c7e487fab [formerly 7ae55705cd5cf9c92f1e0a88c0b1de6c7e487fab [formerly 7ae55705cd5cf9c92f1e0a88c0b1de6c7e487fab [formerly 4a31495f225f851d089fb4362edd0ac8358ca21c [formerly c8ae7cb50e9b9499812512b4172702752f57b544]]]]] Former-commit-id: a93e32b805171cd5b9ac2f06e3d830f99a50e825 Former-commit-id: 93fe03aad8fa90cd42cec2d913c26162a8a3307b Former-commit-id: 5b51ffc4ecb1b979dd2ef504a7f88b16f26b75cb [formerly 8863540da4ed06a0b4b9d5a4e575b8b536b3abaf] Former-commit-id: dc756f8f5935b6d36e12a1384fcb4be834d37500 Former-commit-id: 4502fff0f4f42b1fc1e33996e118c98ceff85897 Former-commit-id: 42e563abacc02bc7fe11edabe0963007b57b717d Former-commit-id: b01454379bb448756825f1aad43bb49efcab3fe2 Former-commit-id: 8c7cb3cb4b93fd67933bac039304a9651a366fae --- src/plugin/log/index.js | 11 +--- src/store/modules/d2admin/modules/log.js | 58 +++++++++++---------- src/views/demo/playground/log/log/index.vue | 4 +- 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/plugin/log/index.js b/src/plugin/log/index.js index e37bfd6d..46f581fe 100644 --- a/src/plugin/log/index.js +++ b/src/plugin/log/index.js @@ -6,16 +6,9 @@ export default { // 快速打印 log Vue.prototype.$log = util.log // 快速记录日志 - Vue.prototype.$logAdd = function (info, show = true) { + Vue.prototype.$logAdd = function (data) { // store 赋值 - store.dispatch('d2admin/log/add', { - type: 'log', - info - }) - // 显示在控制台 - if (show && process.env.NODE_ENV === 'development') { - util.log.default(info) - } + store.dispatch('d2admin/log/add', data) } } } diff --git a/src/store/modules/d2admin/modules/log.js b/src/store/modules/d2admin/modules/log.js index 22f327ea..8f0a2f84 100644 --- a/src/store/modules/d2admin/modules/log.js +++ b/src/store/modules/d2admin/modules/log.js @@ -1,11 +1,16 @@ import dayjs from 'dayjs' -import { get, toString } from 'lodash' +import { get } from 'lodash' import util from '@/libs/util.js' export default { namespaced: true, state: { // 错误日志 + // + 日志条目的属性 + // - message 必须 日志信息 + // - time 必须 日志记录时间 + // - type 非必须 类型 success | warning | info | error + // - meta 非必须 其它携带信息 list: [] }, getters: { @@ -32,36 +37,35 @@ export default { * @param {Object} param instance {Object} vue 实例 * @param {Object} param info {String} 信息 */ - add ({ state, rootState }, { type, err, instance, info }) { - // store 赋值 - state.list.push(Object.assign({ - // 记录类型 "log" or "error" - type: 'log', - // 信息 - info: '', - // 错误对象 - err: '', - // vue 实例 - instance: '', - // 当前用户信息 - user: rootState.d2admin.user.info, - // 当前用户的 uuid - uuid: util.cookies.get('uuid'), - // 当前的 token - token: util.cookies.get('token'), - // 当前地址 - url: get(window, 'location.href', ''), - // 当前时间 - time: dayjs().format('YYYY-M-D HH:mm:ss') - }, { + add ({ rootState, commit }, { message, type, meta }) { + commit('add', { + message, + time: dayjs().format('YYYY-MM-DD HH:mm:ss'), type, - err, - instance, - info: toString(info) - })) + meta: { + // 当前用户信息 + user: rootState.d2admin.user.info, + // 当前用户的 uuid + uuid: util.cookies.get('uuid'), + // 当前的 token + token: util.cookies.get('token'), + // 当前地址 + url: get(window, 'location.href', ''), + // 用户设置 + ...meta + } + }) } }, mutations: { + /** + * @description 添加日志 + * @param {Object} state vuex state + * @param {Object} log data + */ + add (state, log) { + state.list.push(log) + }, /** * @description 清空日志 * @param {Object} state vuex state diff --git a/src/views/demo/playground/log/log/index.vue b/src/views/demo/playground/log/log/index.vue index 66dca3d8..4153d5dd 100644 --- a/src/views/demo/playground/log/log/index.vue +++ b/src/views/demo/playground/log/log/index.vue @@ -21,7 +21,9 @@ export default { }, methods: { handleAdd () { - this.$logAdd(this.text) + this.$logAdd({ + message: this.text + }) } } } From 68d78dcde21f403753a9a5ce39d918c8276623a8 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Mar 2019 21:26:14 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 14cb7cb392149c54db6d4d4e31cb3e4083fbc838 [formerly 14cb7cb392149c54db6d4d4e31cb3e4083fbc838 [formerly 14cb7cb392149c54db6d4d4e31cb3e4083fbc838 [formerly 14cb7cb392149c54db6d4d4e31cb3e4083fbc838 [formerly b4354d85cc1708aefade894a572c7c43cc1277a5 [formerly aba1ea86b235c25c24929198b57653ba3f278037]]]]] Former-commit-id: 1b8861760a739469fa52f81ea95e92071b160380 Former-commit-id: 9d8bb76d2a57885529d8679b6a8ba870462ef576 Former-commit-id: c332d85b1553b2cd47feabaea442a27e6864d0dd [formerly 1f8c38491cc31a430b4a9fbcdb659c80f070f276] Former-commit-id: 180c06ea08c275798eea50b6bb32aee7adb35ac5 Former-commit-id: afa3eebab977573725423f80b8692b15688487a7 Former-commit-id: e83926983c777be0f0b17e820cfc2c5033635d25 Former-commit-id: d539ddf492d6f6d65c799b3c79de5df233f77c2e Former-commit-id: 6118829b8661097dd42f4b4fa9fd8257b6e129ed --- src/store/modules/d2admin/modules/log.js | 11 +++---- src/views/system/log/index.vue | 41 ++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 8 deletions(-) diff --git a/src/store/modules/d2admin/modules/log.js b/src/store/modules/d2admin/modules/log.js index 8f0a2f84..57b78652 100644 --- a/src/store/modules/d2admin/modules/log.js +++ b/src/store/modules/d2admin/modules/log.js @@ -8,8 +8,8 @@ export default { // 错误日志 // + 日志条目的属性 // - message 必须 日志信息 - // - time 必须 日志记录时间 // - type 非必须 类型 success | warning | info | error + // - time 必须 日志记录时间 // - meta 非必须 其它携带信息 list: [] }, @@ -32,16 +32,15 @@ export default { actions: { /** * @description 添加一个日志 - * @param {Object} param type {String} 类型 - * @param {Object} param err {Error} 错误对象 - * @param {Object} param instance {Object} vue 实例 - * @param {Object} param info {String} 信息 + * @param {String} param message {String} 信息 + * @param {String} param type {String} 类型 + * @param {Object} param meta {Object} 附带的信息 */ add ({ rootState, commit }, { message, type, meta }) { commit('add', { message, - time: dayjs().format('YYYY-MM-DD HH:mm:ss'), type, + time: dayjs().format('YYYY-MM-DD HH:mm:ss'), meta: { // 当前用户信息 user: rootState.d2admin.user.info, diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue index d186eebd..df322c94 100644 --- a/src/views/system/log/index.vue +++ b/src/views/system/log/index.vue @@ -9,24 +9,35 @@ Upload - Log Page +
+

+ {{log.time}} + {{log.message}} +

+
+ From a40e069baea6e2ffaf040f3b2aa7a7ce22044858 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Mar 2019 21:28:04 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 08cd6acdea537abd4cbce9b716e861f5e9e58acc [formerly 08cd6acdea537abd4cbce9b716e861f5e9e58acc [formerly 08cd6acdea537abd4cbce9b716e861f5e9e58acc [formerly 08cd6acdea537abd4cbce9b716e861f5e9e58acc [formerly e0b0b32e3e27bb4f1e2254fed1c6ec2219f80640 [formerly 220f7e81d9026225c0f748b32a21182ae6f63fd6]]]]] Former-commit-id: 071b2901fe40861722e57250319e6e83d46bb105 Former-commit-id: 8faffa37950f6c51c07c3d15013b5e783d790151 Former-commit-id: 5af199b396739a3dea9a946421b5c76e1731965b [formerly 8afb1fa8ba9af31bb417315d4e7d525c18543866] Former-commit-id: b820a36f0d7dde09ca777c23fc87c25867260cef Former-commit-id: 50d3aa1834e091c8573f0b33dbba1212d655fd4d Former-commit-id: ce018bf1aa977f8e44b9ac5e0c86f6ddeea7c7bd Former-commit-id: 0c91caf01ae353ad6b75edff6e34c8dc8b551fd2 Former-commit-id: 628672d39b7d5b840c3246c6677aa3dea44de520 --- src/views/system/log/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue index df322c94..3a4442f2 100644 --- a/src/views/system/log/index.vue +++ b/src/views/system/log/index.vue @@ -6,6 +6,7 @@ size="mini" :loading="uploading" @click="handleUpload"> + Upload From 0a44bf5a8f878c5fbc9d801ec5047161c434a961 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Mar 2019 21:41:56 +0800 Subject: [PATCH 14/22] =?UTF-8?q?=E5=B0=86=E6=9C=AC=E5=9C=B0=20console=20?= =?UTF-8?q?=E5=92=8C=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E6=B7=B7=E4=B8=BA?= =?UTF-8?q?=20$log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: beb1f6d3b453e881cc01d07be1cd36e6b14fef32 [formerly beb1f6d3b453e881cc01d07be1cd36e6b14fef32 [formerly beb1f6d3b453e881cc01d07be1cd36e6b14fef32 [formerly beb1f6d3b453e881cc01d07be1cd36e6b14fef32 [formerly b2ec499b9466f1629e2cd965d6948298399b7736 [formerly 996423bbecb3cdeef6ca080d1b59072050aa5f1f]]]]] Former-commit-id: 6d0621bec321b2841fbf44dc05817c12eee20595 Former-commit-id: a9703939966616751729a94aedf76f5d534438ea Former-commit-id: b6b9410194abaa1a6eff40f11754d79870492b70 [formerly 035ee58d42005f80e0005e7ab9e2b9bcdf97aa2a] Former-commit-id: b5ceb6ea7a1b158eaeb97fb2e3c5b8312b8c51b3 Former-commit-id: 49e3519a3a7e6ec9b08e8d2184e086c16556f5b8 Former-commit-id: 3e14916037a5913c9a1e96ebf1e355ba6c209a53 Former-commit-id: 96190b9608241a670bcd72de6d9ffda3895a3602 Former-commit-id: 3b7884de25614fe06e9de3eb10f57babcaa9ee50 --- src/plugin/log/index.js | 10 +++++----- src/views/demo/playground/log/log/index.vue | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugin/log/index.js b/src/plugin/log/index.js index 46f581fe..2be75be1 100644 --- a/src/plugin/log/index.js +++ b/src/plugin/log/index.js @@ -4,11 +4,11 @@ import util from '@/libs/util' export default { install (Vue, options) { // 快速打印 log - Vue.prototype.$log = util.log - // 快速记录日志 - Vue.prototype.$logAdd = function (data) { - // store 赋值 - store.dispatch('d2admin/log/add', data) + Vue.prototype.$log = { + ...util.log, + push (data) { + store.dispatch('d2admin/log/add', data) + } } } } diff --git a/src/views/demo/playground/log/log/index.vue b/src/views/demo/playground/log/log/index.vue index 4153d5dd..614e9f18 100644 --- a/src/views/demo/playground/log/log/index.vue +++ b/src/views/demo/playground/log/log/index.vue @@ -21,7 +21,7 @@ export default { }, methods: { handleAdd () { - this.$logAdd({ + this.$log.push({ message: this.text }) } From 7fb34d1a3426be309406e85519ef5ed89bbe7bc9 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Mar 2019 21:43:28 +0800 Subject: [PATCH 15/22] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=AD=97=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 877fc10dfc5a83d2c7743f112a1c3453a15524f2 [formerly 877fc10dfc5a83d2c7743f112a1c3453a15524f2 [formerly 877fc10dfc5a83d2c7743f112a1c3453a15524f2 [formerly 877fc10dfc5a83d2c7743f112a1c3453a15524f2 [formerly ffabe43efb80b471c40996fd65e63481ead56871 [formerly 54a01ee08ac5687b404959b8a4a2f78109d02d26]]]]] Former-commit-id: 9f5f014a0e137d1e0c430187c6bae0783f2e0c40 Former-commit-id: 83a4d5598903a96a6b5cce032784902789adacd7 Former-commit-id: b99eb8ced925692575722ee31a6769e596a6de3f [formerly 82a6988900a27818dc1fb5eebc310dba268208a8] Former-commit-id: 95158577265930e20286fc8b291ea09a07555c55 Former-commit-id: ca46a24af13fd6712ce324ee8c5a37f0e811014f Former-commit-id: 49aae14614ab030973759ded896aeb11c5c4b778 Former-commit-id: 607ded65adbf58465892781fcc100364463e5f96 Former-commit-id: b72abeffb7446924fffdaa78b37798cba3ddcc78 --- src/views/system/log/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue index 3a4442f2..ed6cceac 100644 --- a/src/views/system/log/index.vue +++ b/src/views/system/log/index.vue @@ -59,6 +59,7 @@ export default { margin: 4px -4px; padding: 4px; border-radius: 2px; + font-size: 14px; @extend %unable-select; &:hover { background-color: $color-bg; From c62248fdaf4eb4cc632a880a7ac48145a934da94 Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Tue, 19 Mar 2019 21:56:00 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=20clearfix=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 4b9e48e57fa9a3aa679bbeb8029d3f28de61e27e [formerly 33899ac6fd09a122ad71dbd89363e90cad5071aa [formerly 27c82ded5d78e431bb710b7bf1a699b70675289f]]]]] Former-commit-id: 61eea194c45605f39985af151bac028d29d5855b Former-commit-id: cd9b4b0fa53307068919a15fad8bf18dd616fd12 Former-commit-id: 84785db7c037f1590a283ed91a6a257f581619ee [formerly da6799054002c4eb3a598c6449e3bd108318bff8] Former-commit-id: 71904e17a21b6db3bdbf8e0aaa346fb2570c16ff Former-commit-id: 11b3e68c88f4b37ead0bf1811acf912a81da28ff Former-commit-id: e6826aea1605f350672b21ab7f6a19ef29edd4fb Former-commit-id: 656e5e672c0a8c037771b085c3bba1135a4f84f0 Former-commit-id: a1ecd8c27ceff6d1dcd6e79ce6687ff20bc5c5b6 --- src/assets/style/public-class.scss | 8 -------- src/components/d2-icon-select/index.vue | 4 ++-- src/components/d2-icon-svg-select/index.vue | 6 ++---- .../demo/plugins/mock/components/d2-demo-mock-card.vue | 4 ++-- src/views/system/log/index.vue | 3 +++ 5 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/assets/style/public-class.scss b/src/assets/style/public-class.scss index dc41e4e6..a851d827 100644 --- a/src/assets/style/public-class.scss +++ b/src/assets/style/public-class.scss @@ -34,14 +34,6 @@ .#{$prefix}-fr { float: right; } -.#{$prefix}-clearfix:before, -.#{$prefix}-clearfix:after { - display: table; - content: ""; -} -.#{$prefix}-clearfix:after { - clear: both -} // 边距相关 $sizes: (0, 5, 10, 15, 20); diff --git a/src/components/d2-icon-select/index.vue b/src/components/d2-icon-select/index.vue index 18db2fc8..1b215cf9 100644 --- a/src/components/d2-icon-select/index.vue +++ b/src/components/d2-icon-select/index.vue @@ -6,7 +6,7 @@ :placement="placement" width="300" trigger="click"> -
+ 清空 -
+ -
+ 清空 -
+ -
+ {{title}} 刷新 -
+
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue index ed6cceac..24b1b727 100644 --- a/src/views/system/log/index.vue +++ b/src/views/system/log/index.vue @@ -16,6 +16,9 @@ {{log.message}}

+ From 617127f8bcba2b88148d0f3e234e9b1d9d4948be Mon Sep 17 00:00:00 2001 From: liyang <1711467488@qq.com> Date: Wed, 20 Mar 2019 10:11:47 +0800 Subject: [PATCH 17/22] =?UTF-8?q?markdown=20=E7=BB=84=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E9=AB=98=E4=BA=AE=E7=BB=84=E4=BB=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: d3f6a2c1709b0ef2b46ab629db382b4687074692 [formerly d3f6a2c1709b0ef2b46ab629db382b4687074692 [formerly d3f6a2c1709b0ef2b46ab629db382b4687074692 [formerly d3f6a2c1709b0ef2b46ab629db382b4687074692 [formerly 2cb8a3245f269e8fc8b8e84e75582dbe2111ef6e [formerly 2fcb318c9d67fd23d117fc43c58ce3bd0fe3276e]]]]] Former-commit-id: 986b67d62d3c86fc484836203f8b5e1f4891eb6c Former-commit-id: cf0546bc2376ab54f182e127f67c3a40393ff34b Former-commit-id: 6963b119eb71b3d607c92c9cad99d050356c1d88 [formerly 19610c6adf62f7ebb440d7373832a1c5d60f4fb5] Former-commit-id: 48f31983021b0ff99750c6dabc63b412ef34c83e Former-commit-id: 98eaf63e71f322930ace1f3574bc7fc6e0c55525 Former-commit-id: a716504e5874c330944390c491ac790c991a598f Former-commit-id: 3cb6935ae5fadeb239da1dfa19d1189f6f240e87 Former-commit-id: a457670c4f607c074274362653e516482c532363 --- src/components/d2-highlight/index.vue | 5 +++-- src/components/d2-markdown/index.vue | 1 + .../styles => highlight-styles}/agate.css | 0 .../androidstudio.css | 0 .../arduino-light.css | 0 .../styles => highlight-styles}/arta.css | 0 .../styles => highlight-styles}/ascetic.css | 0 .../atelier-cave-dark.css | 0 .../atelier-cave-light.css | 0 .../atelier-dune-dark.css | 0 .../atelier-dune-light.css | 0 .../atelier-estuary-dark.css | 0 .../atelier-estuary-light.css | 0 .../atelier-forest-dark.css | 0 .../atelier-forest-light.css | 0 .../atelier-heath-dark.css | 0 .../atelier-heath-light.css | 0 .../atelier-lakeside-dark.css | 0 .../atelier-lakeside-light.css | 0 .../atelier-plateau-dark.css | 0 .../atelier-plateau-light.css | 0 .../atelier-savanna-dark.css | 0 .../atelier-savanna-light.css | 0 .../atelier-seaside-dark.css | 0 .../atelier-seaside-light.css | 0 .../atelier-sulphurpool-dark.css | 0 .../atelier-sulphurpool-light.css | 0 .../atom-one-dark.css | 0 .../atom-one-light.css | 0 .../styles => highlight-styles}/brown-paper.css | 0 .../brown-papersq.png.REMOVED.git-id | 0 .../codepen-embed.css | 0 .../color-brewer.css | 0 .../styles => highlight-styles}/darcula.css | 0 .../styles => highlight-styles}/dark.css | 0 .../styles => highlight-styles}/darkula.css | 0 .../styles => highlight-styles}/default.css | 0 .../styles => highlight-styles}/docco.css | 0 .../styles => highlight-styles}/dracula.css | 0 .../styles => highlight-styles}/far.css | 0 .../styles => highlight-styles}/foundation.css | 0 .../styles => highlight-styles}/github-gist.css | 0 .../styles => highlight-styles}/github.css | 0 .../styles => highlight-styles}/googlecode.css | 0 .../styles => highlight-styles}/grayscale.css | 0 .../gruvbox-dark.css | 0 .../gruvbox-light.css | 0 .../styles => highlight-styles}/hopscotch.css | 0 .../styles => highlight-styles}/hybrid.css | 0 .../styles => highlight-styles}/idea.css | 0 .../styles => highlight-styles}/ir-black.css | 0 .../styles => highlight-styles}/kimbie.dark.css | 0 .../kimbie.light.css | 0 .../styles => highlight-styles}/magula.css | 0 .../styles => highlight-styles}/mono-blue.css | 0 .../monokai-sublime.css | 0 .../styles => highlight-styles}/monokai.css | 0 .../styles => highlight-styles}/obsidian.css | 0 .../styles => highlight-styles}/ocean.css | 0 .../paraiso-dark.css | 0 .../paraiso-light.css | 0 .../styles => highlight-styles}/pojoaque.css | 0 .../styles => highlight-styles}/purebasic.css | 0 .../qtcreator_dark.css | 0 .../qtcreator_light.css | 0 .../styles => highlight-styles}/railscasts.css | 0 .../styles => highlight-styles}/rainbow.css | 0 .../styles => highlight-styles}/routeros.css | 0 .../styles => highlight-styles}/school-book.css | 0 .../solarized-dark.css | 0 .../solarized-light.css | 0 .../styles => highlight-styles}/sunburst.css | 0 .../tomorrow-night-blue.css | 0 .../tomorrow-night-bright.css | 0 .../tomorrow-night-eighties.css | 0 .../tomorrow-night.css | 0 .../styles => highlight-styles}/tomorrow.css | 0 .../styles => highlight-styles}/vs.css | 0 .../styles => highlight-styles}/vs2015.css | 0 .../styles => highlight-styles}/xcode.css | 0 .../styles => highlight-styles}/xt256.css | 0 .../styles => highlight-styles}/zenburn.css | 0 src/views/demo/components/markdown/md/doc.md | 17 ++++++++++++++++- src/views/demo/components/markdown/source.vue | 2 +- 84 files changed, 21 insertions(+), 4 deletions(-) rename src/components/{d2-highlight/styles => highlight-styles}/agate.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/androidstudio.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/arduino-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/arta.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/ascetic.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-cave-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-cave-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-dune-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-dune-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-estuary-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-estuary-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-forest-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-forest-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-heath-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-heath-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-lakeside-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-lakeside-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-plateau-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-plateau-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-savanna-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-savanna-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-seaside-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-seaside-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-sulphurpool-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atelier-sulphurpool-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atom-one-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/atom-one-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/brown-paper.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/brown-papersq.png.REMOVED.git-id (100%) rename src/components/{d2-highlight/styles => highlight-styles}/codepen-embed.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/color-brewer.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/darcula.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/darkula.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/default.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/docco.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/dracula.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/far.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/foundation.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/github-gist.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/github.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/googlecode.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/grayscale.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/gruvbox-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/gruvbox-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/hopscotch.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/hybrid.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/idea.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/ir-black.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/kimbie.dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/kimbie.light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/magula.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/mono-blue.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/monokai-sublime.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/monokai.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/obsidian.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/ocean.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/paraiso-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/paraiso-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/pojoaque.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/purebasic.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/qtcreator_dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/qtcreator_light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/railscasts.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/rainbow.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/routeros.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/school-book.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/solarized-dark.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/solarized-light.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/sunburst.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/tomorrow-night-blue.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/tomorrow-night-bright.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/tomorrow-night-eighties.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/tomorrow-night.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/tomorrow.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/vs.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/vs2015.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/xcode.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/xt256.css (100%) rename src/components/{d2-highlight/styles => highlight-styles}/zenburn.css (100%) diff --git a/src/components/d2-highlight/index.vue b/src/components/d2-highlight/index.vue index 0e838a7a..6c5c53d8 100644 --- a/src/components/d2-highlight/index.vue +++ b/src/components/d2-highlight/index.vue @@ -3,11 +3,12 @@ - -