Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
68e057fd
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
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,发现更多精彩内容 >>
提交
68e057fd
编写于
8月 24, 2021
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修复某些情况下数据表格中的组件不能获取parentLine对象的问题
上级
79139241
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
58 addition
and
9 deletion
+58
-9
o2web/source/x_component_cms_FormDesigner/Module/Combox/combox.html
...ce/x_component_cms_FormDesigner/Module/Combox/combox.html
+7
-0
o2web/source/x_component_process_FormDesigner/Module/Combox/combox.html
..._component_process_FormDesigner/Module/Combox/combox.html
+7
-0
o2web/source/x_component_process_FormDesigner/lp/en.js
o2web/source/x_component_process_FormDesigner/lp/en.js
+4
-1
o2web/source/x_component_process_FormDesigner/lp/zh-cn.js
o2web/source/x_component_process_FormDesigner/lp/zh-cn.js
+4
-2
o2web/source/x_component_process_Xform/$Module.js
o2web/source/x_component_process_Xform/$Module.js
+17
-0
o2web/source/x_component_process_Xform/Combox.js
o2web/source/x_component_process_Xform/Combox.js
+1
-0
o2web/source/x_component_process_Xform/DatatablePC.js
o2web/source/x_component_process_Xform/DatatablePC.js
+9
-3
o2web/source/x_component_process_Xform/Datatemplate.js
o2web/source/x_component_process_Xform/Datatemplate.js
+9
-3
未找到文件。
o2web/source/x_component_cms_FormDesigner/Module/Combox/combox.html
浏览文件 @
68e057fd
...
...
@@ -32,6 +32,13 @@
<td
class=
"editTableTitle"
>
{{$.lp.canSelectCount}}:
</td>
<td
class=
"editTableValue"
><input
title=
"0 表示不限制数量"
type=
"text"
name=
"count"
value=
"text{$.count}"
class=
"editTableInput"
/></td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
{{$.lp.showOptions}}:
</td>
<td
class=
"editTableValue"
>
<input
type=
"radio"
name=
"showOptions"
value=
"input"
text
{($.
showOptions
)!="
focus
"?'
checked
'
:
''}
/>
{{$.lp.onInput}}
<input
type=
"radio"
name=
"showOptions"
value=
"focus"
text
{($
.showOptions)=
="focus"?'checked':''}/
>
{{$.lp.onFocus}}
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
{{$.lp.options}}:
</td>
<td
class=
"editTableValue"
>
...
...
o2web/source/x_component_process_FormDesigner/Module/Combox/combox.html
浏览文件 @
68e057fd
...
...
@@ -32,6 +32,13 @@
<td
class=
"editTableTitle"
>
{{$.lp.canSelectCount}}:
</td>
<td
class=
"editTableValue"
><input
title=
"0 表示不限制数量"
type=
"text"
name=
"count"
value=
"text{$.count}"
class=
"editTableInput"
/></td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
{{$.lp.showOptions}}:
</td>
<td
class=
"editTableValue"
>
<input
type=
"radio"
name=
"showOptions"
value=
"input"
text
{($.
showOptions
)!="
focus
"?'
checked
'
:
''}
/>
{{$.lp.onInput}}
<input
type=
"radio"
name=
"showOptions"
value=
"focus"
text
{($
.showOptions)=
="focus"?'checked':''}/
>
{{$.lp.onFocus}}
</td>
</tr>
<tr>
<td
class=
"editTableTitle"
>
{{$.lp.options}}:
</td>
<td
class=
"editTableValue"
>
...
...
o2web/source/x_component_process_FormDesigner/lp/en.js
浏览文件 @
68e057fd
...
...
@@ -1043,7 +1043,10 @@ MWF.xApplication.process.FormDesigner.LP = {
"
resizeVertical
"
:
"
vertical
"
,
"
el_placement
"
:
"
placement
"
,
"
popperClass
"
:
"
Popper Class
"
,
"
triggerOnFocus
"
:
"
trigger on focus
"
"
triggerOnFocus
"
:
"
trigger on focus
"
,
"
showOptions
"
:
"
Show Options
"
,
"
onInput
"
:
"
When inputting
"
,
"
onFocus
"
:
"
On Click
"
},
"
actionBar
"
:
{
"
close
"
:
"
Close
"
,
...
...
o2web/source/x_component_process_FormDesigner/lp/zh-cn.js
浏览文件 @
68e057fd
...
...
@@ -1050,8 +1050,10 @@ MWF.xApplication.process.FormDesigner.LP = {
"
resizeVertical
"
:
"
纵向
"
,
"
el_placement
"
:
"
弹出位置
"
,
"
popperClass
"
:
"
列表类名
"
,
"
triggerOnFocus
"
:
"
激活即列出输入建议
"
"
triggerOnFocus
"
:
"
激活即列出输入建议
"
,
"
showOptions
"
:
"
显示选项
"
,
"
onInput
"
:
"
输入时
"
,
"
onFocus
"
:
"
点击时
"
},
"
actionBar
"
:
{
"
close
"
:
"
关闭
"
,
...
...
o2web/source/x_component_process_Xform/$Module.js
浏览文件 @
68e057fd
...
...
@@ -59,6 +59,23 @@ MWF.xApplication.process.Xform.$Module = MWF.APP$Module = new Class(
* var container = form.container; //获取表单容器
*/
this
.
form
=
form
;
/**
* 当组件在数据表格或者数据模板中时,可以通过此属性获取所在行(条目)对象.
* @member {MWF.xApplication.process.Xform.Datatemplate.Line|MWF.xApplication.process.Xform.DatatablePC.Line|MWF.xApplication.process.Xform.DatatableMobile.Line}
* @example
* //获取组件所在数据模板/数据表格的行(条目)对象
* var line = this.form.get("fieldId").parentLine;
* //获取当前字段所在行下标
* var index = line.getIndex();
* //获取当前字段所在条目的subject字段的值
* var data = line.getModule("subject").getData();
* //设置当前字段所在条目的subject字段的值
* line.getModule("subject").setData("test1");
*/
this
.
parentLine
=
null
;
},
_getSource
:
function
(){
var
parent
=
this
.
node
.
getParent
();
...
...
o2web/source/x_component_process_Xform/Combox.js
浏览文件 @
68e057fd
...
...
@@ -63,6 +63,7 @@ MWF.xApplication.process.Xform.Combox = MWF.APPCombox = new Class(
"
count
"
:
this
.
json
.
count
.
toInt
()
||
0
,
"
splitStr
"
:
this
.
json
.
splitStr
||
"
,
\\
s*|;
\\
s*|,
\\
s*|;
\\
s*
"
,
"
splitShow
"
:
this
.
json
.
splitShow
||
"
,
"
,
"
focusList
"
:
this
.
json
.
showOptions
===
"
focus
"
,
"
list
"
:
this
.
getOptions
(),
"
onCommitInput
"
:
function
(
item
){
this
.
fireEvent
(
"
commitInput
"
);
...
...
o2web/source/x_component_process_Xform/DatatablePC.js
浏览文件 @
68e057fd
...
...
@@ -1356,9 +1356,12 @@ MWF.xApplication.process.Xform.DatatablePC.Line = new Class({
var
hasData
=
this
.
data
.
hasOwnProperty
(
templateJsonId
);
var
module
=
this
.
form
.
_loadModule
(
json
,
node
,
function
()
{});
module
.
parentLine
=
this
;
module
.
parentDatatable
=
this
.
datatable
;
var
module
=
this
.
form
.
_loadModule
(
json
,
node
,
function
()
{
this
.
parentLine
=
_self
;
this
.
parentDatatable
=
_self
.
datatable
;
});
if
(
!
module
.
parentLine
)
module
.
parentLine
=
this
;
if
(
!
module
.
parentDatatable
)
module
.
parentDatatable
=
this
.
datatable
;
if
((
json
.
type
===
"
Attachment
"
||
json
.
type
===
"
AttachmentDg
"
)){
module
.
addEvent
(
"
change
"
,
function
(){
...
...
@@ -1402,6 +1405,9 @@ MWF.xApplication.process.Xform.DatatablePC.Line = new Class({
}
}.
bind
(
this
));
},
getIndex
:
function
(){
return
this
.
options
.
index
;
},
getModule
:
function
(
templateJsonId
){
return
this
.
all_templateId
[
templateJsonId
];
},
...
...
o2web/source/x_component_process_Xform/Datatemplate.js
浏览文件 @
68e057fd
...
...
@@ -1070,9 +1070,12 @@ MWF.xApplication.process.Xform.Datatemplate.Line = new Class({
if
(
this
.
form
.
all
[
id
])
this
.
form
.
all
[
id
]
=
null
;
if
(
this
.
form
.
forms
[
id
])
this
.
form
.
forms
[
id
]
=
null
;
var
module
=
this
.
form
.
_loadModule
(
json
,
node
,
function
()
{});
module
.
parentLine
=
this
;
module
.
parentDatatemplate
=
this
.
template
;
var
module
=
this
.
form
.
_loadModule
(
json
,
node
,
function
()
{
this
.
parentLine
=
_self
;
this
.
parentDatatemplate
=
_self
.
template
;
});
if
(
!
module
.
parentLine
)
module
.
parentLine
=
this
;
if
(
!
module
.
parentDatatemplate
)
module
.
parentDatatemplate
=
this
.
template
;
if
(
json
.
type
===
"
Attachment
"
||
json
.
type
===
"
AttachmentDg
"
){
module
.
addEvent
(
"
change
"
,
function
(){
...
...
@@ -1116,6 +1119,9 @@ MWF.xApplication.process.Xform.Datatemplate.Line = new Class({
module
.
_setSubDatatemplateOuterEvents
();
})
},
getIndex
:
function
(){
return
this
.
options
.
index
;
},
getModule
:
function
(
templateJsonId
){
return
this
.
all_templateId
[
templateJsonId
];
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录