Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
b2752ede
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b2752ede
编写于
9月 27, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复数据网格中多行文本换行显示问题
上级
e8c34932
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
53 addition
and
10 deletion
+53
-10
o2web/source/x_component_process_Xform/DatagridMobile.js
o2web/source/x_component_process_Xform/DatagridMobile.js
+28
-5
o2web/source/x_component_process_Xform/DatagridPC.js
o2web/source/x_component_process_Xform/DatagridPC.js
+25
-5
未找到文件。
o2web/source/x_component_process_Xform/DatagridMobile.js
浏览文件 @
b2752ede
...
...
@@ -157,6 +157,12 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class({
return
value
;
}
break
;
case
"
Textarea
"
:
var
reg
=
new
RegExp
(
"
\n
"
,
"
g
"
);
var
reg2
=
new
RegExp
(
"
\
u003c
"
,
"
g
"
);
//尖括号转义,否则内容会截断
var
reg3
=
new
RegExp
(
"
\
u003e
"
,
"
g
"
);
value
=
value
.
replace
(
reg2
,
"
<
"
).
replace
(
reg3
,
"
>
"
).
replace
(
reg
,
"
<br/>
"
);
break
;
}
}
return
value
;
...
...
@@ -212,10 +218,15 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class({
var
module
=
this
.
editModules
[
index
];
if
(
module
&&
module
.
json
.
type
==
"
ImageClipper
"
){
this
.
_createImage
(
cell
,
module
,
v
)
this
.
_createImage
(
cell
,
module
,
v
)
;
}
else
{
text
=
this
.
_getValueText
(
index
,
v
);
cell
.
set
(
"
text
"
,
text
);
if
(
module
&&
module
.
json
.
type
==
"
Textarea
"
){
cell
.
set
(
"
html
"
,
text
);
}
else
{
cell
.
set
(
"
text
"
,
text
);
}
//cell.set("text", text);
}
...
...
@@ -297,7 +308,12 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class({
this
.
_createImage
(
cell
,
module
,
v
)
}
else
{
text
=
this
.
_getValueText
(
index
,
v
);
cell
.
set
(
"
text
"
,
text
);
if
(
module
&&
module
.
json
.
type
==
"
Textarea
"
){
cell
.
set
(
"
html
"
,
text
);
}
else
{
cell
.
set
(
"
text
"
,
text
);
}
//cell.set("text", text);
}
// if (typeOf(v)==="object"){
...
...
@@ -682,7 +698,14 @@ MWF.xApplication.process.Xform.DatagridMobile = new Class({
if
(
module
.
json
.
type
==
"
ImageClipper
"
){
this
.
_createImage
(
cell
,
module
,
data
.
text
);
}
else
{
cell
.
set
(
"
text
"
,
data
.
text
.
join
(
"
,
"
));
var
text
=
this
.
_getValueText
(
idx
,
data
.
text
.
join
(
"
,
"
));
if
(
module
.
json
.
type
==
"
Textarea
"
){
cell
.
set
(
"
html
"
,
text
);
}
else
{
cell
.
set
(
"
text
"
,
data
.
text
.
join
(
"
,
"
));
}
//cell.set("text", data.text.join(", "));
}
}
else
{
dataRow
=
table
.
insertRow
(
idx
);
...
...
@@ -1466,4 +1489,4 @@ MWF.xApplication.process.Xform.DatagridMobile$Data = new Class({
}.
bind
(
this
));
}
}
});
\ No newline at end of file
});
o2web/source/x_component_process_Xform/DatagridPC.js
浏览文件 @
b2752ede
...
...
@@ -194,6 +194,12 @@ MWF.xApplication.process.Xform.DatagridPC = new Class({
return
value
;
}
break
;
case
"
Textarea
"
:
var
reg
=
new
RegExp
(
"
\n
"
,
"
g
"
);
var
reg2
=
new
RegExp
(
"
\
u003c
"
,
"
g
"
);
//尖括号转义,否则内容会截断
var
reg3
=
new
RegExp
(
"
\
u003e
"
,
"
g
"
);
value
=
value
.
replace
(
reg2
,
"
<
"
).
replace
(
reg3
,
"
>
"
).
replace
(
reg
,
"
<br/>
"
);
break
;
// case "address":
// if (typeOf(value)==="array"){
...
...
@@ -221,7 +227,12 @@ MWF.xApplication.process.Xform.DatagridPC = new Class({
if
(
module
&&
module
.
json
.
type
==
"
ImageClipper
"
){
this
.
_createImage
(
cell
,
module
,
text
)
}
else
{
cell
.
set
(
"
text
"
,
text
);
if
(
module
&&
module
.
json
.
type
==
"
Textarea
"
){
cell
.
set
(
"
html
"
,
text
);
}
else
{
cell
.
set
(
"
text
"
,
text
);
}
// /cell.set("text", text);
}
cell
.
addEvent
(
"
click
"
,
function
(
e
){
this
.
_editLine
(
e
.
target
);
...
...
@@ -460,7 +471,12 @@ MWF.xApplication.process.Xform.DatagridPC = new Class({
if
(
module
.
json
.
type
==
"
ImageClipper
"
){
this
.
_createImage
(
cell
,
module
,
data
.
text
);
}
else
{
cell
.
set
(
"
text
"
,
data
.
text
.
join
(
"
,
"
));
var
text
=
this
.
_getValueText
(
idx
-
1
,
data
.
text
.
join
(
"
,
"
));
if
(
module
.
json
.
type
==
"
Textarea
"
){
cell
.
set
(
"
html
"
,
text
);
}
else
{
cell
.
set
(
"
text
"
,
data
.
text
.
join
(
"
,
"
));
}
}
}
else
{
this
.
_createNewEditTd
(
newTr
,
idx
,
editorTds
[
idx
].
get
(
"
id
"
),
data
.
text
.
join
(
"
,
"
),
titleThs
.
length
-
1
);
...
...
@@ -723,10 +739,14 @@ MWF.xApplication.process.Xform.DatagridPC = new Class({
var
module
=
this
.
editModules
[
index
];
if
(
module
&&
module
.
json
.
type
==
"
ImageClipper
"
){
this
.
_createImage
(
cell
,
module
,
v
)
this
.
_createImage
(
cell
,
module
,
v
)
;
}
else
{
var
text
=
this
.
_getValueText
(
index
,
v
);
cell
.
set
(
"
text
"
,
text
);
if
(
module
&&
module
.
json
.
type
==
"
Textarea
"
){
cell
.
set
(
"
html
"
,
text
);
}
else
{
cell
.
set
(
"
text
"
,
text
);
}
}
...
...
@@ -1252,4 +1272,4 @@ MWF.xApplication.process.Xform.DatagridPC$Data = new Class({
}.
bind
(
this
));
}
}
});
\ No newline at end of file
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录