jobsys-explore 4.0.21 → 4.0.23

package/.changeset/flat-kiwis-switch.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+date default value

package/.changeset/red-geckos-change.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+help add function

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # jobsys-explore
 
+## 4.0.23
+
+### Patch Changes
+
+- address
+- form loading status
+- fixed date modelValue
+- date default value
+- y
+- add exPros parameter
+- select add textInValue
+- option fetch data only once
+- add form reset
+- fixed
+- add sm2 encrypt
+- form expose fetchItem method
+- fixed address modelValue
+- fixed textInValue
+- fixed textInValue
+- help add function
+- add key_cn
+- search watch model value
+- address
+- cascader
+- e
+
+## 4.0.22
+
+### Patch Changes
+
+- address
+- form loading status
+- fixed date modelValue
+- date default value
+- y
+- add exPros parameter
+- select add textInValue
+- option fetch data only once
+- add form reset
+- fixed
+- add sm2 encrypt
+- form expose fetchItem method
+- fixed address modelValue
+- fixed textInValue
+- fixed textInValue
+- add key_cn
+- search watch model value
+- address
+- cascader
+- e
+
 ## 4.0.21
 
 ### Patch Changes

package/components/form/ExDate.jsx

@@ -15,7 +15,7 @@ export default defineComponent({
 	props: {
 		...defaultFieldProps,
 
-		modelValue: { type: [Date, String], default: () => null },
+		modelValue: { type: [Date, String, Object], default: () => null },
 
 		/**
 		 * 标题
@@ -26,6 +26,16 @@ export default defineComponent({
 	setup(props, { emit, slots, expose }) {
 		const columnsType = props.defaultProps?.columnsType || ["year", "month", "day"]
 
+		const getYear = (value) => {
+			return isDayjs(value) ? value.year() : value.getFullYear()
+		}
+		const getMonth = (value) => {
+			return isDayjs(value) ? value.month() + 1 : value.getMonth() + 1
+		}
+		const getDate = (value) => {
+			return isDayjs(value) ? value.date() : value.getDate()
+		}
+
 		const _setValueByColumns = (columnsType, value, date) => {
 			columnsType.forEach((column) => {
 				if (column === "year") {
@@ -66,16 +76,6 @@ export default defineComponent({
 
 		const pickerRef = ref(null)
 
-		const getYear = (value) => {
-			return isDayjs(value) ? value.year() : value.getFullYear()
-		}
-		const getMonth = (value) => {
-			return isDayjs(value) ? value.month() + 1 : value.getMonth() + 1
-		}
-		const getDate = (value) => {
-			return isDayjs(value) ? value.date() : value.getDate()
-		}
-
 		const displayText = computed(() => {
 			if (props.modelValue) {
 				let text = ""
@@ -94,7 +94,6 @@ export default defineComponent({
 						text += padZero(getDate(props.modelValue), 2)
 					}
 				})
-
 				return text
 			}
 

package/components/form/ExField.jsx

@@ -53,21 +53,29 @@ export default defineComponent({
 
 		/****************** render **********************/
 
+		const helpElem = () => {
+			if (props.append) {
+				return (
+					<Popover v-model:show={state.showHelp} theme={"dark"} placement={"bottom-start"}>
+						{{
+							default: () => <div class={"ex-field__help"}>{isString(props.help) ? props.help : props.help()}</div>,
+							reference: () =>
+								props.help ? (
+									<span class={"ex-field__help-handler"}>
+										<Icon name={"warning-o"}></Icon>
+									</span>
+								) : null,
+						}}
+					</Popover>
+				)
+			}
+			return null
+		}
 		const labelElem = () => (
 			<div class={"ex-field__label"}>
 				<span>{props.label || slots.label?.()}</span>
 
-				<Popover v-model:show={state.showHelp} theme={"dark"} placement={"bottom-start"}>
-					{{
-						default: () => <div class={"ex-field__help"}>{props.help}</div>,
-						reference: () =>
-							props.help ? (
-								<span class={"ex-field__help-handler"}>
-									<Icon name={"warning-o"}></Icon>
-								</span>
-							) : null,
-					}}
-				</Popover>
+				{helpElem()}
 			</div>
 		)
 

package/components/form/utils.js

@@ -1,5 +1,6 @@
 import { isArray, isDate, isFunction, isUndefined } from "lodash-es"
 import { useAddressFullCode } from "./ExAddress.jsx"
+import { isDayjs } from "dayjs"
 
 /**
  * 初始化表单项默认值
@@ -30,7 +31,7 @@ const initItemDefaultValue = (item, existingData, submitForm, provider) => {
 	} else if (item.type === "switch") {
 		value = value === "true" || value === 1 || value === "1" || value === true
 	} else if (item.type === "date" || item.type === "datetime") {
-		value = isDate(value) ? value : null
+		value = isDate(value) || isDayjs(value) ? value : null
 	} else if (item.type === "checkbox" || item.type === "group" || item.type === "cascade") {
 		value = value || []
 	} else if (item.type === "address") {

package/components/utils.js

@@ -24,7 +24,7 @@ export const defaultFieldProps = {
 	/**
 	 * 提示文案
 	 */
-	help: { type: String, default: "" },
+	help: { type: [String, Function], default: "" },
 
 	/**
 	 * 元素的append slot