diff --git a/vue/element-ui-personal/component/Select/Select.vue b/vue/element-ui-personal/component/Select/Select.vue deleted file mode 100644 index 7f10914..0000000 --- a/vue/element-ui-personal/component/Select/Select.vue +++ /dev/null @@ -1,844 +0,0 @@ - - - diff --git a/vue/element-ui-personal/component/Select/SelectDropdown.vue b/vue/element-ui-personal/component/Select/SelectDropdown.vue deleted file mode 100644 index 7ea7802..0000000 --- a/vue/element-ui-personal/component/Select/SelectDropdown.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - diff --git a/vue/element-ui-personal/index.js b/vue/element-ui-personal/index.js index 00be8c7..1845aea 100644 --- a/vue/element-ui-personal/index.js +++ b/vue/element-ui-personal/index.js @@ -1,7 +1,6 @@ import MenuItem from "./component/Menu/MenuItem" import Submenu from "./component/Menu/Submenu" import Message from "./component/Message" -//import Select from './component/Select/Select' const components = [MenuItem, Submenu] diff --git a/vue/element-ui-personal/mixin/vue-popper.js b/vue/element-ui-personal/mixin/vue-popper.js deleted file mode 100644 index 905b752..0000000 --- a/vue/element-ui-personal/mixin/vue-popper.js +++ /dev/null @@ -1,166 +0,0 @@ -import {PopupManager} from 'element-ui/lib/utils/popup' - -//import PopperJS from 'popper.js' -//import * as PopperJS from '@popperjs/core' - -const POPPER_VERSION = 'v1' - -if (POPPER_VERSION === 'v2') { - console.warn = () => ({}) -} - -const stop = e => e.stopPropagation() - -const defaultOptions = () => { - return POPPER_VERSION === 'v2' ? {modifiers: []} : {modifiers: {computeStyle: {gpuAcceleration: false}}} -} - -export default { - props: { - transformOrigin: {type: [Boolean, String], default: true}, - placement: {type: String, default: 'bottom'}, - boundariesPadding: {type: Number, default: 5}, - reference: {}, - popper: {}, - offset: {type: Number, default: POPPER_VERSION === 'v2' ? 12 : 0}, - value: Boolean, - visibleArrow: {type: Boolean, default: true}, - arrowOffset: {type: Number, default: 35}, - appendToBody: {type: Boolean, default: true}, - popperOptions: {type: Object, default: defaultOptions} - }, - - data() { - return { - showPopper: this.value - } - }, - - watch: { - value: { - immediate: true, - handler(val) { - this.showPopper = val - this.$emit('input', val) - if (this.disabled) return - val ? this.updatePopper() : this.destroyPopper() - } - } - }, - - methods: { - createPopper() { - if (!/^(top|bottom|left|right)(-start|-end)?$/g.test(this.placement)) { - return - } - - const options = this.popperOptions - const popper = this.popperElm = this.popperElm || this.popper || this.$refs.popper - let reference = this.referenceElm = this.referenceElm || this.reference || this.$refs.reference - - if (!reference && this.$slots.reference && this.$slots.reference[0]) { - reference = this.referenceElm = this.$slots.reference[0].elm - } - - if (!popper || !reference) return - - if (this.popperJS && this.popperJS.hasOwnProperty('destroy')) { - this.popperJS.destroy() - } - - if (this.appendToBody) document.body.appendChild(this.popperElm) - if (this.visibleArrow) this.setArrow() - this.setOffset(options) - - options.placement = this.placement - const createEvent = POPPER_VERSION === 'v2' ? 'onFirstUpdate' : 'onCreate' - options[createEvent] = () => { - this.$emit('created', this) - this.resetTransformOrigin() - this.$nextTick(this.updatePopper) - } - - this.popperJS = POPPER_VERSION === 'v2' ? - PopperJS.createPopper(reference, popper, options) - : new PopperJS(reference, popper, options) - - popper.style.zIndex = PopupManager.nextZIndex() - this.popperElm.addEventListener('click', stop) - }, - - updatePopper() { - const popper = this.popperJS - - if (!popper) return this.createPopper() - - popper.update() - this.popperElm.style.zIndex = PopupManager.nextZIndex() - }, - - doDestroy(forceDestroy) { - if (!this.popperJS || (this.showPopper && !forceDestroy)) return - this.popperJS.destroy() - this.popperJS = null - }, - - destroyPopper() { - this.popperJS && this.resetTransformOrigin() - }, - - setOffset(options) { - if (POPPER_VERSION === 'v2') { - const modifier = this.popperOptions.modifiers.find(modifier => modifier.name === 'offset'), - offset = {offset: [0, this.offset]} - - if (!modifier) { - this.popperOptions.modifiers.push({name: 'offset', options: offset}) - } - else modifier.options = offset - } - else { - if (!options.modifiers.offset) { - options.modifiers.offset = {} - } - options.modifiers.offset.offset = this.offset - } - }, - - setArrow() { - if (this.appended) return - this.appended = true - - const arrow = document.createElement('div') - arrow.className = 'popper__arrow' - arrow.setAttribute(POPPER_VERSION === 'v2' ? 'data-popper-arrow' : 'x-arrow', '') - const attributes = this.popperElm.attributes - const key = Object.keys(attributes).find(key => /^_v-/.test(attributes[key].name)) - if (key) arrow.setAttribute(attributes[key].name, '') - - this.popperElm.appendChild(arrow) - }, - - resetTransformOrigin() { - if (!this.transformOrigin) return - const placementMap = {top: 'bottom', bottom: 'top', left: 'right', right: 'left'} - const attr = POPPER_VERSION === 'v2' ? 'data-popper-placement' : 'x-placement' - const placement = this.popperElm.getAttribute(attr).split('-')[0] - const origin = placementMap[placement] - this.popperElm.style.transformOrigin = - typeof this.transformOrigin === 'string' - ? this.transformOrigin - : ['top', 'bottom'].includes(placement) ? `center ${origin}` : `${origin} center` - } - }, - - deactivated() { - this.$options.beforeDestroy[0].call(this) - }, - - beforeDestroy() { - this.doDestroy(true) - if (this.popperElm && this.popperElm.parentNode === document.body) { - this.popperElm.removeEventListener('click', stop) - document.body.removeChild(this.popperElm) - } - } -} diff --git a/vue/element-ui-personal/style/index.scss b/vue/element-ui-personal/style/index.scss index 356699a..3424bf5 100644 --- a/vue/element-ui-personal/style/index.scss +++ b/vue/element-ui-personal/style/index.scss @@ -1,2 +1 @@ @import "./message.scss"; -@import "./popper.scss"; diff --git a/vue/element-ui-personal/style/message.scss b/vue/element-ui-personal/style/message.scss index 6336254..2ec0823 100644 --- a/vue/element-ui-personal/style/message.scss +++ b/vue/element-ui-personal/style/message.scss @@ -7,7 +7,7 @@ position: absolute; box-shadow: 0 1px 3px rgba(#000, .2), 0 1px 1px rgba(#000, .14), 0 2px 1px -1px rgba(#000, .12); background-color: $--color-danger; - color: #fff; + color: #ffffff; border-radius: 4px; top: -10px; left: -10px; diff --git a/vue/element-ui-personal/style/popper.scss b/vue/element-ui-personal/style/popper.scss deleted file mode 100644 index 4640795..0000000 --- a/vue/element-ui-personal/style/popper.scss +++ /dev/null @@ -1,98 +0,0 @@ -@include b(popper) { - .popper__arrow, - .popper__arrow::after { - position: absolute; - display: block; - width: 0; - height: 0; - border-color: transparent; - border-style: solid; - } - - .popper__arrow { - border-width: $--popover-arrow-size; - filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03)) - } - - .popper__arrow::after { - content: " "; - border-width: $--popover-arrow-size; - } - - &[data-popper-placement^="top"] { - margin-bottom: #{$--popover-arrow-size + 6}; - } - - &[data-popper-placement^="top"] .popper__arrow { - bottom: -$--popover-arrow-size; - left: 50%; - margin-right: #{$--tooltip-arrow-size / 2}; - border-top-color: $--popover-border-color; - border-bottom-width: 0; - - &::after { - bottom: 1px; - margin-left: -$--popover-arrow-size; - border-top-color: $--popover-background-color; - border-bottom-width: 0; - } - } - - &[data-popper-placement^="bottom"] { - margin-top: #{$--popover-arrow-size + 6}; - } - - &[data-popper-placement^="bottom"] .popper__arrow { - top: -$--popover-arrow-size; - left: 50%; - margin-right: #{$--tooltip-arrow-size / 2}; - border-top-width: 0; - border-bottom-color: $--popover-border-color; - - &::after { - top: 1px; - margin-left: -$--popover-arrow-size; - border-top-width: 0; - border-bottom-color: $--popover-background-color; - } - } - - &[data-popper-placement^="right"] { - margin-left: #{$--popover-arrow-size + 6}; - } - - &[data-popper-placement^="right"] .popper__arrow { - top: 50%; - left: -$--popover-arrow-size; - margin-bottom: #{$--tooltip-arrow-size / 2}; - border-right-color: $--popover-border-color; - border-left-width: 0; - - &::after { - bottom: -$--popover-arrow-size; - left: 1px; - border-right-color: $--popover-background-color; - border-left-width: 0; - } - } - - &[data-popper-placement^="left"] { - margin-right: #{$--popover-arrow-size + 6}; - } - - &[data-popper-placement^="left"] .popper__arrow { - top: 50%; - right: -$--popover-arrow-size; - margin-bottom: #{$--tooltip-arrow-size / 2}; - border-right-width: 0; - border-left-color: $--popover-border-color; - - &::after { - right: 1px; - bottom: -$--popover-arrow-size; - margin-left: -$--popover-arrow-size; - border-right-width: 0; - border-left-color: $--popover-background-color; - } - } -} diff --git a/vue/public/index.html b/vue/public/index.html index cbcc7a6..fd96d29 100644 --- a/vue/public/index.html +++ b/vue/public/index.html @@ -15,7 +15,7 @@ width: 100%; height: 100%; z-index: 999; - color: white; + color: #ffffff; background-color: #283443; display: flex; flex-direction: column; diff --git a/vue/src/asset/style/element-ui.scss b/vue/src/asset/style/element-ui.scss index e1c3446..cca84a5 100644 --- a/vue/src/asset/style/element-ui.scss +++ b/vue/src/asset/style/element-ui.scss @@ -1,7 +1,7 @@ // cover some element-ui styles .el-alert { &--info.is-light { - color: #515a6e; + color: #606266; background-color: #f0faff; border: 1px solid #abdcff; @@ -57,7 +57,7 @@ min-width: 384px; .el-dialog__header { - border-bottom: 1px solid #ebeef5; + border-bottom: 1px solid #EBEEF5; padding: 17px; .el-dialog__title { @@ -72,7 +72,7 @@ } .el-dialog__footer { - border-top: 1px solid #ebeef5; + border-top: 1px solid #EBEEF5; padding: 10px 16px; } @@ -99,7 +99,7 @@ border-width: 0; .el-message__icon, .el-message__content { - color: #fff !important; + color: #ffffff !important; } &.el-message--success { @@ -165,7 +165,7 @@ .el-table { thead { - color: rgba(0, 0, 0, .85) + color: #303133 } thead > tr > th { @@ -178,24 +178,3 @@ background: transparent; } } - -.el-timeline { - padding-left: 1px; - - .el-timeline__empty { - margin: 0 auto; - text-align: center; - } - - .el-timeline-item__tail { - left: 5px; - } - - .el-timeline-item__node--normal { - left: 0; - } - - .el-scrollbar__wrap { - overflow-x: hidden; - } -} diff --git a/vue/src/component/AbstractForm/FormValidateInfo.vue b/vue/src/component/AbstractForm/FormValidateInfo.vue index 12fc7bf..df9690b 100644 --- a/vue/src/component/AbstractForm/FormValidateInfo.vue +++ b/vue/src/component/AbstractForm/FormValidateInfo.vue @@ -110,7 +110,7 @@ export default { &-item { padding: 8px 16px; - background-color: #fff; + background-color: #ffffff; border-bottom: 1px solid #f0f0f0; cursor: pointer; transition: background-color .3s; diff --git a/vue/src/component/ColorCheckBox/index.vue b/vue/src/component/ColorCheckBox/index.vue index a823309..faf8e10 100644 --- a/vue/src/component/ColorCheckBox/index.vue +++ b/vue/src/component/ColorCheckBox/index.vue @@ -43,6 +43,6 @@ export default { margin-right: 8px; text-align: center; font-weight: bold; - color: #fff; + color: #ffffff; } diff --git a/vue/src/component/ContextMenu/index.vue b/vue/src/component/ContextMenu/index.vue index a3881d0..955346e 100644 --- a/vue/src/component/ContextMenu/index.vue +++ b/vue/src/component/ContextMenu/index.vue @@ -75,7 +75,7 @@ export default { border-radius: 4px; font-size: 12px; font-weight: 400; - color: #fff; + color: #ffffff; box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3); &-item { diff --git a/vue/src/component/OrgTree/tree.scss b/vue/src/component/OrgTree/tree.scss index 02f8be2..e67ad17 100644 --- a/vue/src/component/OrgTree/tree.scss +++ b/vue/src/component/OrgTree/tree.scss @@ -50,7 +50,7 @@ z-index: 10; margin-left: -10px; margin-top: 10px; - background-color: #fff; + background-color: #ffffff; border: 1px solid #ccc; border-radius: 50%; box-shadow: 0 0 2px rgba(0, 0, 0, .15); diff --git a/vue/src/component/RegionSelector/Tab/style.scss b/vue/src/component/RegionSelector/Tab/style.scss index 71fab23..1c8538e 100644 --- a/vue/src/component/RegionSelector/Tab/style.scss +++ b/vue/src/component/RegionSelector/Tab/style.scss @@ -1,6 +1,6 @@ .rg-header, .rg-search { padding: 2px 10px 0; - background-color: white; + background-color: #ffffff; } .rg-header { @@ -27,7 +27,7 @@ } &:hover { - color: black; + color: #000000; } &.rg-removeall-button { @@ -42,7 +42,7 @@ .rg-level-tabs { margin-top: 10px; - background-color: #fff; + background-color: #ffffff; ul { padding: 0; @@ -67,7 +67,7 @@ &.active { a { color: #333; - background-color: #fff; + background-color: #ffffff; font-weight: 600; } @@ -96,7 +96,7 @@ overflow: hidden; padding: 3px 10px; font-size: 14px; - color: black; + color: #000000; cursor: pointer; &.rg-item { @@ -104,13 +104,13 @@ color: #777; &:hover { - color: black; + color: #000000; background-color: #F5F5F5; } &.active { background-color: #E4EAEE; - color: black; + color: #000000; } } diff --git a/vue/src/component/UploadFile/style.scss b/vue/src/component/UploadFile/style.scss index 4286973..d14fc61 100644 --- a/vue/src/component/UploadFile/style.scss +++ b/vue/src/component/UploadFile/style.scss @@ -20,7 +20,7 @@ top: 0; height: 100%; width: 100%; - background-color: #fff; + background-color: #ffffff; opacity: 0.9; .el-progress__text { diff --git a/vue/src/globalMethod/SignautreBoard/main.vue b/vue/src/globalMethod/SignautreBoard/main.vue index e517d95..ec35ce3 100644 --- a/vue/src/globalMethod/SignautreBoard/main.vue +++ b/vue/src/globalMethod/SignautreBoard/main.vue @@ -144,7 +144,7 @@ export default {