jobsys-explore 4.0.2 → 4.0.3

package/.changeset/rich-points-bake.md

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

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # jobsys-explore
 
+## 4.0.3
+
+### Patch Changes
+
+- address
+- add key_cn
+- e
+
 ## 4.0.2
 
 ### Patch Changes

package/components/form/ExAddress.jsx

@@ -1,4 +1,4 @@
-import { computed, defineComponent, inject, ref, watch } from "vue"
+import { computed, defineComponent, inject, ref, watch, nextTick } from "vue"
 import { Cascader } from "vant"
 import localData from "./addressData.json"
 import PickerWrapper, { pickerProps, pickerSlots } from "./PickerWrapper.jsx"
@@ -38,8 +38,12 @@ export default defineComponent({
 		 * 空值或all: 所有, last：最后
 		 */
 		displayTextType: { type: String, default: "" },
+		/**
+		 * 显示值 为了更新cn值
+		 */
+		displayText: { type: [String, Number, Array], default: () => [] },
 	},
-	emits: ["update:modelValue"],
+	emits: ["update:modelValue", "update:displayText"],
 	setup(props, { emit, slots, expose }) {
 		const addressProvider = inject(EX_ADDRESS, () => ({}))
 		const defaultAddressUrl = addressProvider.addressUrl || ""
@@ -101,6 +105,9 @@ export default defineComponent({
 				"update:modelValue",
 				selectedOptions.map((item) => item[valueKey]),
 			)
+			nextTick(() => {
+				emit("update:displayText", displayText.value)
+			})
 		}
 
 		expose({ displayText })

package/components/form/ExCascader.jsx

@@ -1,4 +1,4 @@
-import { computed, defineComponent, ref, watch } from "vue"
+import { computed, defineComponent, ref, watch, nextTick } from "vue"
 import PickerWrapper, { pickerProps, pickerSlots } from "./PickerWrapper.jsx"
 import { Button, Cascader, Search } from "vant"
 import { defaultFieldProps, defaultOptionsProps, useOptionTrait } from "../utils"
@@ -25,8 +25,18 @@ export default defineComponent({
 		 * 是否显示清除按钮
 		 */
 		clearable: { type: Boolean, default: false },
+
+		/**
+		 * 显示值的类型
+		 * 空值或all: 所有, last：最后
+		 */
+		displayTextType: { type: String, default: "" },
+		/**
+		 * 显示值 为了更新cn值
+		 */
+		displayText: { type: [String, Number, Array], default: () => [] },
 	},
-	emits: ["update:modelValue", "change"],
+	emits: ["update:modelValue", "update:displayText", "change"],
 	setup(props, { emit, slots, expose }) {
 		const defaultValue = props.modelValue?.[props.modelValue.length - 1] || ""
 
@@ -94,19 +104,24 @@ export default defineComponent({
 			if (props.modelValue.length === 0) {
 				return ""
 			}
-			return useFindTextsFromPath(options.value, props.modelValue).join("/")
+			const optionsTexts = useFindTextsFromPath(options.value, props.modelValue)
+			return props.displayTextType === "last" ? optionsTexts[optionsTexts.length - 1] : optionsTexts.join("/")
 		})
 
 		const onFinish = ({ selectedOptions }) => {
 			const value = selectedOptions.map((item) => item.value)
 			emit("change", value)
 			emit("update:modelValue", value)
+			nextTick(() => {
+				emit("update:displayText", displayText.value)
+			})
 			pickerRef.value.close()
 		}
 
 		const onClear = () => {
 			emit("change", [])
 			emit("update:modelValue", [])
+			emit("update:displayText", "")
 			pickerRef.value.close()
 		}
 

package/components/form/FormItem.jsx

@@ -148,18 +148,40 @@ const render = (item, submitForm, { props, slots }) => {
 				)
 				break
 			case "address":
-				renderItem = (
-					<ExAddress v-model={submitForm[item.key]} {...fieldProps}>
-						{componentSlots}
-					</ExAddress>
-				)
+				if (item.key_cn) {
+					if (!submitForm[item.key_cn]) {
+						submitForm[item.key_cn] = ""
+					}
+					renderItem = (
+						<ExAddress v-model={submitForm[item.key]} v-model:displayText={submitForm[item.key_cn]} {...fieldProps}>
+							{componentSlots}
+						</ExAddress>
+					)
+				} else {
+					renderItem = (
+						<ExAddress v-model={submitForm[item.key]} {...fieldProps}>
+							{componentSlots}
+						</ExAddress>
+					)
+				}
 				break
 			case "cascade":
-				renderItem = (
-					<ExCascader v-model={submitForm[item.key]} {...componentProps} {...fieldProps}>
-						{componentSlots}
-					</ExCascader>
-				)
+				if (item.key_cn) {
+					if (!submitForm[item.key_cn]) {
+						submitForm[item.key_cn] = ""
+					}
+					renderItem = (
+						<ExCascader v-model={submitForm[item.key]} v-model:displayText={submitForm[item.key_cn]} {...componentProps} {...fieldProps}>
+							{componentSlots}
+						</ExCascader>
+					)
+				} else {
+					renderItem = (
+						<ExCascader v-model={submitForm[item.key]} {...componentProps} {...fieldProps}>
+							{componentSlots}
+						</ExCascader>
+					)
+				}
 				break
 			case "number":
 				renderItem = (