sh-view 1.7.6 → 2.0.1

package/packages/components/global-components/sh-water-fall/index.vue

@@ -1,87 +1,87 @@
-<template>
-	<div
-		v-masonry
-		class="sh-waterfall"
-		:transition-duration="duration"
-		:item-selector="selector"
-		:origin-left="originLeft"
-		:origin-top="originTop"
-		:fit-width="fitWidth"
-		:stamp="stamp"
-		:gutter="gutter"
-		:horizontal-order="horizontalOrder">
-		<div v-for="(item, itemindex) in dataSourse" :key="itemindex" v-masonry-tile class="sh-list-item" :class="itemClassName">
-			<slot name="item" :item="item" :index="itemindex"></slot>
-		</div>
-	</div>
-</template>
-
-<script>
-export default {
-	name: 'ShWaterFall',
-	components: {},
-	props: {
-		id: {
-			type: String,
-			default: 'containerId'
-		},
-		dataSourse: {
-			type: Array,
-			default() {
-				return []
-			}
-		},
-		itemClassName: {
-			type: String
-		},
-		duration: {
-			type: String,
-			default: '0.3s'
-		},
-		selector: {
-			type: String,
-			default: '.sh-list-item'
-		},
-		fitWidth: {
-			type: Boolean,
-			default: false
-		},
-		originLeft: {
-			type: Boolean,
-			default: true
-		},
-		originTop: {
-			type: Boolean,
-			default: true
-		},
-		horizontalOrder: {
-			type: Boolean,
-			default: true
-		},
-		stamp: {
-			type: String,
-			default: ''
-		},
-		gutter: {
-			type: [String, Number],
-			default: 10
-		}
-	},
-	data() {
-		return {}
-	},
-	computed: {},
-	watch: {},
-	mounted() {},
-	methods: {}
-}
-</script>
-
-<style lang="scss" scoped>
-.sh-waterfall {
-	width: 100%;
-	margin: auto;
-	.sh-list-item {
-	}
-}
-</style>
+<template>
+	<div
+		v-masonry
+		class="sh-waterfall"
+		:transition-duration="duration"
+		:item-selector="selector"
+		:origin-left="originLeft"
+		:origin-top="originTop"
+		:fit-width="fitWidth"
+		:stamp="stamp"
+		:gutter="gutter"
+		:horizontal-order="horizontalOrder">
+		<div v-for="(item, itemindex) in dataSourse" :key="itemindex" v-masonry-tile class="sh-water-item" :class="itemClassName">
+			<slot name="item" :item="item" :index="itemindex"></slot>
+		</div>
+	</div>
+</template>
+
+<script>
+export default {
+	name: 'ShWaterFall',
+	components: {},
+	props: {
+		id: {
+			type: String,
+			default: 'containerId'
+		},
+		dataSourse: {
+			type: Array,
+			default() {
+				return []
+			}
+		},
+		itemClassName: {
+			type: String
+		},
+		duration: {
+			type: String,
+			default: '0.3s'
+		},
+		selector: {
+			type: String,
+			default: '.sh-water-item'
+		},
+		fitWidth: {
+			type: Boolean,
+			default: false
+		},
+		originLeft: {
+			type: Boolean,
+			default: true
+		},
+		originTop: {
+			type: Boolean,
+			default: true
+		},
+		horizontalOrder: {
+			type: Boolean,
+			default: true
+		},
+		stamp: {
+			type: String,
+			default: ''
+		},
+		gutter: {
+			type: [String, Number],
+			default: 10
+		}
+	},
+	data() {
+		return {}
+	},
+	computed: {},
+	watch: {},
+	mounted() {},
+	methods: {}
+}
+</script>
+
+<style lang="scss" scoped>
+.sh-waterfall {
+	width: 100%;
+	margin: auto;
+	.sh-list-item {
+	}
+}
+</style>

package/packages/components/index.js

@@ -1,59 +1,85 @@
-// 全局公共封装组件
-import ShCard from './global-components/sh-card/index.vue'
-import ShCodeEditor from './global-components/sh-code-editor/index.vue'
-import ShCorner from './global-components/sh-corner/index.vue'
-import ShCountTo from './global-components/sh-count-to/index.vue'
-import ShEmpty from './global-components/sh-empty/index.vue'
-import ShHeader from './global-components/sh-header/index.vue'
-import ShIcon from './global-components/sh-icon/index.vue'
-import ShIvForm from './global-components/sh-iv-form/index.vue'
-import ShLayout from './global-components/sh-layout/index.vue'
-import ShLoading from './global-components/sh-loading/index.vue'
-import ShNoticeBar from './global-components/sh-noticebar/index.vue'
-import ShPullRefresh from './global-components/sh-pull-refresh/index.vue'
-import ShResult from './global-components/sh-result/index.vue'
-import ShUpload from './global-components/sh-upload/index.vue'
-import ShForm from './global-components/sh-vxe-form/index.vue'
-import ShList from './global-components/sh-vxe-list/index.vue'
-import ShModal from './global-components/sh-vxe-modal/index.vue'
-import ShQuery from './global-components/sh-vxe-query/index.vue'
-import ShTable from './global-components/sh-vxe-table/index.vue'
-import ShToolbar from './global-components/sh-vxe-toolbar/index.vue'
-import ShTree from './global-components/sh-vxe-tree/index.vue'
-import ShWaterFall from './global-components/sh-water-fall/index.vue'
-
-const components = {
-	ShCard,
-	ShCodeEditor,
-	ShCorner,
-	ShCountTo,
-	ShEmpty,
-	ShHeader,
-	ShIcon,
-	ShIvForm,
-	ShLayout,
-	ShLoading,
-	ShNoticeBar,
-	ShPullRefresh,
-	ShResult,
-	ShUpload,
-	ShForm,
-	ShList,
-	ShModal,
-	ShQuery,
-	ShTable,
-	ShToolbar,
-	ShTree,
-	ShWaterFall
-}
-
-const index = {
-	install: function (Vue, { excludeComponents = [] }) {
-		let globalComponentKeys = Object.keys(components).filter(key => !excludeComponents.includes(key))
-		globalComponentKeys.forEach(key => {
-			Vue.component(key, components[key])
-		})
-	}
-}
-
-export default index
+// 全局公共封装组件
+import ShAlert from './global-components/sh-alert/index.vue'
+import ShBadge from './global-components/sh-badge/index.vue'
+import ShCard from './global-components/sh-card/index.vue'
+import ShCodeEditor from './global-components/sh-code-editor/index.vue'
+import ShCol from './global-components/sh-col/index.vue'
+import ShCorner from './global-components/sh-corner/index.vue'
+import ShCountTo from './global-components/sh-count-to/index.vue'
+import ShDate from './global-components/sh-date/index.vue'
+import ShDrawer from './global-components/sh-drawer/index.vue'
+import ShEmpty from './global-components/sh-empty/index.vue'
+import ShForm from './global-components/sh-form/index.vue'
+import ShHeader from './global-components/sh-header/index.vue'
+import ShIcon from './global-components/sh-icon/index.vue'
+import ShImage from './global-components/sh-image/index.vue'
+import ShList from './global-components/sh-list/index.vue'
+import ShLoading from './global-components/sh-loading/index.vue'
+import ShModal from './global-components/sh-modal/index.vue'
+import ShNoticebar from './global-components/sh-noticebar/index.vue'
+import ShPoptip from './global-components/sh-poptip/index.vue'
+import ShProgress from './global-components/sh-progress/index.vue'
+import ShPullRefresh from './global-components/sh-pull-refresh/index.vue'
+import ShQuery from './global-components/sh-query/index.vue'
+import ShResult from './global-components/sh-result/index.vue'
+import ShRow from './global-components/sh-row/index.vue'
+import ShSplit from './global-components/sh-split/index.vue'
+import ShTable from './global-components/sh-table/index.vue'
+import ShTabs from './global-components/sh-tabs/index.vue'
+import ShTag from './global-components/sh-tag/index.vue'
+import ShToolbar from './global-components/sh-toolbar/index.vue'
+import ShTree from './global-components/sh-tree/index.vue'
+import ShUpload from './global-components/sh-upload/index.vue'
+import ShWaterFall from './global-components/sh-water-fall/index.vue'
+import { VxeButton, VxeInput, VxeTextarea, VxeSelect } from 'vxe-table'
+
+const components = {
+	ShAlert,
+	ShBadge,
+	ShCard,
+	ShCodeEditor,
+	ShCol,
+	ShCorner,
+	ShCountTo,
+	ShDate,
+	ShDrawer,
+	ShEmpty,
+	ShForm,
+	ShHeader,
+	ShIcon,
+	ShImage,
+	ShList,
+	ShLoading,
+	ShModal,
+	ShNoticebar,
+	ShPoptip,
+	ShProgress,
+	ShPullRefresh,
+	ShQuery,
+	ShResult,
+	ShRow,
+	ShSplit,
+	ShTable,
+	ShTabs,
+	ShTag,
+	ShToolbar,
+	ShTree,
+	ShUpload,
+	ShWaterFall,
+
+	ShButton: VxeButton,
+	ShInput: VxeInput,
+	ShTextarea: VxeTextarea,
+	ShSelect: VxeSelect
+}
+
+const index = {
+	install(Vue, { excludeComponents = [] }) {
+		let globalComponentKeys = Object.keys(components).filter(key => !excludeComponents.includes(key))
+		globalComponentKeys.forEach(key => {
+			Vue.component(key, components[key])
+		})
+	}
+}
+
+export default index

package/packages/components/other-components/sh-cron-modal/css/index.scss

@@ -11,7 +11,7 @@
       margin-top: 5px;
       display: flex;
       align-items: center;
-      font-size: var(--font-size-base);
+      font-size: var(--vxe-font-size);
       .choice{
         padding: 5px 8px;
         margin-right: 10px;
@@ -37,7 +37,7 @@
   }
   .cron-title{
     font-weight: bold;
-    border-left: 3px solid var(--theme-color);
+    border-left: 3px solid var(--vxe-primary-color);
     padding: 0 5px;
     box-sizing: border-box;
     margin: 10px 0;