jobsys-explore 4.0.8 → 4.0.10

package/.changeset/mean-rice-repeat.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+option fetch data only once

package/.changeset/serious-sloths-smoke.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+search watch model value

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # jobsys-explore
 
+## 4.0.10
+
+### Patch Changes
+
+- address
+- add exPros parameter
+- option fetch data only once
+- form expose fetchItem method
+- fixed address modelValue
+- fixed textInValue
+- fixed textInValue
+- add key_cn
+- search watch model value
+- e
+
+## 4.0.9
+
+### Patch Changes
+
+- address
+- add exPros parameter
+- option fetch data only once
+- form expose fetchItem method
+- fixed address modelValue
+- fixed textInValue
+- fixed textInValue
+- add key_cn
+- e
+
 ## 4.0.8
 
 ### Patch Changes

package/components/form/ExDate.jsx

@@ -13,7 +13,7 @@ export default defineComponent({
 	props: {
 		...defaultFieldProps,
 
-		modelValue: { type: Date, default: () => null },
+		modelValue: { type: [Date, String], default: () => null },
 
 		/**
 		 * 标题

package/components/search/ExSearch.jsx

@@ -1,4 +1,4 @@
-import { defineComponent, nextTick, reactive, ref } from "vue"
+import { defineComponent, nextTick, reactive, ref, watch } from "vue"
 import { Button, Icon, Popup, Search } from "vant"
 import { find, isArray, isFunction } from "lodash-es"
 import { createExpand, createField, createQuick } from "./components"
@@ -74,6 +74,13 @@ export default defineComponent({
 	setup(props, { emit }) {
 		const componentValue = ref(props.modelValue)
 
+		watch(
+			() => props.modelValue,
+			() => {
+				componentValue.value = props.modelValue
+			},
+		)
+
 		const state = reactive({
 			queryForm: {}, // 搜索表单
 			quickColumns: [], //快速检索项

package/components/utils.js

@@ -1,6 +1,6 @@
 import { cloneDeep, isFunction, isString } from "lodash-es"
 import { watch } from "vue"
-import { useFetch } from "../hooks"
+import { useCache, useFetch } from "../hooks"
 
 /**
  * 通用 field props
@@ -95,6 +95,11 @@ export const defaultOptionsProps = {
 	 */
 	url: { type: String, default: null },
 
+	/**
+	 * 缓存url返回的数据
+	 */
+	urlCache: { type: Boolean, default: true },
+
 	/**
 	 * 选项获取后的回调
 	 */
@@ -118,6 +123,20 @@ export const prepareOptions = (options) => {
 	return options
 }
 
+//内部方法，为了useOptionTrait实现单次请求，避免重复请求
+const recordOptionsUrl = {}
+const optionsFetcher = (props) => {
+	return new Promise((resolve) => {
+		useFetch()
+			.get(props.url)
+			.then((items) => {
+				if (props.afterFetched) {
+					items = props.afterFetched(items)
+				}
+				resolve(items)
+			})
+	})
+}
 /**
  * 初始化选项
  * @param options
@@ -129,17 +148,18 @@ export const prepareOptions = (options) => {
 export const useOptionTrait = async (options, props, defaultOptions) => {
 	options.value = prepareOptions(props.options)
 
-	const fetchData = () =>
-		new Promise((resolve) => {
-			useFetch()
-				.get(props.url)
-				.then((items) => {
-					if (props.afterFetched) {
-						items = props.afterFetched(items)
-					}
-					resolve(items)
-				})
+	const fetchData = async (props) => {
+		if (recordOptionsUrl[props.url]) {
+			return recordOptionsUrl[props.url]
+		}
+		recordOptionsUrl[props.url] = optionsFetcher(props)
+
+		const result = await recordOptionsUrl[props.url]
+		recordOptionsUrl[props.url] = null
+		return new Promise((resolve) => {
+			resolve(result)
 		})
+	}
 
 	watch(
 		() => props.options,
@@ -150,9 +170,16 @@ export const useOptionTrait = async (options, props, defaultOptions) => {
 
 	if (!options.value.length) {
 		if (props.url) {
-			fetchData().then((items) => {
-				options.value = items
-			})
+			if (props.urlCache && useCache(props.url).get()) {
+				options.value = useCache(props.url).get()
+			} else {
+				fetchData(props).then((items) => {
+					options.value = items
+					if (props.urlCache) {
+						useCache(props.url).set(items)
+					}
+				})
+			}
 		} else if (defaultOptions) {
 			options.value = defaultOptions
 		}

package/dist/hooks.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./index-1d1cffa4.cjs"),r=require("dayjs"),o=require("lodash-es");require("axios");require("vant");function i(){return s.sm2_exports}function c(e,u){return s.sm32(e,u)}function a(e,u,n){return s.sm4_exports.encrypt(e,u,n)}function F(e,u,n){return s.sm4_exports.encrypt(e,u,n)}function m(e,u){return u?r(e,u):r(e)}function t(e,u){return e?(r.isDayjs(e)||(e=r(e)),e.format(u||"YYYY-MM-DD HH:mm")):""}function S(e){return e?(r.isDayjs(e)||(e=r(e)),e.unix()):""}function f(e,u){return e&&o.isString(e)&&(e=parseInt(e)),e<9999999999&&(e*=1e3),t(new Date(e),u)}exports.STATUS=s.STATUS;exports._configStatus=s._configStatus;exports.useCache=s.useCache;exports.useFetch=s.useFetch;exports.useFindLabelsFromPath=s.useFindLabelsFromPath;exports.useFindParentValues=s.useFindParentValues;exports.useFindTextsFromPath=s.useFindTextsFromPath;exports.useFindTextsInValues=s.useFindTextsInValues;exports.useFormFail=s.useFormFail;exports.useFormFormat=s.useFormFormat;exports.useHiddenForm=s.useHiddenForm;exports.useProcessStatus=s.useProcessStatus;exports.useProcessStatusSuccess=s.useProcessStatusSuccess;exports.useTextFromOptionsValue=s.useTextFromOptionsValue;exports.useDateFormat=t;exports.useDateUnix=S;exports.useDayjs=m;exports.useSm2=i;exports.useSm3=c;exports.useSm4Decrypt=F;exports.useSm4Encrypt=a;exports.useTimestampFormat=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./index-4756607f.cjs"),r=require("dayjs"),o=require("lodash-es");require("axios");require("vant");function i(){return s.sm2_exports}function c(e,u){return s.sm32(e,u)}function a(e,u,n){return s.sm4_exports.encrypt(e,u,n)}function F(e,u,n){return s.sm4_exports.encrypt(e,u,n)}function m(e,u){return u?r(e,u):r(e)}function t(e,u){return e?(r.isDayjs(e)||(e=r(e)),e.format(u||"YYYY-MM-DD HH:mm")):""}function S(e){return e?(r.isDayjs(e)||(e=r(e)),e.unix()):""}function f(e,u){return e&&o.isString(e)&&(e=parseInt(e)),e<9999999999&&(e*=1e3),t(new Date(e),u)}exports.STATUS=s.STATUS;exports._configStatus=s._configStatus;exports.useCache=s.useCache;exports.useFetch=s.useFetch;exports.useFindLabelsFromPath=s.useFindLabelsFromPath;exports.useFindParentValues=s.useFindParentValues;exports.useFindTextsFromPath=s.useFindTextsFromPath;exports.useFindTextsInValues=s.useFindTextsInValues;exports.useFormFail=s.useFormFail;exports.useFormFormat=s.useFormFormat;exports.useHiddenForm=s.useHiddenForm;exports.useProcessStatus=s.useProcessStatus;exports.useProcessStatusSuccess=s.useProcessStatusSuccess;exports.useTextFromOptionsValue=s.useTextFromOptionsValue;exports.useDateFormat=t;exports.useDateUnix=S;exports.useDayjs=m;exports.useSm2=i;exports.useSm3=c;exports.useSm4Decrypt=F;exports.useSm4Encrypt=a;exports.useTimestampFormat=f;
 //# sourceMappingURL=hooks.cjs.map

package/dist/hooks.js

@@ -1,5 +1,5 @@
-import { s as o, e as t, f as n } from "./index-6747e8a2.js";
-import { S as Y, _, k as g, u as H, i as V, j as b, a as I, h as M, d as U, c as k, l as w, m as A, b as C, g as E } from "./index-6747e8a2.js";
+import { s as o, f as t, g as n } from "./index-438db37d.js";
+import { S as Y, _, u as g, a as H, j as V, k as b, b as I, i as M, e as U, d as k, l as w, m as A, c as C, h as E } from "./index-438db37d.js";
 import u from "dayjs";
 import { isString as i } from "lodash-es";
 import "axios";