Skip to content

P
processdesigner-isReadAttr
Commit facc10aa authored by wangy's avatar wangy
Browse files
Options

isread

parent cc81a88b
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 174 deletions
designer/css/basGooFlow.css
View file @ facc10aa
......@@ -805,20 +805,8 @@ textarea{
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 .rs_remove{
.control.cur .ui-resizable-handle{
display: block !important;
}
.control .ui-resizable-s {
......@@ -2493,9 +2481,9 @@ textarea{
cursor: crosshair;
}
/* .control.crosshair:hover .commonCircle{ */
.control:hover .commonCircle{
/* .control:hover .commonCircle{
display: block;
}
} */
/*上圆圈*/
.topCircle{
left: 0;
......
src/designer/GooFlowPro.js
View file @ facc10aa
......@@ -669,7 +669,7 @@ import { showLoading, hideLoading } from './jsComponents/utils/loading'
let processInfo = sessionStorage.getItem('processInfo') ? JSON.parse(sessionStorage.getItem('processInfo')) : {}
// 属性只读
me.isReadAttr = processInfo.isReadAttr === 'true' ? true : me.isReadAttr;
me.isReadAttr = 'true';
// me.isEdit = processInfo.isReadAttr === 'true' ? false : me.isEdit;
......@@ -2478,7 +2478,7 @@ import { showLoading, hideLoading } from './jsComponents/utils/loading'
username: me.username,
processNum: treeInfo.code,
state: treeInfo.state,
isReadAttr: false,
isReadAttr: 'true',
item: treeInfo,
treeData: treeInfo
}
......@@ -2608,7 +2608,7 @@ import { showLoading, hideLoading } from './jsComponents/utils/loading'
roleData.left = 100
roleData.top = 60
roleData.isRelate = false
roleData.isReadAttr = true
roleData.isReadAttr = 'true'
relatedPostControls.push(roleData)
var swimYWidth = 200*(relatedPost.length + 1);
......@@ -2893,7 +2893,7 @@ import { showLoading, hideLoading } from './jsComponents/utils/loading'
var jsonData = { "controls": relatedJsonControls, "lines": relatedJsonLines, "swimlanes": [
{ "height": swimXHeight , "width": 150, "inputDesc": "", "outputDesc": "", "name": "岗位/角色", "type": "swimlaneX", "time": "", "color": "#fff", "depts": [], "input": [], "output": [], "opertBooks": [], "id": "SWIMLANEA91C6B62" },
{ "height": 150, "width": swimYWidth, "name": "阶段", "type": "swimlaneY", "time": "", "color": "#fff", "system": "", "opertBooks": [], "id": "SWIMLANE684EB5BE" }], 'qiehuanbgimg': 'bg_img_white' }
console.log(jsonData)
console.log('jsonDatajsonData',jsonData)
let processTabMenu = JSON.parse(sessionStorage.getItem('processTabMenu')) || []
let parentItem = !sessionStorage.getItem('processInfo') ? {} : JSON.parse(sessionStorage.getItem('processInfo'))
......@@ -4926,6 +4926,7 @@ import { showLoading, hideLoading } from './jsComponents/utils/loading'
// jq(".approval-time-tr").html('审核时间')
}
me.isReadAttr = 'true'
$attrContentBox1.html(me.attrTempl({
attrList: attrList,
listProcess: attrList.processGroup ? (attrList.processGroup.length > 0 ? processlist : []) : [],
......@@ -5690,134 +5691,6 @@ import { showLoading, hideLoading } from './jsComponents/utils/loading'
e.stopPropagation();
});
me.$work.append(me.$textArea);
jq('.GooFlow_workArea').append('<div id="rect" class="moveRect" style="position: absolute; background-color: rgb(195, 213, 237); opacity: 0.6; border: 1px dashed rgb(0, 153, 255); display: none;"></div>');
// jq("#rect").draggable();
jq("#rect").draggable({
// handle: "#rect",
containment: "parent",
// scroll: false
cursor: 'move',
start: function (event, ui) {
me.begintop = Number(jq(this).css("top").replace("px", ""));
me.beginleft = Number(jq(this).css("left").replace("px", ""));
console.log(1111111, me.beginleft, me.begintop)
},
drag: function (event, ui) {
},
stop: function (event, ui) {
var endtop = Number(jq(this).css("top").replace("px", ""));
var endleft = Number(jq(this).css("left").replace("px", ""));
console.log(3333333333, ui.offset, endleft, endtop)
me.rectLines = []
if (window.basFlow.rectItems) {
// // 单独写一个 控制有一个移动到上下游时 就回到拖动前的位置
// // 节点 不能移动到上下游时 #rect 回到拖动前的位置
if (!basFlow.referInnerLine({
left: endleft,
top: endtop
}, null, Number(jq(this).css("height").replace("px", ""))) && getCookie('qiehuanbgimg') === 'bg_img_grid') {
basFlow.alertBox(jq.i18n.prop("addProcessRule") + "! ", 'danger');
jq(this).css({
left: me.beginleft,
top: me.begintop
})
return
}
// let rectFlag = false
// // 节点 不能移动到上下游时 #rect 回到拖动前的位置
// for (var i = 0; i < window.basFlow.rectItems.length; i++) {
// if (!basFlow.referInnerLine({
// left: Number(jq("#" + window.basFlow.rectItems[i].id).css('left').replace("px", "")),
// top: Number(jq("#" + window.basFlow.rectItems[i].id).css('top').replace("px", ""))
// }, me.controls[window.basFlow.rectItems[i].id].type, me.controls[window.basFlow.rectItems[i].id].height) && getCookie('qiehuanbgimg') === 'bg_img_grid') {
// jq(this).css({
// left: me.beginleft,
// top: me.begintop
// })
// rectFlag = true
// }
// }
// if (rectFlag) {
// basFlow.alertBox(jq.i18n.prop("addProcessRule") + "! ", 'danger');
// return
// }
for (var i = 0; i < window.basFlow.rectItems.length; i++) {
// // 节点 不能移动到上下游时 #rect 回到拖动前的位置
// if (!basFlow.referInnerLine(basFlow._getToWorkOffset(ui.offset), me.controls[window.basFlow.rectItems[i].id].type, me.controls[window.basFlow.rectItems[i].id].height) && getCookie('qiehuanbgimg') === 'bg_img_grid') {
// basFlow.alertBox(jq.i18n.prop("addProcessRule") + "! ", 'danger');
// jq(this).css({
// left: me.beginleft,
// top: me.begintop
// })
// return
// }
var item = jq("#" + window.basFlow.rectItems[i].id);
console.log(window.basFlow.rectItems[i].id, item.css("top").replace("px", "") + endtop - me.begintop, item.css("left").replace("px", "") + endleft - me.beginleft)
var controlTop = Number(item.css("top").replace("px", "")) + endtop - me.begintop;
var controlLeft = Number(item.css("left").replace("px", "")) + endleft - me.beginleft;
item.css("top", controlTop + 'px');
item.css("left", controlLeft + 'px');
me.controls[window.basFlow.rectItems[i].id].top = controlTop
me.controls[window.basFlow.rectItems[i].id].left = controlLeft
me.resetLines(window.basFlow.rectItems[i].id, me.controls[window.basFlow.rectItems[i].id], null, {
left: endleft - me.beginleft,
top: endtop - me.begintop
})
}
}
}
});
// jq("#rect").resizable({
// // helper: ".ui-resizable-handle",
// // handles: 'e',
// start: function (event, ui) {
// console.log('resizableresizable', ui)
// }
// })
// jq('.GooFlow_workArea').on('dragstart', '#rect', function (event, ui) {
// me.begintop = Number(jq(this).css("top").replace("px", ""));
// me.beginleft = Number(jq(this).css("left").replace("px", ""));
// console.log(1111111, me.beginleft, me.begintop)
// })
// jq('.GooFlow_workArea').on('drag', '#rect', function (event, ui) {
// // var endtop = ui.position.top;
// // var endleft = ui.position.left;
// // console.log(2222222, me.beginleft, me.begintop, endtop, endleft)
// // me.topdiff = endtop - me.begintop;
// // me.leftdiff = endleft - me.beginleft;
// })
// jq('.GooFlow_workArea').on('dragstop', '#rect', function (event, ui) {
// var endtop = Number(jq(this).css("top").replace("px", ""));
// var endleft = Number(jq(this).css("left").replace("px", ""));
// console.log(3333333333, endleft, endtop)
// // "width": me.initSvgWidth,
// // "height": (parseFloat(jq(".GooFlow_workArea").css("height"))) / me.scaleTo
// // if (endleft < 0) {
// // endleft
// // }
// me.rectLines = []
// if (window.basFlow.rectItems) {
// for (var i = 0; i < window.basFlow.rectItems.length; i++) {
// var item = jq("#" + window.basFlow.rectItems[i].id);
// console.log(window.basFlow.rectItems[i].id, item.css("top").replace("px", "") + endtop - me.begintop, item.css("left").replace("px", "") + endleft - me.beginleft)
// var controlTop = Number(item.css("top").replace("px", "")) + endtop - me.begintop;
// var controlLeft = Number(item.css("left").replace("px", "")) + endleft - me.beginleft;
// item.css("top", controlTop + 'px');
// item.css("left", controlLeft + 'px');
// me.controls[window.basFlow.rectItems[i].id].top = controlTop
// me.controls[window.basFlow.rectItems[i].id].left = controlLeft
// me.resetLines(window.basFlow.rectItems[i].id, me.controls[window.basFlow.rectItems[i].id], null, {
// left: endleft - me.beginleft,
// top: endtop - me.begintop
// })
// }
// }
// })
me.$textArea.off("blur").on('blur', function (e) {
var dom = me.$textArea.data('dom'),
attrName = me.$textArea.data('attrName'),
......@@ -9894,7 +9767,7 @@ import { showLoading, hideLoading } from './jsComponents/utils/loading'
let processInfo = sessionStorage.getItem('processInfo') ? JSON.parse(sessionStorage.getItem('processInfo')) : {}
// 属性只读
me.isReadAttr = processInfo.isReadAttr === 'true' ? true : me.isReadAttr;
// me.isReadAttr = processInfo.isReadAttr === 'true' ? true : me.isReadAttr;
window.isEditAttr = processInfo.isReadAttr === 'true' ? false : me.isEdit;
......@@ -9932,20 +9805,20 @@ import { showLoading, hideLoading } from './jsComponents/utils/loading'
jq(".content_wrapper .content_item").hide()
// headerBtn.renderHeaderBtn('#headerBtn')
if (!getParam("isReadAttr") && getCookie('storeChangeState') !== 'publish') {
// if (!getParam("isReadAttr") && getCookie('storeChangeState') !== 'publish') {
headerBtn.renderHeaderBtn('#headerBtn');
}
// }
jq("#selectVal").val("1") // 切换时候恢复正常
me.onScaleMaxClick()
} else if (type === 'initParamUrl') { // 第一次打开时 并且URL带参数情况 本来想要update 这样可以减少页面重复渲染
if (!getParam("isReadAttr") && getCookie('storeChangeState') !== 'publish') {
// if (!getParam("isReadAttr") && getCookie('storeChangeState') !== 'publish') {
jq("#selectVal").val("1")
me.onScaleMaxClick()
headerBtn.renderHeaderBtn('#headerBtn');
let tabMenu = processTabMenu.tab;
me.$container.append(jq(tabMenu));
processTabMenu.renderProcessTabMenu('#processTabMenu');
}
// }
}
// 添加控件
for (var c = 0; c < data.controls.length; c++) {
......
src/designer/index.html
View file @ facc10aa
......@@ -4061,9 +4061,7 @@
<input
type="{{= item.inputInfoDTO.type}}"
data-type="{{= item.source}}"
{{? item.inputInfoDTO.state === 'disabled' }}
disabled
{{? }}
class="attr-table-inp {{= item.operation}}"
value="{{= it.control[item.source]}}"
placeholder="{{= item.inputInfoDTO.placeholder}}"
......@@ -4084,16 +4082,12 @@
<select name=""
class="form-control form-control-select"
data-type="{{= item.source}}"
{{? item.inputInfoDTO.state === 'disabled' }}
disabled
{{? }}
value="{{= it.control[item.source]}}"
>
{{~item.optionalValueDTOs :subitem:subindex }}
<option
{{? item.inputInfoDTO.state === 'disabled' }}
disabled
{{? }}
{{? it.control[item.source] === subitem.value }}
selected
{{? }}
......@@ -4112,9 +4106,7 @@
<div class="clamp">
<textarea
data-type="{{= item.source}}"
{{? item.inputInfoDTO.state === 'disabled' }}
disabled
{{? }}
>{{= it.control[item.source]}}</textarea>
</div>
</td>
......@@ -4125,9 +4117,7 @@
<td><div class="clamp">{{= item.name}} :</div></td>
<td><div class="clamp">
<input
{{? item.inputInfoDTO.state === 'disabled' }}
disabled
{{? }}
type="file" class="attr-table-inp" data-type="index" value=""></div>
</td>
</tr>
......@@ -4139,9 +4129,7 @@
<div class="clamp">
{{~item.optionalValueDTOs :subitem:subindex }}
<input
{{? subitem.state === 'disabled' }}
disabled
{{? }}
type="radio" name="{{= item.id}}" class="attr-table-radio" data-type="" value="">
<label for="huey" value="{{= subitem.value}}">{{= subitem.label}}</label>
{{~}}
......@@ -4278,18 +4266,14 @@
data-type='time'
class='form-control attr-table-inp'
style='margin-right:10px'
{{? it.data.inputInfoDTO.state === 'disabled' }}
disabled
{{? }}
value="{{= it.control['time']}}"
/>
<select
value="{{= it.control['timeType']}}"
class="form-control form-control-select"
data-type="timeType"
{{? it.data.inputInfoDTO.state === 'disabled' }}
disabled
{{? }}
>
<option
{{? it.control['timeType'] ==='day' }}selected{{? }}
......
src/designer/index.js
View file @ facc10aa
......@@ -234,12 +234,12 @@ function getProcessJson (type) {
if (getCookie('storeChangeState') === 'publish' || getParam("isReadAttr") === 'true') {
let processInfo = JSON.parse(sessionStorage.getItem('processInfo'))
if (!!processInfo && !!processInfo.type) {
basFlow.isReadAttr = true
basFlow.isReadAttr = 'true'
basFlow.isUpDownProcess = false
basFlow.initData(processInfo.json, type);
return
}
basFlow.isReadAttr = false
basFlow.isReadAttr = 'true'
jq.ajax({
type: "POST",
url: basFlow.baseUrl + "/listhistory/getLast/" + basFlow.id + '?username=' + basFlow.username,
......@@ -282,7 +282,7 @@ function getProcessJson (type) {
}
})
} else {
basFlow.isReadAttr = false
basFlow.isReadAttr = 'true'
showLoading()
jq.ajax({
type: "POST",
......@@ -8030,6 +8030,7 @@ jq("body").on("click", ".allocation", function () {
jq('body').append('<div id="allocation" style="display: none;"/>')
window.releateEle.renderReleateEleDialog('#allocation');
} else if (relatedEleFlag) {
console.log(jq(this).parents('.control').attr('id'))
basFlow.viewRelatedEle(jq(this).parents('.control').attr('id'))
} else if (!!it.processGroup && it.processGroup.length > 0) {
openReferenceFlow(jq(this).parents('.control').attr('id'), 'click')
......
src/designer/jsComponents/page/basFlow.js
View file @ facc10aa
......@@ -204,10 +204,10 @@ var basFlow = jq('#basGooFlow').createGooFlow({
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'
});
......
src/designer/jsComponents/utils/url.js
View file @ facc10aa
......@@ -6,7 +6,7 @@
let urlRes = '/bpabpmapi';
let htmlUrl = '/jcybpm';
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'
// urlRes = 'http://test1.jiucaiyun.cn/bpabpmtest2api'
// 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