jobsys-explore 4.2.15 → 4.2.17

package/.changeset/chatty-eels-vanish.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+datetime and pagination search

package/.changeset/twenty-dolls-fix.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+exuploader fixed disabled

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # jobsys-explore
 
+## 4.2.17
+
+### Patch Changes
+
+- datetime and pagination search
+- empty zero
+- e
+- exuploader fixed disabled
+
+## 4.2.16
+
+### Patch Changes
+
+- datetime and pagination search
+- empty zero
+- e
+
 ## 4.2.15
 
 ### Patch Changes

package/components/form/ExDatetime.jsx

@@ -4,6 +4,7 @@ import { Calendar, Collapse, CollapseItem, TimePicker } from "vant"
 import ExButton from "../button/ExButton.jsx"
 import { padZero } from "vant/es/utils"
 import { defaultFieldProps } from "../utils"
+import { cloneDeep } from "lodash-es"
 
 /**
  * ExDatetime 日期时间选择器
@@ -20,25 +21,7 @@ export default defineComponent({
 	setup(props, { slots, emit, expose }) {
 		const dateValue = ref(null)
 		const timeValue = ref(null)
-
-		/**
-		 *
-		 * @param {Date|null} date
-		 */
-		const prepareDate = (date) => {
-			if (date) {
-				dateValue.value = date
-				timeValue.value = `${padZero(date.getHours(), 2)}:${padZero(date.getMinutes(), 2)}`
-			}
-		}
-
-		prepareDate(props.modelValue)
-
-		watch(
-			() => props.modelValue,
-			() => prepareDate(props.modelValue),
-		)
-
+		const displayText = ref(null)
 		const pickerRef = ref()
 
 		const activeName = ref("date")
@@ -62,8 +45,37 @@ export default defineComponent({
 			}
 			return "请选择时间"
 		})
+		const timeModel = computed(() => {
+			if (timeValue.value) {
+				const [hours, minutes] = timeValue.value.split(":")
+				return [hours, minutes]
+			}
+			return []
+		})
+
+		const defaultDate = ref(props.modelValue || new Date())
+
+		const setDisplayText = () => {
+			displayText.value = dateValue.value && timeValue.value ? `${dateText.value} ${timeText.value}` : ""
+		}
+		/**
+		 *
+		 * @param {Date|null} date
+		 */
+		const prepareDate = (date) => {
+			if (date) {
+				dateValue.value = cloneDeep(date)
+				timeValue.value = `${padZero(date.getHours(), 2)}:${padZero(date.getMinutes(), 2)}`
+			}
+			setDisplayText()
+		}
+
+		prepareDate(props.modelValue)
 
-		const displayText = computed(() => (dateValue.value && timeValue.value ? `${dateText.value} ${timeText.value}` : ""))
+		watch(
+			() => props.modelValue,
+			() => prepareDate(props.modelValue),
+		)
 
 		expose({ displayText })
 
@@ -76,6 +88,9 @@ export default defineComponent({
 		}
 
 		const onConfirm = () => {
+			if (!dateValue.value) {
+				dateValue.value = new Date()
+			}
 			let dateString = `${dateValue.value.getFullYear()}/${dateValue.value.getMonth() + 1}/${dateValue.value.getDate()}`
 
 			if (!timeValue.value) {
@@ -85,6 +100,7 @@ export default defineComponent({
 			}
 
 			pickerRef.value.close()
+			setDisplayText()
 
 			emit("update:modelValue", new Date(dateString))
 		}
@@ -108,6 +124,7 @@ export default defineComponent({
 															maxDate={maxDate}
 															showSubtitle={false}
 															showConfirm={false}
+															defaultDate={defaultDate.value}
 															poppable={false}
 															showTitle={false}
 															lazyRender={true}
@@ -125,6 +142,7 @@ export default defineComponent({
 												default: () => (
 													<div>
 														<TimePicker
+															modelValue={timeModel.value}
 															showToolbar={false}
 															onChange={onTimeChange}
 															{...props.defaultProps.timeProps}

package/components/form/ExSelect.jsx

@@ -3,7 +3,7 @@ import PickerWrapper, { pickerSlots } from "./PickerWrapper.jsx"
 import { Button, Picker, Search } from "vant"
 import { defaultFieldProps, defaultOptionsProps } from "../utils"
 import { useFetch } from "../../hooks"
-import { cloneDeep, find, isArray, isFunction, isString } from "lodash-es"
+import { cloneDeep, find, isArray, isFunction, isNumber, isString } from "lodash-es"
 
 /**
  * ExSelect 下拉选择
@@ -113,7 +113,7 @@ export default defineComponent({
 			options = options.map((option) => {
 				if (isArray(option)) {
 					return option.map((op) => {
-						return isString(op) ? { value: op, label: op, text: op } : { text: op.label, ...op }
+						return isString(op) || isNumber(op) ? { value: op, label: op, text: op } : { text: op.label, ...op }
 					})
 				}
 

package/components/pagination/ExPagination.jsx

@@ -1,4 +1,4 @@
-import { defineComponent, inject, reactive, nextTick } from "vue"
+import { defineComponent, inject, reactive, nextTick, ref } from "vue"
 import { useFetch } from "../../hooks"
 import { Empty, List, PullRefresh, Sticky } from "vant"
 import ExSearch from "../search/ExSearch.jsx"
@@ -22,7 +22,7 @@ export default defineComponent({
 		pullRefresh: { type: [Boolean, Object], default: true },
 
 		/**
-		 * ExSearch 搜索的 columns 配置
+		 * ExSearch 搜索配置
 		 */
 		search: { type: Object, default: null },
 
@@ -93,6 +93,7 @@ export default defineComponent({
 	},
 	setup(props, { expose, slots }) {
 		const paginationProvider = inject(EX_PAGINATION, () => ({}))
+		const searchRef = ref(null)
 
 		const { currentPage: currentPageKey, pageSize: pageSizeKey } = paginationProvider.requestKeys
 
@@ -195,6 +196,11 @@ export default defineComponent({
 			})
 		}
 
+		const onFirstLoad = () => {
+			state.searchParams = searchRef.value?.getQueryForm() || {}
+			loadMore(false)
+		}
+
 		/****************** exposed ******************/
 
 		const items = () => {
@@ -219,14 +225,14 @@ export default defineComponent({
 					return (
 						<Sticky {...stickyObj}>
 							<div class={`ex-pagination__search`}>
-								<ExSearch {...props.search} onSearch={onSearch}></ExSearch>
+								<ExSearch ref={searchRef} {...props.search} onSearch={onSearch}></ExSearch>
 							</div>
 						</Sticky>
 					)
 				} else {
 					return (
 						<div class={`ex-pagination__search`}>
-							<ExSearch {...props.search} onSearch={onSearch}></ExSearch>
+							<ExSearch ref={searchRef} {...props.search} onSearch={onSearch}></ExSearch>
 						</div>
 					)
 				}
@@ -252,7 +258,7 @@ export default defineComponent({
 								finished={state.finished}
 								finishedText={props.finishText}
 								errorText={state.errorMessage || props.errorText}
-								onLoad={() => loadMore(false)}
+								onLoad={onFirstLoad}
 								offset={props.offset}
 								{...props.defaultProps}
 							>

package/components/search/ExSearch.jsx

@@ -98,7 +98,7 @@ export default defineComponent({
 				value = isFunction(item.defaultValue) ? item.defaultValue() : item.defaultValue
 			}
 
-			if (item.type === "date" && !value) {
+			if ((item.type === "date" || item.type === "datetime") && !value) {
 				return null
 			}
 
@@ -120,6 +120,7 @@ export default defineComponent({
 			props.columns.forEach((item) => {
 				form[item.key] = searchItemDefaultValue(item)
 			})
+			console.log(props.columns, form)
 			state.queryForm = form
 		}
 
@@ -182,7 +183,7 @@ export default defineComponent({
 			componentValue.value = ""
 		}
 
-		expose({ reset })
+		expose({ reset, getQueryForm })
 
 		/******************* render *********************/
 

package/components/uploader/ExUploader.jsx

@@ -243,9 +243,9 @@ export default defineComponent({
 					accetp={props.accept}
 					uploadText={props.uploadText}
 					uploadIcon={props.uploadIcon}
-					disblaed={props.disabled}
+					disabled={props.disabled}
 					readonly={props.readonly}
-					deletable={!props.readonly}
+					deletable={!(props.readonly || props.disabled)}
 					showUpload={!props.readonly && !props.disabled}
 					afterRead={onSubmit}
 					onOversize={onOversize}

package/components/utils.js

@@ -1,4 +1,4 @@
-import { cloneDeep, isFunction, isString } from "lodash-es"
+import { cloneDeep, isFunction, isNumber, isString } from "lodash-es"
 import { watch } from "vue"
 import { useCache, useFetch } from "../hooks"
 
@@ -118,7 +118,7 @@ export const prepareOptions = (options) => {
 		if (op.children?.length) {
 			op.children = prepareOptions(op.children)
 		}
-		return isString(op) ? { value: op, label: op, text: op } : { text: op.label, ...op }
+		return isString(op) || isNumber(op) ? { value: op, label: op, text: op } : { text: op.label, ...op }
 	})
 	return options
 }