Skip to content

W
web
Commit d10750bb authored by ztf's avatar ztf
Browse files
Options

合并更新

parent bff8e6c5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 32 deletions
applications/architecture-dee/public/dee-config/main.js
View file @ d10750bb
This source diff could not be displayed because it is too large. You can view the blob instead.
applications/architecture-dee/public/dee-lifecycle/main.js
View file @ d10750bb
This source diff could not be displayed because it is too large. You can view the blob instead.
applications/architecture-dee/public/dee-model/report.html
View file @ d10750bb
This source diff could not be displayed because it is too large. You can view the blob instead.
applications/architecture-dee/public/dee-workflow/report.html
View file @ d10750bb
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/> <meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>dee-workflow [14 Aug 2024 at 15:37]</title> <title>dee-workflow [28 Aug 2024 at 10:36]</title>
<link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABrVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////+O1foceMD///+J0/qK1Pr7/v8Xdr/9///W8P4UdL7L7P0Scr2r4Pyj3vwad8D5/f/2/f+55f3E6f34+/2H0/ojfMKpzOd0rNgQcb3F3O/j9f7c8v6g3Pz0/P/w+v/q+P7n9v6T1/uQ1vuE0vqLut/y+v+Z2fvt+f+15Pzv9fuc2/vR7v2V2Pvd6/bg9P7I6/285/2y4/yp3/zp8vk8i8kqgMT7/P31+fyv4vxGkcz6/P6/6P3j7vfS5PNnpNUxhcbO7f7F6v3O4vHK3/DA2u631Ouy0eqXweKJud5wqthfoNMMbLvY8f73+v2dxeR8sNtTmdDx9/zX6PSjyeaCtd1YnNGX2PuQveCGt95Nls42h8dLlM3F4vBtAAAAM3RSTlMAAyOx0/sKBvik8opWGBMOAe3l1snDm2E9LSb06eHcu5JpHbarfHZCN9CBb08zzkdNS0kYaptYAAAFV0lEQVRYw92X51/aYBDHHS2O2qqttVbrqNq9m+TJIAYIShBkWwqIiCgoWvfeq7Z2/s29hyQNyUcR7LveGwVyXy6XH8/9rqxglLfUPLxVduUor3h0rfp2TYvpivk37929TkG037hffoX0+peVtZQc1589rigVUdXS/ABSAyEmGIO/1XfvldSK8vs3OqB6u3m0nxmIrvgB0dj7rr7Y9IbuF68hnfFaiHA/sxqm0wciIG43P60qKv9WXWc1RXGh/mFESFABTSBi0sNAKzqet17eCtOb3kZIDwxEEU0oAIJGYxNBDhBND29e0rtXXbcpuPmED9IhEAAQ/AXEaF8EPmnrrKsv0LvWR3fg5sWDNAFZOgAgaKvZDogHNU9MFwnnYROkc56RD5CjAbQX9Ow4g7upCsvYu55aSI/Nj0H1akgKQEUM94dwK65hYRmFU9MIcH/fqJYOZYcnuJSU/waKDgTOEVaVKhwrTRP5XzgSpAITYzom7UvkhFX5VutmxeNnWDjjswTKTyfgluNDGbUpWissXhF3s7mlSml+czWkg3D0l1nNjGNjz3myOQOa1KM/jOS6ebdbAVTCi4gljHSFrviza7tOgRWcS0MOUX9zdNgag5w7rRqA44Lzw0hr1WqES36dFliSJFlh2rXIae3FFcDDgKdxrUIDePr8jGcSClV1u7A9xeN0ModY/pHMxmR1EzRh8TJiwqsHmKW0l4FCEZI+jHio+JdPPE9qwQtTRxku2D8sIeRL2LnxWSllANCQGOIiqVHAz2ye2JR0DcH+HoxDkaADLjgxjKQ+AwCX/g0+DNgdG0ukYCONAe+dbc2IAc6fwt1ARoDSezNHxV2Cmzwv3O6lDMV55edBGwGK9n1+x2F8EDfAGCxug8MhpsMEcTEAWf3rx2vZhe/LAmtIn/6apE6PN0ULKgywD9mmdxbmFl3OvD5AS5fW5zLbv/YHmcsBTjf/afDz3MaZTVCfAP9z6/Bw6ycv8EUBWJIn9zYcoAWWlW9+OzO3vkTy8H+RANLmdrpOuYWdZYEXpo+TlCJrW5EARb7fF+bWdqf3hhyZI1nWJQHgznErZhbjoEsWqi8dQNoE294aldzFurwSABL2XXMf9+H1VQGke9exw5P/AnA5Pv5ngMul7LOvO922iwACu8WkCwLCafvM4CeWPxfA8lNHcWZSoi8EwMAIciKX2Z4SWCMAa3snCZ/G4EA8D6CMLNFsGQhkkz/gQNEBbPCbWsxGUpYVu3z8IyNAknwJkfPMEhLyrdi5RTyUVACkw4GSFRNWJNEW+fgPGwHD8/JxnRuLabN4CGNRkAE23na2+VmEAUmrYymSGjMAYqH84YUIyzgzs3XC7gNgH36Vcc4zKY9o9fgPBXUAiHHwVboBHGLiX6Zcjp1f2wu4tvzZKo0ecPnDtQYDQvJXaBeNzce45Fp28ZQLrEZVuFqgBwOalArKXnW1UzlnSusQKJqKYNuz4tOnI6sZG4zanpemv+7ySU2jbA9h6uhcgpfy6G2PahirDZ6zvq6zDduMVFTKvzw8wgyEdelwY9in3XkEPs3osJuwRQ4qTkfzifndg9Gfc4pdsu82+tTnHZTBa2EAMrqr2t43pguc8tNm7JQVQ2S0ukj2d22dhXYP0/veWtwKrCkNoNimAN5+Xr/oLrxswKbVJjteWrX7eR63o4j9q0GxnaBdWgGA5VStpanIjQmEhV0/nVt5VOFUvix6awJhPcAaTEShgrG+iGyvb5a0Ndb1YGHFPEwoqAinoaykaID1o1pdPNu7XsnCKQ3R+hwWIIhGvORcJUBYXe3Xa3vq/mF/N9V13ugufMkfXn+KHsRD0B8AAAAASUVORK5CYII=" type="image/x-icon" /> <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAMAAACdt4HsAAABrVBMVEUAAAD///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////+O1foceMD///+J0/qK1Pr7/v8Xdr/9///W8P4UdL7L7P0Scr2r4Pyj3vwad8D5/f/2/f+55f3E6f34+/2H0/ojfMKpzOd0rNgQcb3F3O/j9f7c8v6g3Pz0/P/w+v/q+P7n9v6T1/uQ1vuE0vqLut/y+v+Z2fvt+f+15Pzv9fuc2/vR7v2V2Pvd6/bg9P7I6/285/2y4/yp3/zp8vk8i8kqgMT7/P31+fyv4vxGkcz6/P6/6P3j7vfS5PNnpNUxhcbO7f7F6v3O4vHK3/DA2u631Ouy0eqXweKJud5wqthfoNMMbLvY8f73+v2dxeR8sNtTmdDx9/zX6PSjyeaCtd1YnNGX2PuQveCGt95Nls42h8dLlM3F4vBtAAAAM3RSTlMAAyOx0/sKBvik8opWGBMOAe3l1snDm2E9LSb06eHcu5JpHbarfHZCN9CBb08zzkdNS0kYaptYAAAFV0lEQVRYw92X51/aYBDHHS2O2qqttVbrqNq9m+TJIAYIShBkWwqIiCgoWvfeq7Z2/s29hyQNyUcR7LveGwVyXy6XH8/9rqxglLfUPLxVduUor3h0rfp2TYvpivk37929TkG037hffoX0+peVtZQc1589rigVUdXS/ABSAyEmGIO/1XfvldSK8vs3OqB6u3m0nxmIrvgB0dj7rr7Y9IbuF68hnfFaiHA/sxqm0wciIG43P60qKv9WXWc1RXGh/mFESFABTSBi0sNAKzqet17eCtOb3kZIDwxEEU0oAIJGYxNBDhBND29e0rtXXbcpuPmED9IhEAAQ/AXEaF8EPmnrrKsv0LvWR3fg5sWDNAFZOgAgaKvZDogHNU9MFwnnYROkc56RD5CjAbQX9Ow4g7upCsvYu55aSI/Nj0H1akgKQEUM94dwK65hYRmFU9MIcH/fqJYOZYcnuJSU/waKDgTOEVaVKhwrTRP5XzgSpAITYzom7UvkhFX5VutmxeNnWDjjswTKTyfgluNDGbUpWissXhF3s7mlSml+czWkg3D0l1nNjGNjz3myOQOa1KM/jOS6ebdbAVTCi4gljHSFrviza7tOgRWcS0MOUX9zdNgag5w7rRqA44Lzw0hr1WqES36dFliSJFlh2rXIae3FFcDDgKdxrUIDePr8jGcSClV1u7A9xeN0ModY/pHMxmR1EzRh8TJiwqsHmKW0l4FCEZI+jHio+JdPPE9qwQtTRxku2D8sIeRL2LnxWSllANCQGOIiqVHAz2ye2JR0DcH+HoxDkaADLjgxjKQ+AwCX/g0+DNgdG0ukYCONAe+dbc2IAc6fwt1ARoDSezNHxV2Cmzwv3O6lDMV55edBGwGK9n1+x2F8EDfAGCxug8MhpsMEcTEAWf3rx2vZhe/LAmtIn/6apE6PN0ULKgywD9mmdxbmFl3OvD5AS5fW5zLbv/YHmcsBTjf/afDz3MaZTVCfAP9z6/Bw6ycv8EUBWJIn9zYcoAWWlW9+OzO3vkTy8H+RANLmdrpOuYWdZYEXpo+TlCJrW5EARb7fF+bWdqf3hhyZI1nWJQHgznErZhbjoEsWqi8dQNoE294aldzFurwSABL2XXMf9+H1VQGke9exw5P/AnA5Pv5ngMul7LOvO922iwACu8WkCwLCafvM4CeWPxfA8lNHcWZSoi8EwMAIciKX2Z4SWCMAa3snCZ/G4EA8D6CMLNFsGQhkkz/gQNEBbPCbWsxGUpYVu3z8IyNAknwJkfPMEhLyrdi5RTyUVACkw4GSFRNWJNEW+fgPGwHD8/JxnRuLabN4CGNRkAE23na2+VmEAUmrYymSGjMAYqH84YUIyzgzs3XC7gNgH36Vcc4zKY9o9fgPBXUAiHHwVboBHGLiX6Zcjp1f2wu4tvzZKo0ecPnDtQYDQvJXaBeNzce45Fp28ZQLrEZVuFqgBwOalArKXnW1UzlnSusQKJqKYNuz4tOnI6sZG4zanpemv+7ySU2jbA9h6uhcgpfy6G2PahirDZ6zvq6zDduMVFTKvzw8wgyEdelwY9in3XkEPs3osJuwRQ4qTkfzifndg9Gfc4pdsu82+tTnHZTBa2EAMrqr2t43pguc8tNm7JQVQ2S0ukj2d22dhXYP0/veWtwKrCkNoNimAN5+Xr/oLrxswKbVJjteWrX7eR63o4j9q0GxnaBdWgGA5VStpanIjQmEhV0/nVt5VOFUvix6awJhPcAaTEShgrG+iGyvb5a0Ndb1YGHFPEwoqAinoaykaID1o1pdPNu7XsnCKQ3R+hwWIIhGvORcJUBYXe3Xa3vq/mF/N9V13ugufMkfXn+KHsRD0B8AAAAASUVORK5CYII=" type="image/x-icon" />
<script> <script>
......
applications/architecture-dee/src/businessCompontents/DeeCascaderPropList.vue
View file @ d10750bb
...@@ -220,7 +220,6 @@ export default { ...@@ -220,7 +220,6 @@ export default {
}, },
modelName: { modelName: {
handler: function(val, oldVal) { handler: function(val, oldVal) {
console.log('watch:', val, oldVal, this.loadingOption)
if (oldVal === val) { if (oldVal === val) {
return return
} }
...@@ -235,7 +234,6 @@ export default { ...@@ -235,7 +234,6 @@ export default {
immediate: true immediate: true
} }
}, },
mounted() { mounted() {
if (this.value) { if (this.value) {
this.copyValue(this.value) this.copyValue(this.value)
...@@ -374,12 +372,20 @@ export default { ...@@ -374,12 +372,20 @@ export default {
}, },
changeModel() { changeModel() {
this.showCascader = !this.showCascader this.showCascader = !this.showCascader
},
getPropRule() {
const nodes = this.$refs.cascader.getCheckedNodes()
if (nodes.length > 0) {
const nodeData = this.$utils._get(nodes[nodes.length - 1], 'data.data', null)
if (nodeData && nodeData.type === 'DictDataVO' && nodeData.rule) {
return {
typeName: nodeData.rule.typeName || nodeData.type,
dictTypeCode: nodeData.rule.dictTypeCode || nodeData.name
}
}
}
return null
} }
} }
} }
</script> </script>
<style>
</style>
applications/architecture-dee/src/commonComponents/components/orgLazyLoadSelect/index.vue
View file @ d10750bb
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
</el-select> </el-select>
<!-- 弹出框 --> <!-- 弹出框 -->
<dee-dialog ref="dialogRef" width="60%" title="选择组织" :dialog-visible="showDialog" :destroy-on-close="true" @handleClose="onClose"> <dee-dialog ref="dialogRef" width="60%" title="选择组织" :dialog-visible="showDialog" :destroy-on-close="true" @handleClose="onClose">
<div class="OrgLazyLoadSelectCmp_dialog"> <div ref="dialogContentRef" class="OrgLazyLoadSelectCmp_dialog" style="--width: 400px">
<div class="wrap-left"> <div class="wrap-col wrap-left">
<!-- 独立组织树 --> <!-- 独立组织树 -->
<IndependentOrgTree <IndependentOrgTree
v-if="selectOrgType === 'independent'" v-if="selectOrgType === 'independent'"
...@@ -40,7 +40,8 @@ ...@@ -40,7 +40,8 @@
@checked="onChecked" @checked="onChecked"
/> />
</div> </div>
<div class="wrap-right"> <div class="drag-btn"><span class="resize-btn">||</span></div>
<div class="wrap-col wrap-right">
<!-- 勾选列表 --> <!-- 勾选列表 -->
<SelectedOrgTable <SelectedOrgTable
:data="checkedData" :data="checkedData"
...@@ -63,6 +64,7 @@ import IndependentOrgTree from './IndependentOrgTree' ...@@ -63,6 +64,7 @@ import IndependentOrgTree from './IndependentOrgTree'
import OrgTree from './OrgTree' import OrgTree from './OrgTree'
import config from './config' import config from './config'
import props from './props' import props from './props'
import resize from './resize'
export default { export default {
name: 'OrgLazyLoadSelect', name: 'OrgLazyLoadSelect',
...@@ -72,7 +74,7 @@ export default { ...@@ -72,7 +74,7 @@ export default {
IndependentOrgTree, IndependentOrgTree,
OrgTree OrgTree
}, },
mixins: [config, props], mixins: [config, props, resize],
data() { data() {
return { return {
selectedOrgList: [], selectedOrgList: [],
...@@ -305,18 +307,39 @@ export default { ...@@ -305,18 +307,39 @@ export default {
display: flex; display: flex;
height: 300px; height: 300px;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #E1E1E1;
overflow: hidden; overflow: hidden;
.wrap-col {
border: 1px solid #E1E1E1;
box-sizing: border-box;
overflow: hidden;
}
.wrap-left { .wrap-left {
width: 400px; width: var(--width, 400px);
height: 100%; height: 100%;
padding-right: 5px; padding-right: 5px;
border-right: 1px solid #E1E1E1; border-right: 1px solid #E1E1E1;
} }
.wrap-right { .wrap-right {
width: calc(100% - 400px); width: calc(100% - var(--width, 400px) - 14px);
height: 100%; height: 100%;
padding: 0 5px; padding: 0 5px;
} }
.drag-btn {
content: "";
display: flex;
height: 100%;
margin: 0 3px;
justify-content: center;
align-items: center;
span {
word-break: keep-all;
color: #909399;
cursor: col-resize;
user-select: none;
&:hover {
background-color: #F3F6F7;
}
}
}
} }
</style> </style>
applications/architecture-dee/src/commonComponents/components/orgLazyLoadSelect/resize.js 0 → 100644
View file @ d10750bb
export default {
watch: {
showDialog(isOpen) {
isOpen ? this.setMouseEvent() : this.removeMouseEvent()
}
},
methods: {
setMouseEvent() {
this.$nextTick(() => {
const that = this
const dialogContentElement = this.$refs.dialogContentRef
if (!dialogContentElement || this.setMouseEvent.hadEvent) return
dialogContentElement.onmousedown = function(e) {
if (e.target.classList.contains('resize-btn')) {
// 记录当前鼠标的x位置
that._currtCol = e.target.parentElement
that._clientX = e.clientX
that._width = parseFloat(dialogContentElement.style.getPropertyValue('--width'))
} else {
that.currtCol = null
}
}
dialogContentElement.onmouseup = function(e) {
that._currtCol = null
that._width = null
return false
}
dialogContentElement.onmousemove = function(e) {
if (that._currtCol) {
const val = e.clientX - (that._clientX || 0)
const result = that._width + val
if (result < 50 || result > dialogContentElement.offsetWidth - 50) {
return
}
dialogContentElement.style.setProperty('--width', result + 'px')
}
}
})
this._hadEvent = true
},
removeMouseEvent() {
this._hadEvent = null
const dialogContentElement = this.$refs.dialogContentRef
if (dialogContentElement) {
dialogContentElement.onmousedown = null
dialogContentElement.onmouseup = null
dialogContentElement.onmousemove = null
}
}
}
}
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