Commit facc10aa authored by wangy's avatar wangy

isread

parent cc81a88b
...@@ -805,20 +805,8 @@ textarea{ ...@@ -805,20 +805,8 @@ textarea{
display: none !important; display: none !important;
} }
.control .rs_remove{
display: none;
position:absolute;
right:1px;top:1px;
width:15px;height:15px;
overflow:hidden;
cursor:pointer;
background:url('../img/delModel.svg') no-repeat 0px 0px;
background-size: 100% 100%;
background-color: #fff;
}
.control.cur .ui-resizable-handle, .control.cur .ui-resizable-handle{
.control.cur .rs_remove{
display: block !important; display: block !important;
} }
.control .ui-resizable-s { .control .ui-resizable-s {
...@@ -2493,9 +2481,9 @@ textarea{ ...@@ -2493,9 +2481,9 @@ textarea{
cursor: crosshair; cursor: crosshair;
} }
/* .control.crosshair:hover .commonCircle{ */ /* .control.crosshair:hover .commonCircle{ */
.control:hover .commonCircle{ /* .control:hover .commonCircle{
display: block; display: block;
} } */
/*上圆圈*/ /*上圆圈*/
.topCircle{ .topCircle{
left: 0; left: 0;
......
This diff is collapsed.
...@@ -4061,9 +4061,7 @@ ...@@ -4061,9 +4061,7 @@
<input <input
type="{{= item.inputInfoDTO.type}}" type="{{= item.inputInfoDTO.type}}"
data-type="{{= item.source}}" data-type="{{= item.source}}"
{{? item.inputInfoDTO.state === 'disabled' }}
disabled disabled
{{? }}
class="attr-table-inp {{= item.operation}}" class="attr-table-inp {{= item.operation}}"
value="{{= it.control[item.source]}}" value="{{= it.control[item.source]}}"
placeholder="{{= item.inputInfoDTO.placeholder}}" placeholder="{{= item.inputInfoDTO.placeholder}}"
...@@ -4084,16 +4082,12 @@ ...@@ -4084,16 +4082,12 @@
<select name="" <select name=""
class="form-control form-control-select" class="form-control form-control-select"
data-type="{{= item.source}}" data-type="{{= item.source}}"
{{? item.inputInfoDTO.state === 'disabled' }}
disabled disabled
{{? }}
value="{{= it.control[item.source]}}" value="{{= it.control[item.source]}}"
> >
{{~item.optionalValueDTOs :subitem:subindex }} {{~item.optionalValueDTOs :subitem:subindex }}
<option <option
{{? item.inputInfoDTO.state === 'disabled' }}
disabled disabled
{{? }}
{{? it.control[item.source] === subitem.value }} {{? it.control[item.source] === subitem.value }}
selected selected
{{? }} {{? }}
...@@ -4112,9 +4106,7 @@ ...@@ -4112,9 +4106,7 @@
<div class="clamp"> <div class="clamp">
<textarea <textarea
data-type="{{= item.source}}" data-type="{{= item.source}}"
{{? item.inputInfoDTO.state === 'disabled' }}
disabled disabled
{{? }}
>{{= it.control[item.source]}}</textarea> >{{= it.control[item.source]}}</textarea>
</div> </div>
</td> </td>
...@@ -4125,9 +4117,7 @@ ...@@ -4125,9 +4117,7 @@
<td><div class="clamp">{{= item.name}} :</div></td> <td><div class="clamp">{{= item.name}} :</div></td>
<td><div class="clamp"> <td><div class="clamp">
<input <input
{{? item.inputInfoDTO.state === 'disabled' }}
disabled disabled
{{? }}
type="file" class="attr-table-inp" data-type="index" value=""></div> type="file" class="attr-table-inp" data-type="index" value=""></div>
</td> </td>
</tr> </tr>
...@@ -4139,9 +4129,7 @@ ...@@ -4139,9 +4129,7 @@
<div class="clamp"> <div class="clamp">
{{~item.optionalValueDTOs :subitem:subindex }} {{~item.optionalValueDTOs :subitem:subindex }}
<input <input
{{? subitem.state === 'disabled' }}
disabled disabled
{{? }}
type="radio" name="{{= item.id}}" class="attr-table-radio" data-type="" value=""> type="radio" name="{{= item.id}}" class="attr-table-radio" data-type="" value="">
<label for="huey" value="{{= subitem.value}}">{{= subitem.label}}</label> <label for="huey" value="{{= subitem.value}}">{{= subitem.label}}</label>
{{~}} {{~}}
...@@ -4278,18 +4266,14 @@ ...@@ -4278,18 +4266,14 @@
data-type='time' data-type='time'
class='form-control attr-table-inp' class='form-control attr-table-inp'
style='margin-right:10px' style='margin-right:10px'
{{? it.data.inputInfoDTO.state === 'disabled' }}
disabled disabled
{{? }}
value="{{= it.control['time']}}" value="{{= it.control['time']}}"
/> />
<select <select
value="{{= it.control['timeType']}}" value="{{= it.control['timeType']}}"
class="form-control form-control-select" class="form-control form-control-select"
data-type="timeType" data-type="timeType"
{{? it.data.inputInfoDTO.state === 'disabled' }}
disabled disabled
{{? }}
> >
<option <option
{{? it.control['timeType'] ==='day' }}selected{{? }} {{? it.control['timeType'] ==='day' }}selected{{? }}
......
...@@ -234,12 +234,12 @@ function getProcessJson (type) { ...@@ -234,12 +234,12 @@ function getProcessJson (type) {
if (getCookie('storeChangeState') === 'publish' || getParam("isReadAttr") === 'true') { if (getCookie('storeChangeState') === 'publish' || getParam("isReadAttr") === 'true') {
let processInfo = JSON.parse(sessionStorage.getItem('processInfo')) let processInfo = JSON.parse(sessionStorage.getItem('processInfo'))
if (!!processInfo && !!processInfo.type) { if (!!processInfo && !!processInfo.type) {
basFlow.isReadAttr = true basFlow.isReadAttr = 'true'
basFlow.isUpDownProcess = false basFlow.isUpDownProcess = false
basFlow.initData(processInfo.json, type); basFlow.initData(processInfo.json, type);
return return
} }
basFlow.isReadAttr = false basFlow.isReadAttr = 'true'
jq.ajax({ jq.ajax({
type: "POST", type: "POST",
url: basFlow.baseUrl + "/listhistory/getLast/" + basFlow.id + '?username=' + basFlow.username, url: basFlow.baseUrl + "/listhistory/getLast/" + basFlow.id + '?username=' + basFlow.username,
...@@ -282,7 +282,7 @@ function getProcessJson (type) { ...@@ -282,7 +282,7 @@ function getProcessJson (type) {
} }
}) })
} else { } else {
basFlow.isReadAttr = false basFlow.isReadAttr = 'true'
showLoading() showLoading()
jq.ajax({ jq.ajax({
type: "POST", type: "POST",
...@@ -8030,6 +8030,7 @@ jq("body").on("click", ".allocation", function () { ...@@ -8030,6 +8030,7 @@ jq("body").on("click", ".allocation", function () {
jq('body').append('<div id="allocation" style="display: none;"/>') jq('body').append('<div id="allocation" style="display: none;"/>')
window.releateEle.renderReleateEleDialog('#allocation'); window.releateEle.renderReleateEleDialog('#allocation');
} else if (relatedEleFlag) { } else if (relatedEleFlag) {
console.log(jq(this).parents('.control').attr('id'))
basFlow.viewRelatedEle(jq(this).parents('.control').attr('id')) basFlow.viewRelatedEle(jq(this).parents('.control').attr('id'))
} else if (!!it.processGroup && it.processGroup.length > 0) { } else if (!!it.processGroup && it.processGroup.length > 0) {
openReferenceFlow(jq(this).parents('.control').attr('id'), 'click') openReferenceFlow(jq(this).parents('.control').attr('id'), 'click')
......
...@@ -204,10 +204,10 @@ var basFlow = jq('#basGooFlow').createGooFlow({ ...@@ -204,10 +204,10 @@ var basFlow = jq('#basGooFlow').createGooFlow({
swimBgMember: getCookie('qiehuanbgimg'), swimBgMember: getCookie('qiehuanbgimg'),
// 是否编辑模式 // 是否编辑模式
isEdit: getParamUrl("isReadAttr") !== 'true' ? (getCookie('storeChangeState') === 'publish' ? false : true) : false, isEdit: false,
// 是否查看节点属性 // 是否查看节点属性
isReadAttr: getParamUrl("isReadAttr") !== 'true' ? (getCookie('storeChangeState') === 'publish' ? true : false) : true isReadAttr: 'true'
}); });
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
let urlRes = '/bpabpmapi'; let urlRes = '/bpabpmapi';
let htmlUrl = '/jcybpm'; let htmlUrl = '/jcybpm';
if(window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1' || window.location.hostname === '0.0.0.0'){ if(window.location.hostname === 'localhost' || window.location.hostname === '127.0.0.1' || window.location.hostname === '0.0.0.0'){
urlRes = 'http://test2.jiucaiyun.cn/bpabpmdev3api' urlRes = 'http://huawei6.jiucaiyun.cn/hangtianpocapi/'
htmlUrl = 'http://test2.jiucaiyun.cn/jcybpmdev3' htmlUrl = 'http://test2.jiucaiyun.cn/jcybpmdev3'
// urlRes = 'http://test1.jiucaiyun.cn/bpabpmtest2api' // urlRes = 'http://test1.jiucaiyun.cn/bpabpmtest2api'
// htmlUrl = 'http://test1.jiucaiyun.cn/jcybpmtest2' // htmlUrl = 'http://test1.jiucaiyun.cn/jcybpmtest2'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment