diff --git a/scripts/genThemeConfig/property.json b/scripts/genThemeConfig/property.json index bd5099d34..d29791df9 100644 --- a/scripts/genThemeConfig/property.json +++ b/scripts/genThemeConfig/property.json @@ -360,6 +360,7 @@ "--van-tabs-bottom-bar-height": "3px", "--van-tabs-bottom-bar-color": "var(\n --van-tabs-default-color\n )", "--van-tabs-bottom-bar-border-radius": "3px", + "--van-tabs-card-nav-margin": "0 24px", "--van-uploader-size": "80px", "--van-uploader-icon-size": "24px", "--van-uploader-icon-color": "#dcdee0", diff --git a/scripts/genThemeConfig/result.json b/scripts/genThemeConfig/result.json index 6ec5c7882..8df12843f 100644 --- a/scripts/genThemeConfig/result.json +++ b/scripts/genThemeConfig/result.json @@ -786,6 +786,13 @@ "excludeTags": [ "van-tab" ] + }, + "--van-tabs-card-nav-margin": { + "type": "input", + "desc": "card模式 导航外边距", + "excludeTags": [ + "van-tab" + ] } }, "preview": { diff --git a/src-vusion/components/copy/index.vue b/src-vusion/components/copy/index.vue index 6b7c31587..fc5c9e711 100644 --- a/src-vusion/components/copy/index.vue +++ b/src-vusion/components/copy/index.vue @@ -1,17 +1,17 @@ @@ -19,7 +19,7 @@ import ClipboardJS from 'clipboard'; // import i18n from '@/utils/i18n'; import { SEmpty } from 'cloud-ui.vusion/src/components/s-empty.vue'; -import { UTooltip } from 'cloud-ui.vusion/src/components/u-tooltip.vue'; +import Popover from '../../../src/popover'; import { createI18N } from '../../../src/utils/create/i18n' const name = 'van-copy'; @@ -28,7 +28,10 @@ const t = createI18N(name); export default { name, - components: { SEmpty, UTooltip }, + components: { + SEmpty, + Popover + }, props: { value: String, text: { type: String, default: '复制' }, @@ -39,7 +42,11 @@ export default { feedback: { type: String, default: 'tooltip' }, }, data() { - return { success: false, timeoutId: undefined, failed: false }; + return { + success: false, + timeoutId: undefined, + visible: false, + }; }, computed: { failTip() { @@ -58,12 +65,14 @@ export default { if (this.feedback === 'toast') this.$toast.show(this.successText, this.hideDelay); this.$emit('copy', { value: this.value }, this); - clearTimeout(this.timeoutId); - this.timeoutId = setTimeout(() => { - this.success = false; - }, this.hideDelay); } - this.failed = !this.success; + + clearTimeout(this.timeoutId); + this.timeoutId = setTimeout(() => { + this.visible = false; + }, this.hideDelay); + + this.visible = true; }, }, }; @@ -74,4 +83,10 @@ export default { display: inline-block; position: relative; } +.tooltip { + white-space: nowrap; + font-size: 12px; + padding: 5px 10px; + color: #fff; +} diff --git a/src-vusion/index.js b/src-vusion/index.js index 1c644bfa2..c985af253 100644 --- a/src-vusion/index.js +++ b/src-vusion/index.js @@ -12,14 +12,123 @@ export { utils }; export { install } from '@vusion/utils'; export * from './components'; -const requires = require.context('../src/', true, /\.less$/); -requires.keys().forEach((key) => { - requires(key); -}); -// requires.keys().forEach((key) => { -// const name = requires(key).default.name || key.slice(key.lastIndexOf('/') + 1, key.lastIndexOf('.')); -// Vue.component(name, requires(key).default); -// }); +import '../src/style/animation.less'; +import '../src/style/base.less'; +import '../src/style/clearfix.less'; +import '../src/style/ellipsis.less'; +import '../src/style/hairline.less'; +import '../src/style/mixins/clearfix.less'; +import '../src/style/mixins/ellipsis.less'; +import '../src/style/mixins/hairline.less'; +import '../src/style/normalize.less'; +import '../src/style/reset.less'; +import '../src/style/var.less'; + +import '../src/popup/index.less'; +import '../src/overlay/index.less'; + +import '../src/action-sheet/index.less'; +import '../src/address-edit/index.less'; +import '../src/address-list/index.less'; +import '../src/area/index.less'; +import '../src/badge/index.less'; +import '../src/button/index.less'; +import '../src/calendar/index.less'; +import '../src/capsules-group/index.less'; +import '../src/capsules-item/index.less'; +import '../src/capsules/index.less'; +import '../src/card/index.less'; +import '../src/cardu/cardu.less'; +import '../src/cascader/index.less'; +import '../src/cascaderbak/index.less'; +import '../src/cell-group/index.less'; +import '../src/cell/index.less'; +import '../src/cellson/index.less'; +import '../src/checkbox-group/index.less'; +import '../src/checkbox/index.less'; +import '../src/circle/index.less'; +import '../src/col/index.less'; +import '../src/collapse-item/index.less'; +import '../src/contact-card/index.less'; +import '../src/contact-edit/index.less'; +import '../src/contact-list/index.less'; +import '../src/count-down/index.less'; +import '../src/coupon-cell/index.less'; +import '../src/coupon-list/index.less'; +import '../src/coupon/index.less'; +import '../src/datetime-picker/index.less'; +import '../src/dialog/index.less'; +import '../src/divider/index.less'; +import '../src/dropdown-item/index.less'; +import '../src/dropdown-menu/index.less'; +import '../src/empty/index.less'; +import '../src/field/index.less'; +import '../src/fieldinput/index.less'; +import '../src/fieldsonforsearch/index.less'; +import '../src/fieldtextarea/index.less'; +import '../src/for-components/index.less'; +import '../src/form/index.less'; +import '../src/gallery/index.less'; +import '../src/goods-action-button/index.less'; +import '../src/goods-action-icon/index.less'; +import '../src/goods-action/index.less'; +import '../src/grid-item/index.less'; +import '../src/grid/index.less'; +import '../src/icon/index.less'; +import '../src/icon/local.less'; +import '../src/iconv/index.less'; +import '../src/iconv/local.less'; +import '../src/image-preview/index.less'; +import '../src/image/index.less'; +import '../src/index-anchor/index.less'; +import '../src/index-bar/index.less'; +import '../src/info/index.less'; +import '../src/linear-layout/index.less'; +import '../src/list/index.less'; +import '../src/loading/index.less'; +import '../src/nav-bar/index.less'; +import '../src/notice-bar/index.less'; +import '../src/notify/index.less'; +import '../src/number-keyboard/index.less'; +import '../src/pagination/index.less'; +import '../src/panel/index.less'; +import '../src/password-input/index.less'; +import '../src/picker/index.less'; +import '../src/pickerson/index.less'; +import '../src/popover-combination/index.less'; +import '../src/popover/index.less'; +import '../src/progress/index.less'; +import '../src/pull-refresh/index.less'; +import '../src/radio-group/index.less'; +import '../src/radio/index.less'; +import '../src/rate/index.less'; +import '../src/row/index.less'; +import '../src/search/index.less'; +import '../src/share-sheet/index.less'; +import '../src/sidebar-item/index.less'; +import '../src/sidebar/index.less'; +import '../src/skeleton/index.less'; +import '../src/sku/index.less'; +import '../src/slider/index.less'; +import '../src/step/index.less'; +import '../src/stepper-new/index.less'; +import '../src/stepper/index.less'; +import '../src/steps/index.less'; +import '../src/sticky/index.less'; +import '../src/submit-bar/index.less'; +import '../src/swipe-cell/index.less'; +import '../src/swipe-item/index.less'; +import '../src/swipe/index.less'; +import '../src/switch-cell/index.less'; +import '../src/switch/index.less'; +import '../src/tab/index.less'; +import '../src/tabbar-item/index.less'; +import '../src/tabbar/index.less'; +import '../src/tabs/index.less'; +import '../src/tag/index.less'; +import '../src/toast/index.less'; +import '../src/tree-select/index.less'; +import '../src/uploader/index.less'; // 保证在H5样式之后 /* 引入cloud-ui theme */ diff --git a/src/popover/index.js b/src/popover/index.js index 233f74dc2..71035db8d 100644 --- a/src/popover/index.js +++ b/src/popover/index.js @@ -45,7 +45,6 @@ export default createComponent({ }, getContainer: { type: [String, Function], - default: 'body', }, closeOnClickAction: { type: Boolean, @@ -238,47 +237,6 @@ export default createComponent({ }, render() { - const styletemp = { - background: '#FAFAFA', - border: '1px dashed #CCCCCC', - height: '14.93333vw', - alignItems: 'center', - justifyContent: 'center', - display: 'flex', - fontSize: '4.26667vw', - color: '#666666', - } - if (this.ifDesigner()) { - return ( -
- - -
- - - -
双击打开/关闭气泡框
-
- ) - } - return (