jobsys-explore 4.6.0 → 4.6.1

package/.changeset/{dry-feet-float.md → hip-hounds-drop.md}

@@ -2,4 +2,4 @@
 "jobsys-explore": patch
 ---
 
-Drop the unused property
+Add useFindOptionByValue

package/.changeset/{blue-spiders-roll.md → hip-spoons-smell.md}

@@ -2,4 +2,4 @@
 "jobsys-explore": patch
 ---
 
-Fix
+Upgrade

package/.changeset/{cyan-monkeys-draw.md → orange-trees-film.md}

@@ -2,4 +2,4 @@
 "jobsys-explore": patch
 ---
 
-Build
+Downgrade vue

package/.changeset/tall-trainers-sin.md

@@ -0,0 +1,5 @@
+---
+"jobsys-explore": patch
+---
+
+Add fieldNames support for options

package/.eslintignore

@@ -1,4 +1,4 @@
-dist
-node_modules
-.prettierrc.cjs
+dist
+node_modules
+.prettierrc.cjs
 vite.config.js

package/CHANGELOG.md

@@ -1,43 +1,22 @@
 # jobsys-explore
 
-## 4.6.0
+## 4.5.5
 
-### Minor Changes
+### Patch Changes
 
-- Add survey component
+- Add useFindOptionByValue
+- Upgrade
+- Downgrade vue
+- Add fieldNames support for options
+
+## 4.5.4
 
 ### Patch Changes
 
-- Fix
-- Build
-- Drop the unused property
-- Add matrix component and closable option
-- Fix clear error in ExSearch
-- Rewrite ExPagiantion
-- Add init and beforeSubmit
-- Fix
-- Add disabled and readonly for ex form
-- hide upload when readonly or disabled
-- Add form item pattern support
-- Add cascader search and filter search issue
-- Fix sector style
-- Fix exupload
-- Add ex-decorator
-- clone the options before traverse
-- Upgrade useFormFormat
-- Add \_type for uploader
-- upgrade
-- Fix
-- Add useFindParentValues
-- Fix form submit await
-- Add status adapter and useFetch loading
-- Adjust form item render order
-- Add pagination expose
-- Add pagination persistence
-- Fix upload file
-- Add useFindPropertyRecursive
-- upgrade
-- Fix beforeSubmit
+- Add useFindOptionByValue
+- Upgrade
+- Downgrade vue
+- Add fieldNames support for options
 
 ## 4.6.0
 

package/README.md

@@ -1,41 +1,41 @@
-# TODOs
-
----
-
-## 增强
-
--   [ ] ExploreForm
-
-    -   [x] Address
-    -   [x] Cascader
-    -   [x] Checkbox
-    -   [x] Date
-    -   [ ] Group
-    -   [ ] Html
-    -   [x] Input
-    -   [x] Number
-    -   [x] Radio
-    -   [ ] Remote
-    -   [x] Select
-    -   [x] Switch
-    -   [] Tag
-    -   [x] Text
-    -   [x] Time
-    -   [ ] TreeSelect
-    -   [x] Uploader
-
--   [x] ExploreSearch
-
-    -   [x] 同上
-
--   [x] Field
-    -   [x] Disabled
-    -   [x] Help
-
-## 新增
-
--   [ ] 样式定制
--   [ ] 浮动按钮
--   [ ] 列表组件
--   [ ] 背景生成
--   [ ] 简易图表
+# TODOs
+
+---
+
+## 增强
+
+-   [ ] ExploreForm
+
+    -   [x] Address
+    -   [x] Cascader
+    -   [x] Checkbox
+    -   [x] Date
+    -   [ ] Group
+    -   [ ] Html
+    -   [x] Input
+    -   [x] Number
+    -   [x] Radio
+    -   [ ] Remote
+    -   [x] Select
+    -   [x] Switch
+    -   [] Tag
+    -   [x] Text
+    -   [x] Time
+    -   [ ] TreeSelect
+    -   [x] Uploader
+
+-   [x] ExploreSearch
+
+    -   [x] 同上
+
+-   [x] Field
+    -   [x] Disabled
+    -   [x] Help
+
+## 新增
+
+-   [ ] 样式定制
+-   [ ] 浮动按钮
+-   [ ] 列表组件
+-   [ ] 背景生成
+-   [ ] 简易图表

package/TODOs.md

@@ -1,8 +1,8 @@
-# Bugs
-
-- [ ] ExPagination 无限加载数据问题
-
-# Improvements
-
-# Features
-
+# Bugs
+
+- [ ] ExPagination 无限加载数据问题
+
+# Improvements
+
+# Features
+

package/business-components/survey/ExSurvey.jsx

@@ -1,193 +1,193 @@
-import { computed, defineComponent, nextTick, reactive, watch } from "vue"
-import { Progress } from "vant"
-import "./index.less"
-import { ExButton, ExForm } from "../../components"
-import { cloneDeep } from "lodash-es"
-import { useProcessStatusSuccess } from "../../hooks"
-
-/**
- * 调查问卷
- * @version 4.4.0
- */
-export default defineComponent({
-	name: "ExSurvey",
-	props: {
-		/**
-		 * 标题
-		 */
-		title: { type: String, default: "" },
-
-		/**
-		 * 问卷 slug
-		 */
-		slug: { type: [Number, String], default: "", required: true },
-		/**
-		 * 开场语
-		 */
-		intro: { type: String, default: "" },
-
-		/**
-		 * 结束语
-		 */
-		outro: { type: String, default: "" },
-
-		/**
-		 * 从哪个章节开始做
-		 */
-		startChapter: { type: Number, default: 0 },
-
-		/**
-		 * 表单项
-		 */
-		formItems: { type: Array, default: () => [], required: true },
-
-		/**
-		 * 提交地址
-		 */
-		submitUrl: { type: String, default: "" },
-
-		/**
-		 *
-		 * @typedef {Object} ExposedFormData
-		 * @property {Object} formatForm Format后的表单数据
-		 *
-		 *
-		 * 提交数据处理函数
-		 * @param {ExposedFormData} data
-		 * @return {Boolean|Object} return false会阻止提交操作，return Object会替换提交的数据
-		 *
-		 */
-		beforeSubmit: { type: Function, default: null },
-	},
-	emits: [
-		/**
-		 * @event click
-		 * @param {Event} event 完结事件
-		 */
-		"finish",
-	],
-
-	setup(props, { emit }) {
-		const state = reactive({
-			currentStep: "intro",
-			formChapters: [], //二维数组，按章节存储
-			currentChapter: 0, //当前章节
-		})
-
-		const isLastChapter = computed(() => state.currentChapter === state.formChapters.length)
-		const progress = computed(() => (!state.formChapters.length ? 0 : (state.currentChapter / state.formChapters.length) * 100))
-
-		// 将 props.formItems 按 break 划分成章节
-		const prepareFormItems = () => {
-			let chapter = [] //存储章节的数组
-			const formItems = cloneDeep(props.formItems)
-			for (let i = 0; i < formItems.length; i += 1) {
-				const item = formItems[i] // 这个是用于渲染的配置
-				item.defaultSlots = {
-					label: () => (
-						<span style={{ marginBottom: "10px" }}>
-							{i + 1}.{item.title}
-						</span>
-					),
-				}
-				if (item.break) {
-					if (chapter.length) {
-						state.formChapters.push(chapter)
-					}
-					delete item.break
-					chapter = [item]
-				} else {
-					chapter.push(item)
-				}
-
-				if (i === formItems.length - 1) {
-					state.formChapters.push(chapter)
-				}
-			}
-		}
-
-		watch(
-			() => props.formItems,
-			() => {
-				prepareFormItems()
-				nextTick(() => {
-					if (props.startChapter) {
-						state.currentChapter = Math.min(props.startChapter - 1, state.formChapters.length - 1)
-					}
-				})
-			},
-			{ immediate: true },
-		)
-
-		const onBeforeSubmit = ({ formatForm }) => {
-			let data = { slug: props.slug, answers: formatForm }
-			if (props.beforeSubmit) {
-				return props.beforeSubmit(data)
-			}
-			return data
-		}
-
-		const onAfterSubmit = (res) => {
-			useProcessStatusSuccess(res, () => {
-				state.currentChapter += 1
-				if (state.currentChapter === state.formChapters.length) {
-					state.currentStep = "outro"
-				}
-			})
-		}
-
-		const onFinish = () => {
-			emit("finish")
-		}
-
-		const progressElem = () => {
-			return state.formChapters.length <= 1 || state.currentStep !== "form" ? null : (
-				<div class={`ex-survey__progress`}>
-					<Progress showPivot={false} percentage={progress.value}></Progress>
-				</div>
-			)
-		}
-
-		const introElem = () =>
-			(props.title || props.intro) && state.currentStep === "intro" ? (
-				<div class={`ex-survey__intro`}>
-					{props.title ? <div class={`ex-survey__title`}>{props.title}</div> : null}
-					{props.intro || null}
-					<ExButton type={"primary"} class={"ex-survey__start-btn"} onClick={() => (state.currentStep = "form")}>
-						{() => "开始"}
-					</ExButton>
-				</div>
-			) : null
-
-		const outroElem = () =>
-			props.intro && state.currentStep === "outro" ? (
-				<div class={`ex-survey__outro`}>
-					{props.outro || "谢谢您的参与，祝您有美好的一天！"}
-					<ExButton type={"primary"} class={"ex-survey__finish-btn"} onClick={onFinish}>
-						{() => "完成"}
-					</ExButton>
-				</div>
-			) : null
-
-		const formElem = () => {
-			return state.currentStep === "form" ? (
-				<div class={`ex-survey__form`}>
-					<ExForm
-						form={state.formChapters[state.currentChapter]}
-						labelWidth={"100%"}
-						fixed={true}
-						submitUrl={props.submitUrl}
-						closable={!isLastChapter.value && state.currentChapter !== 0}
-						close={() => (state.currentChapter -= 1)}
-						cancelButtonText={"上一步"}
-						submitButtonText={"确定"}
-						beforeSubmit={onBeforeSubmit}
-						afterSubmit={onAfterSubmit}
-					></ExForm>
-				</div>
-			) : null
-		}
-
-		return () => <div class={`ex-survey`}>{[introElem(), progressElem(), formElem(), outroElem()]}</div>
-	},
-})
+import { computed, defineComponent, nextTick, reactive, watch } from "vue"
+import { Progress } from "vant"
+import "./index.less"
+import { ExButton, ExForm } from "../../components"
+import { cloneDeep } from "lodash-es"
+import { useProcessStatusSuccess } from "../../hooks"
+
+/**
+ * 调查问卷
+ * @version 4.4.0
+ */
+export default defineComponent({
+	name: "ExSurvey",
+	props: {
+		/**
+		 * 标题
+		 */
+		title: { type: String, default: "" },
+
+		/**
+		 * 问卷 slug
+		 */
+		slug: { type: [Number, String], default: "", required: true },
+		/**
+		 * 开场语
+		 */
+		intro: { type: String, default: "" },
+
+		/**
+		 * 结束语
+		 */
+		outro: { type: String, default: "" },
+
+		/**
+		 * 从哪个章节开始做
+		 */
+		startChapter: { type: Number, default: 0 },
+
+		/**
+		 * 表单项
+		 */
+		formItems: { type: Array, default: () => [], required: true },
+
+		/**
+		 * 提交地址
+		 */
+		submitUrl: { type: String, default: "" },
+
+		/**
+		 *
+		 * @typedef {Object} ExposedFormData
+		 * @property {Object} formatForm Format后的表单数据
+		 *
+		 *
+		 * 提交数据处理函数
+		 * @param {ExposedFormData} data
+		 * @return {Boolean|Object} return false会阻止提交操作，return Object会替换提交的数据
+		 *
+		 */
+		beforeSubmit: { type: Function, default: null },
+	},
+	emits: [
+		/**
+		 * @event click
+		 * @param {Event} event 完结事件
+		 */
+		"finish",
+	],
+
+	setup(props, { emit }) {
+		const state = reactive({
+			currentStep: "intro",
+			formChapters: [], //二维数组，按章节存储
+			currentChapter: 0, //当前章节
+		})
+
+		const isLastChapter = computed(() => state.currentChapter === state.formChapters.length)
+		const progress = computed(() => (!state.formChapters.length ? 0 : (state.currentChapter / state.formChapters.length) * 100))
+
+		// 将 props.formItems 按 break 划分成章节
+		const prepareFormItems = () => {
+			let chapter = [] //存储章节的数组
+			const formItems = cloneDeep(props.formItems)
+			for (let i = 0; i < formItems.length; i += 1) {
+				const item = formItems[i] // 这个是用于渲染的配置
+				item.defaultSlots = {
+					label: () => (
+						<span style={{ marginBottom: "10px" }}>
+							{i + 1}.{item.title}
+						</span>
+					),
+				}
+				if (item.break) {
+					if (chapter.length) {
+						state.formChapters.push(chapter)
+					}
+					delete item.break
+					chapter = [item]
+				} else {
+					chapter.push(item)
+				}
+
+				if (i === formItems.length - 1) {
+					state.formChapters.push(chapter)
+				}
+			}
+		}
+
+		watch(
+			() => props.formItems,
+			() => {
+				prepareFormItems()
+				nextTick(() => {
+					if (props.startChapter) {
+						state.currentChapter = Math.min(props.startChapter - 1, state.formChapters.length - 1)
+					}
+				})
+			},
+			{ immediate: true },
+		)
+
+		const onBeforeSubmit = ({ formatForm }) => {
+			let data = { slug: props.slug, answers: formatForm }
+			if (props.beforeSubmit) {
+				return props.beforeSubmit(data)
+			}
+			return data
+		}
+
+		const onAfterSubmit = (res) => {
+			useProcessStatusSuccess(res, () => {
+				state.currentChapter += 1
+				if (state.currentChapter === state.formChapters.length) {
+					state.currentStep = "outro"
+				}
+			})
+		}
+
+		const onFinish = () => {
+			emit("finish")
+		}
+
+		const progressElem = () => {
+			return state.formChapters.length <= 1 || state.currentStep !== "form" ? null : (
+				<div class={`ex-survey__progress`}>
+					<Progress showPivot={false} percentage={progress.value}></Progress>
+				</div>
+			)
+		}
+
+		const introElem = () =>
+			(props.title || props.intro) && state.currentStep === "intro" ? (
+				<div class={`ex-survey__intro`}>
+					{props.title ? <div class={`ex-survey__title`}>{props.title}</div> : null}
+					{props.intro || null}
+					<ExButton type={"primary"} class={"ex-survey__start-btn"} onClick={() => (state.currentStep = "form")}>
+						{() => "开始"}
+					</ExButton>
+				</div>
+			) : null
+
+		const outroElem = () =>
+			props.intro && state.currentStep === "outro" ? (
+				<div class={`ex-survey__outro`}>
+					{props.outro || "谢谢您的参与，祝您有美好的一天！"}
+					<ExButton type={"primary"} class={"ex-survey__finish-btn"} onClick={onFinish}>
+						{() => "完成"}
+					</ExButton>
+				</div>
+			) : null
+
+		const formElem = () => {
+			return state.currentStep === "form" ? (
+				<div class={`ex-survey__form`}>
+					<ExForm
+						form={state.formChapters[state.currentChapter]}
+						labelWidth={"100%"}
+						fixed={true}
+						submitUrl={props.submitUrl}
+						closable={!isLastChapter.value && state.currentChapter !== 0}
+						close={() => (state.currentChapter -= 1)}
+						cancelButtonText={"上一步"}
+						submitButtonText={"确定"}
+						beforeSubmit={onBeforeSubmit}
+						afterSubmit={onAfterSubmit}
+					></ExForm>
+				</div>
+			) : null
+		}
+
+		return () => <div class={`ex-survey`}>{[introElem(), progressElem(), formElem(), outroElem()]}</div>
+	},
+})

package/business-components/survey/index.js

@@ -1,5 +1,5 @@
-import _ExSurvey from "./ExSurvey.jsx"
-import withInstall from "../../utils/withInstall"
-
-export const ExSurvey = withInstall(_ExSurvey)
-export default ExSurvey
+import _ExSurvey from "./ExSurvey.jsx"
+import withInstall from "../../utils/withInstall"
+
+export const ExSurvey = withInstall(_ExSurvey)
+export default ExSurvey

package/business-components/survey/index.less

@@ -1,37 +1,37 @@
-.ex-survey {
-    .ex-survey__progress {
-        position: fixed;
-        top: 0;
-        left: 0;
-        right: 0;
-    }
-
-    .ex-survey__order {
-        font-weight: bold;
-    }
-
-
-    .ex-survey__intro, .ex-survey__outro {
-        background: #FFF;
-        font-size: var(--van-font-size-md);
-        margin: var(--van-padding-md);
-        padding: 48px var(--van-padding-md);
-        border-radius: var(--van-radius-lg, 8px);
-
-        .ex-survey__title {
-            text-align: center;
-            font-size: var(--van-font-size-lg);
-            font-weight: bold;
-            margin-bottom: 48px;
-        }
-
-        .ex-survey__start-btn, .ex-survey__finish-btn {
-            margin-top: var(--van-padding-xl);
-        }
-    }
-
-    .ex-survey__form {
-        margin-top: 5px;
-        margin-bottom: 100px;
-    }
+.ex-survey {
+    .ex-survey__progress {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+    }
+
+    .ex-survey__order {
+        font-weight: bold;
+    }
+
+
+    .ex-survey__intro, .ex-survey__outro {
+        background: #FFF;
+        font-size: var(--van-font-size-md);
+        margin: var(--van-padding-md);
+        padding: 48px var(--van-padding-md);
+        border-radius: var(--van-radius-lg, 8px);
+
+        .ex-survey__title {
+            text-align: center;
+            font-size: var(--van-font-size-lg);
+            font-weight: bold;
+            margin-bottom: 48px;
+        }
+
+        .ex-survey__start-btn, .ex-survey__finish-btn {
+            margin-top: var(--van-padding-xl);
+        }
+    }
+
+    .ex-survey__form {
+        margin-top: 5px;
+        margin-bottom: 100px;
+    }
 }