From fd6527aa3867427a14a137080a1b02b452978475 Mon Sep 17 00:00:00 2001
From: ZF sun <34314687@qq.com>
Date: Tue, 9 Jun 2026 09:50:27 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=BF=81=E7=A7=BBns-newform?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=88=B0=E6=A0=87=E5=87=86components?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=B9=B6=E6=9B=B4=E6=96=B0=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 将ns-newform组件从pages_tool/_components移动到项目标准components目录
2. 更新所有文件中对该组件的导入路径和文档引用
3. 优化diy-form组件的表单数据处理逻辑，兼容更多数据格式
---
 components-diy/diy-form.vue                   | 18 ++++++++-----
 .../ns-newform/ns-newform.vue                 | 27 +++++++++++++------
 docs/components_usage_documentation.md        |  4 +--
 pages_tool/form/formdata.vue                  |  2 +-
 4 files changed, 33 insertions(+), 18 deletions(-)
 rename {pages_tool/_components => components}/ns-newform/ns-newform.vue (94%)

diff --git a/components-diy/diy-form.vue b/components-diy/diy-form.vue
index 139f349..cc7b6c7 100644
--- a/components-diy/diy-form.vue
+++ b/components-diy/diy-form.vue
@@ -17,7 +17,7 @@
 			:labelColor="value.label_color"
 			:requiredColor="value.required_color"
 			ref="nsNewform"
-		/>
+		></ns-newform>
 		<!-- 提交按钮 -->
 		<view @click.stop="submitForm" class="fui-btn btn-danger block mtop">提交信息</view>
 	</view>
@@ -26,7 +26,7 @@
 <script>
 // 自定义表单
 import DiyMinx from './minx.js'
-import NsNewform from '../pages_tool/_components/ns-newform/ns-newform.vue'
+import NsNewform from '@/components/ns-newform/ns-newform.vue'
 
 export default {
 	name: 'diy-from',
@@ -46,7 +46,7 @@ export default {
 		this.initForm();
 	},
 	watch: {
-		'value.formComponents': {
+		'value': {
 			deep: true,
 			handler() {
 				this.initForm();
@@ -72,13 +72,17 @@ export default {
 	methods: {
 		// 初始化表单 - 将 diy-form 的数据格式转换成 ns-newform 的格式
 		initForm() {
-			var components = this.value.formComponents || [];
+			if (!this.value) {
+				this.formComponents = [];
+				return;
+			}
+			var components = this.value.formComponents || this.value.form_components || [];
 			// 转换格式：type -> controller
-			this.formComponents = components.map(function(item) {
+			this.formComponents = (components || []).map(function(item) {
 				return {
 					controller: item.type,
-					value: item.value,
-					val: item.value.default || '' // 添加初始值
+					value: item.value || {},
+					val: (item.value && item.value.default) ? item.value.default : '' // 添加初始值
 				};
 			});
 		},
diff --git a/pages_tool/_components/ns-newform/ns-newform.vue b/components/ns-newform/ns-newform.vue
similarity index 94%
rename from pages_tool/_components/ns-newform/ns-newform.vue
rename to components/ns-newform/ns-newform.vue
index 844cf0b..c9fa13d 100644
--- a/pages_tool/_components/ns-newform/ns-newform.vue
+++ b/components/ns-newform/ns-newform.vue
@@ -279,11 +279,11 @@
 
 <script>
 export default {
-	name: 'ns-form',
+	name: 'ns-newform',
 	props: {
 		data: {
 			type: Array,
-			default: () => ({})
+			default: () => []
 		},
 		customAttr: {
 			type: Object,
@@ -292,12 +292,12 @@ export default {
 		mode: {
 			type: String,
 			default: 'horizontal',
-			validator: (value) => ['horizontal', 'vertical'].includes(value)
+			validator: (value) => !value || ['horizontal', 'vertical'].includes(value)
 		},
 		labelWidthMode: {
 			type: String,
 			default: 'auto',
-			validator: (value) => ['auto', 'fixed'].includes(value)
+			validator: (value) => !value || ['auto', 'fixed'].includes(value)
 		},
 		labelFixedWidth: {
 			type: [String, Number],
@@ -318,12 +318,13 @@ export default {
 	},
 	data() {
 		return {
-			formData: this.data,
+			formData: [],
 			maxLabelWidth: 0
 		}
 	},
 	created() {
-		this.setFormData();
+		// 避免直接修改 prop，初始化本地数据
+		this.initFormData();
 	},
 	mounted() {
 		this.$nextTick(() => {
@@ -333,7 +334,7 @@ export default {
 	watch: {
 		data: {
 			handler() {
-				this.setFormData();
+				this.initFormData();
 				this.$nextTick(() => {
 					this.calculateMaxLabelWidth();
 				});
@@ -404,8 +405,18 @@ export default {
 			this.maxLabelWidth = maxWidth;
 		},
 		
+		initFormData() {
+			// 深拷贝 prop 数据到本地状态
+			this.formData = JSON.parse(JSON.stringify(this.data || []));
+			this.processFormData();
+		},
+		
 		setFormData() {
-			this.formData = this.data;
+			// 重置为初始值
+			this.initFormData();
+		},
+		
+		processFormData() {
 			this.formData.forEach((item) => {
 				if (!item.val) {
 					item.val = item.value.default ? item.value.default : '';
diff --git a/docs/components_usage_documentation.md b/docs/components_usage_documentation.md
index 1a1ad65..bef253f 100644
--- a/docs/components_usage_documentation.md
+++ b/docs/components_usage_documentation.md
@@ -500,7 +500,7 @@
 - pages_goods/detail.vue
 - pages_order/_components/common-payment/common-payment.vue
 - pages_tool/form/form.vue
-- pages_tool/_components/ns-newform/ns-newform.vue
+- components/ns-newform/ns-newform.vue
 - components/ns-goods-sku/ns-goods-sku.vue
 - common/css/order_parment.scss
 
@@ -553,7 +553,7 @@
 **引用情况**：
 - pages_tool/member/info_edit.vue
 - pages_tool/member/address_edit.vue
-- pages_tool/_components/ns-newform/ns-newform.vue
+- components/ns-newform/ns-newform.vue
 - components/ns-form/ns-form.vue
 
 ### 2.19 ns-navbar 组件（6次引用）
diff --git a/pages_tool/form/formdata.vue b/pages_tool/form/formdata.vue
index 4799996..7e190c7 100644
--- a/pages_tool/form/formdata.vue
+++ b/pages_tool/form/formdata.vue
@@ -25,7 +25,7 @@
 
 <script>
 
-import nsNewform from '../_components/ns-newform/ns-newform.vue';
+import nsNewform from '@/components/ns-newform/ns-newform.vue';
 
 export default {
 	components: {