jobsys-explore 4.2.5 → 4.2.7

package/.changeset/curly-buttons-smash.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+pagination add pullrefresh

package/.changeset/ten-needles-wait.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+select

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # jobsys-explore
 
+## 4.2.7
+
+### Patch Changes
+
+- select
+- pagination add pullrefresh
+- d
+- useFormFormat
+- rate default null
+- use Dayjs
+- select
+
+## 4.2.6
+
+### Patch Changes
+
+- select
+- d
+- useFormFormat
+- rate default null
+- use Dayjs
+- select
+
 ## 4.2.5
 
 ### Patch Changes

package/components/form/ExSelect.jsx

@@ -125,7 +125,9 @@ export default defineComponent({
 			return options
 		}
 
-		prepareOptions(props.options).then((opts) => (options.value = opts))
+		prepareOptions(props.options).then((opts) => {
+			options.value = opts
+		})
 
 		watch(
 			() => props.options,
@@ -133,11 +135,11 @@ export default defineComponent({
 		)
 
 		const filterOnlineDataByKeyword = async () => {
-			let res = await useFetch(fetcher).get(props.filterUrl, { params: { keyword: keyword.value } })
+			let res = await useFetch(fetcher.value).get(props.filterUrl, { params: { keyword: keyword.value } })
 			if (props.afterFetched) {
 				res = props.afterFetched(res)
 			}
-			options.value = res
+			prepareOptions(res).then((opts) => (options.value = opts))
 		}
 
 		const filterLocalDataByKeyword = () => {

package/components/pagination/ExPagination.jsx

@@ -1,6 +1,6 @@
 import { defineComponent, inject, reactive, nextTick } from "vue"
 import { useFetch } from "../../hooks"
-import { Empty, List, Sticky } from "vant"
+import { Empty, List, PullRefresh, Sticky } from "vant"
 import ExSearch from "../search/ExSearch.jsx"
 import "./index.less"
 import { EX_PAGINATION } from "../provider/ExProvider.jsx"
@@ -13,6 +13,14 @@ import { isFunction, isObject, pick } from "lodash-es"
 export default defineComponent({
 	name: "ExPagination",
 	props: {
+		/**
+		 * 下拉刷新的配置
+		 * true：表示启用下拉刷新
+		 * Object：用于PullRefresh组件的配置
+		 * [PullRefresh配置](https://vant-contrib.gitee.io/vant/#/zh-CN/pull-refresh)
+		 */
+		pullRefresh: { type: [Boolean, Object], default: true },
+
 		/**
 		 * ExSearch 搜索的 columns 配置
 		 */
@@ -98,6 +106,7 @@ export default defineComponent({
 			empty: false,
 			searchParams: {},
 			offsetTop: 0,
+			refreshLoading: false,
 		})
 
 		/*if (props.useStore?.initPagination) {
@@ -113,7 +122,7 @@ export default defineComponent({
             })
         }*/
 
-		const loadMore = async (refresh) => {
+		const loadMore = async (refresh, callback) => {
 			if (refresh) {
 				state.items = []
 				state.currentPage = 0
@@ -164,14 +173,12 @@ export default defineComponent({
 				state.errorMessage = ""
 			}
 
+			callback && callback()
+
 			state.items = [...state.items, ...res.items]
 			state.currentPage = res.currentPage
 			state.empty = res.totalSize === 0
 			state.finished = res.totalSize <= state.items.length
-			// 等待渲染完成后再设置 loading
-			/* setTimeout(() => {
-				state.loading = false
-			}, 300) */
 			nextTick(() => {
 				state.loading = false
 			})
@@ -182,6 +189,12 @@ export default defineComponent({
 			loadMore(true)
 		}
 
+		const onPullRefresh = () => {
+			loadMore(true, () => {
+				state.refreshLoading = false
+			})
+		}
+
 		/****************** exposed ******************/
 
 		const items = () => {
@@ -194,6 +207,7 @@ export default defineComponent({
 			pagination: pick(state, ["loading", "finished", "empty", "error", "currentPage"]),
 		})
 
+		/****************** render ******************/
 		const searchElem = () => {
 			if (props.search) {
 				if (props.searchFixed) {
@@ -221,44 +235,59 @@ export default defineComponent({
 			}
 		}
 
-		/****************** render ******************/
-
-		return () => (
-			<div class={`ex-pagination`}>
-				{searchElem()}
-
-				<div class={`ex-pagination__list`} style={{ paddingTop: `${state.offsetTop}px` }}>
-					{state.empty ? (
-						<Empty description={props.emptyText}></Empty>
-					) : (
-						<List
-							v-model:loading={state.loading}
-							v-model:error={state.error}
-							immediateCheck={props.autoLoad}
-							finished={state.finished}
-							finishedText={props.finishText}
-							errorText={state.errorMessage || props.errorText}
-							onLoad={() => loadMore(false)}
-							offset={props.offset}
-							{...props.defaultProps}
-						>
-							{{
-								default: () =>
-									state.items
-										? state.items.map((item, index) =>
-												slots.renderItem
-													? slots.renderItem({
-															item,
-															index,
-													  })
-													: null,
-										  )
-										: null,
-							}}
-						</List>
-					)}
+		const paginationElem = () => {
+			return (
+				<div class={`ex-pagination`}>
+					{searchElem()}
+
+					<div class={`ex-pagination__list`} style={{ paddingTop: `${state.offsetTop}px` }}>
+						{state.empty ? (
+							<Empty description={props.emptyText}></Empty>
+						) : (
+							<List
+								v-model:loading={state.loading}
+								v-model:error={state.error}
+								immediateCheck={props.autoLoad}
+								finished={state.finished}
+								finishedText={props.finishText}
+								errorText={state.errorMessage || props.errorText}
+								onLoad={() => loadMore(false)}
+								offset={props.offset}
+								{...props.defaultProps}
+							>
+								{{
+									default: () =>
+										state.items
+											? state.items.map((item, index) =>
+													slots.renderItem
+														? slots.renderItem({
+																item,
+																index,
+														  })
+														: null,
+											  )
+											: null,
+								}}
+							</List>
+						)}
+					</div>
 				</div>
-			</div>
-		)
+			)
+		}
+
+		const refreshElem = () => {
+			if (props.pullRefresh) {
+				const pullRefreshObj = isObject(props.pullRefresh) ? props.pullRefresh : {}
+				return (
+					<PullRefresh v-model={state.refreshLoading} onRefresh={onPullRefresh} {...pullRefreshObj}>
+						{() => paginationElem()}
+					</PullRefresh>
+				)
+			} else {
+				return paginationElem()
+			}
+		}
+
+		return () => refreshElem()
 	},
 })