jobsys-explore 4.0.13 → 4.0.15

package/.changeset/healthy-candles-wink.md

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

package/.changeset/modern-clocks-notice.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+add form reset

package/CHANGELOG.md

@@ -1,5 +1,42 @@
 # jobsys-explore
 
+## 4.0.15
+
+### Patch Changes
+
+- address
+- y
+- add exPros parameter
+- 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
+- e
+
+## 4.0.14
+
+### Patch Changes
+
+- address
+- add exPros parameter
+- 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
+- e
+
 ## 4.0.13
 
 ### Patch Changes

package/components/form/ExCascader.jsx

@@ -15,7 +15,7 @@ export default defineComponent({
 		...defaultOptionsProps,
 		...defaultFieldProps,
 
-		modelValue: { type: Array, default: () => [] },
+		modelValue: { type: [Array, String], default: () => [] },
 
 		/**
 		 * 标题

package/components/form/ExDate.jsx

@@ -23,13 +23,8 @@ export default defineComponent({
 	emits: ["update:modelValue"],
 	setup(props, { emit, slots, expose }) {
 		const columnsType = props.defaultProps?.columnsType || ["year", "month", "day"]
-		const prepareDate = (date) => {
-			const value = []
-
-			if (!date) {
-				return value
-			}
 
+		const _setValueByColumns = (columnsType, value, date) => {
 			columnsType.forEach((column) => {
 				if (column === "year") {
 					value.push(date.getFullYear())
@@ -39,15 +34,23 @@ export default defineComponent({
 					value.push(date.getDate())
 				}
 			})
-
 			return value
 		}
+		const prepareDate = (date) => {
+			const value = []
+
+			if (!date) {
+				return value
+			}
+
+			return _setValueByColumns(columnsType, value, date)
+		}
 
 		let defaultValue = prepareDate(props.modelValue)
 
 		if (!defaultValue.length) {
 			const now = new Date()
-			defaultValue = [now.getFullYear(), now.getMonth() + 1, now.getDate()]
+			defaultValue = _setValueByColumns(columnsType, defaultValue, now)
 		}
 
 		const componentValue = ref(defaultValue)
@@ -66,11 +69,17 @@ export default defineComponent({
 				let text = ""
 				columnsType.forEach((column) => {
 					if (column === "year") {
-						text += `${props.modelValue.getFullYear()}/`
+						text += props.modelValue.getFullYear()
 					} else if (column === "month") {
-						text += `${padZero(props.modelValue.getMonth() + 1, 2)}/`
+						if (text) {
+							text += "/"
+						}
+						text += padZero(props.modelValue.getMonth() + 1, 2)
 					} else if (column === "day") {
-						text += `${padZero(props.modelValue.getDate(), 2)}`
+						if (text) {
+							text += "/"
+						}
+						text += padZero(props.modelValue.getDate(), 2)
 					}
 				})
 

package/components/form/ExForm.jsx

@@ -1,4 +1,4 @@
-import { computed, defineComponent, inject, onMounted, reactive, ref, watch } from "vue"
+import { computed, defineComponent, inject, nextTick, onMounted, reactive, ref, watch } from "vue"
 import { EX_UPLOADER, EX_FORM } from "../provider/ExProvider.jsx"
 import { cloneDeep, every, isEqual, isFunction, isObject, isString, pick } from "lodash-es"
 import { initItemDefaultValue } from "./utils"
@@ -354,7 +354,18 @@ export default defineComponent({
 			return !isEqual(state.submitForm, state.submitFormBackup)
 		}
 
-		expose({ getForm, getFormStandalone, setForm, isDirty, fetchItem })
+		/**
+		 * 重置表单
+		 * @param {Object} formData 表单数据
+		 */
+		const reset = (formData) => {
+			initFormData(formData)
+			nextTick(() => {
+				formRef.value.resetValidation()
+			})
+		}
+
+		expose({ getForm, getFormStandalone, setForm, isDirty, fetchItem, reset })
 
 		/********** render **********/
 

package/components/search/ExSearch.jsx

@@ -191,7 +191,7 @@ export default defineComponent({
 			componentValue.value = ""
 		}
 
-		expose({ reset: reset })
+		expose({ reset })
 
 		/******************* render *********************/