From f501ab196908604fe08f23b3ef822a9526f910b3 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 9 Oct 2025 13:27:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=BE=E6=8E=A5=E7=BC=A9=E8=BF=9B=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=AE=E5=A4=8D,=E9=93=BE=E6=8E=A5=E7=94=B5?=
 =?UTF-8?q?=E8=84=91=E7=AB=AF=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85=E6=97=B6?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=AE=BF=E9=97=AEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DesignForm/assembly/index.ts   |  5 +--
 .../DesignForm/public/form/formItem.vue       |  4 +--
 src/widget/number/index.vue                   | 27 +++++++++++++---
 src/widget/urllink/index.vue                  | 31 ++++++++++++++++---
 4 files changed, 52 insertions(+), 15 deletions(-)

diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts
index 65a19c1..ced14d3 100644
--- a/src/components/DesignForm/assembly/index.ts
+++ b/src/components/DesignForm/assembly/index.ts
@@ -1027,10 +1027,7 @@ export default [
 				},
 				styles: {
 					divStyle: {
-						marginBot: "15",
-						divbox: "all",
-						transparency: 100,
-						paddingLeft: "7"
+						marginBot: "15"
 					},
 					labelStyle: {
 						paddingLeft: "7",
diff --git a/src/components/DesignForm/public/form/formItem.vue b/src/components/DesignForm/public/form/formItem.vue
index 77f405f..bec899b 100644
--- a/src/components/DesignForm/public/form/formItem.vue
+++ b/src/components/DesignForm/public/form/formItem.vue
@@ -1059,7 +1059,7 @@ const diGuiJilian = (val: any, options: any[]) => {
     :tablekey="props.tablekey"
     :numrun="props.numrun"
   />
-
+  <!-- 编码 -->
   <SerialNumber
     v-else-if="judgeIsShow(data.name) && data.type === 'serialNumber'"
     :data="data"
@@ -1118,7 +1118,7 @@ const diGuiJilian = (val: any, options: any[]) => {
   />
 
   <UrlLink
-    v-else-if="judgeIsShow(data.name) && data.type === 'urllink' && type != 4"
+    v-else-if="judgeIsShow(data.name) && data.type === 'urllink'"
     :data="data"
   />
 
diff --git a/src/widget/number/index.vue b/src/widget/number/index.vue
index 23f8b94..5deff1b 100644
--- a/src/widget/number/index.vue
+++ b/src/widget/number/index.vue
@@ -10,6 +10,7 @@ import {
   constGetControlByName,
 } from "@/api/DesignForm/utils";
 import validate from "@/api/DesignForm/validate";
+import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo'
 import { useRoute } from "vue-router";
 import { FormItem, FormList } from "@/api/DesignForm/types";
 import { gainNumber } from "@/api/DesignForm/requestapi";
@@ -186,6 +187,17 @@ const formatCustomRules = () => {
   });
   return temp;
 };
+
+const getFormItemLableStyle = (ele: any) => {
+    if(ele?.labelStyle){
+    //   console.log("返回栅格宽度3",AnalysisCss(ele?.labelStyle))
+      return AnalysisCss(ele?.labelStyle)
+    }
+}
+//组件css部分
+const configStyle = computed(() => {
+    return props.data.styles || {}
+})
 </script>
 <template>
   <el-form-item
@@ -196,15 +208,20 @@ const formatCustomRules = () => {
     :label="getLabel(data.item as FormItem)"
   >
     <template v-if="config.help" #label>
-      {{ getLabel(data.item) }}
+      <span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
+      <!-- {{ getLabel(data.item) }} -->
       <Tooltips :content="config.help" />
     </template>
-    <div v-if="type === 4" class="form-value" v-html="value"></div>
-    <template v-else>
-      <el-input v-model="value" :disabled="editDisabled" placeholder="请输入编码" clearable >
+
+    <template v-else #label>
+      <span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
+    </template>
+
+
+    <div v-if="type === 4" class="form-value" v-html="value" />
+    <el-input v-else v-model="value" :disabled="editDisabled" placeholder="请输入编码" clearable >
         <template #prefix>NO.</template>
       </el-input>
-    </template>
   </el-form-item>
 </template>
 <style lang="scss" scoped></style>
diff --git a/src/widget/urllink/index.vue b/src/widget/urllink/index.vue
index 569db48..4f98199 100644
--- a/src/widget/urllink/index.vue
+++ b/src/widget/urllink/index.vue
@@ -11,6 +11,7 @@ import {
 import validate from '@/api/DesignForm/validate'
 import { FormItem, FormList } from '@/api/DesignForm/types'
 import Tooltips from '@/components/DesignForm/tooltip.vue'
+import { AnalysisCss,AnalysisInputCss } from '@/components/DesignForm/public/form/calculate/cssInfo'
 const props = withDefaults(
     defineProps<{
 		data: FormList
@@ -156,6 +157,17 @@ const openUrl = () => {
 onMounted(() => {
 	// console.log("编码组件-url--》",props.data)
 })
+
+const getFormItemLableStyle = (ele: any) => {
+    if(ele?.labelStyle){
+    //   console.log("返回栅格宽度3",AnalysisCss(ele?.labelStyle))
+      return AnalysisCss(ele?.labelStyle)
+    }
+}
+//组件css部分
+const configStyle = computed(() => {
+    return props.data.styles || {}
+})
 </script>
 <template>
 	<el-form-item
@@ -166,11 +178,18 @@ onMounted(() => {
 		:label="getLabel(data.item as FormItem)"
 	>
 		<template v-if="config.help" #label >
-			{{ getLabel(data.item) }}
+		<span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
+			
 			<Tooltips :content="config.help" />
 		</template>
-		<div  v-if="type === 4"  class="form-value" v-html="value"></div>
-		<template v-else>
+		<template v-else #label>
+			<span :style="getFormItemLableStyle(configStyle)">{{ getLabel(data.item) }}</span>
+			
+		</template>
+		<!-- <div  v-if="type === 4"  class="form-value" v-html="value"></div> -->
+		
+		<div >
+
 			<el-input v-model="value">
 				<template #prepend>
 					<el-select v-model="urlVal" style="width: 115px">
@@ -180,8 +199,12 @@ onMounted(() => {
 				</template>
 				<template #append><el-button type="warning" @click="openUrl">访问</el-button></template>
 			</el-input>
-		</template>
+		</div>
+
+		
+		
 	</el-form-item>
+	
 </template>
 <style  lang='scss' scoped>