From 3dca9da9042b968a930972e0fb948043dabce233 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Wed, 6 Dec 2023 16:19:05 +0800
Subject: [PATCH] hotfix/2.9.9.2312.01

---
 pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less  | 6 ++++++
 .../hrmSalary/pages/payrollRelease/components/conditions.js | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
index b1ad3bcc..7eae1948 100644
--- a/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
+++ b/pc4mobx/hrmSalary/pages/payroll/templatePreview/index.less
@@ -47,6 +47,12 @@
     box-shadow: rgba(214, 214, 214, 0.5) 0px 0px 14px 0px;
     border: 3px solid #fff;
 
+    .sobItemDiv {
+      width: 100%;
+      white-space: pre-wrap;
+      word-break: break-all;
+    }
+
     .background-wrapper {
       height: 200px;
       margin: 10px;
diff --git a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
index 21b05a8e..5fec5c74 100644
--- a/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
+++ b/pc4mobx/hrmSalary/pages/payrollRelease/components/conditions.js
@@ -245,7 +245,7 @@ export const tempNormalSetConditions = [
       },
       {
         colSpan: 1,
-        conditionType: "INPUT",
+        conditionType: "TEXTAREA",
         domkey: ["textContent"],
         fieldcol: 14,
         label: "文本内容",