@@ -10,7 +11,7 @@
{{ node.name }}
-
+
@@ -25,7 +26,11 @@
export default {
props: {
node: Object,
- activeElement: Object
+ activeElement: Object,
+ disabled: {
+ typeof: Boolean,
+ default: false
+ }
},
data() {
return {}
diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/node_filter.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/node_filter.vue"
index 9f4f9656..83a80fb2 100644
--- "a/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/node_filter.vue"
+++ "b/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/node_filter.vue"
@@ -8,7 +8,7 @@
条件设置
-
@@ -18,16 +18,16 @@
字段 |
条件 |
值 |
-
操作 |
+
操作 |
|
+ placeholder="请选择" :disabled="disabled">
|
-
+ |
|
@@ -36,16 +36,15 @@
+ :value="data.key" :disabled="disabled" />
-
+ v-model="item.value" placeholder="请选择" :disabled="disabled">
-
+
|
- |
+ |
@@ -69,6 +68,10 @@ export default {
default: () => {
return []
}
+ },
+ disabled:{
+ typeof:Boolean,
+ default:false
}
},
data() {
diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/node_form.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/node_form.vue"
index 91714e33..ceff15de 100644
--- "a/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/node_form.vue"
+++ "b/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/node_form.vue"
@@ -12,11 +12,11 @@
+ :formRules="formRules" :disabled="disabled">
-
+
@@ -35,6 +35,10 @@ export default {
'node-filter': nodeFilter
},
props: {
+ disabled:{
+ typeof:Boolean,
+ default:false
+ }
// node: {
// type: Object,
// default: () => {
@@ -67,7 +71,7 @@ export default {
},
data() {
return {
- tableName:"",
+ tableName: "",
index: 1,
visible: true,
// node 或 line
@@ -197,7 +201,7 @@ export default {
{ key: 1, value: '是' },
{ key: 0, value: '否' }
],
- type: 'radio'
+ type: 'switch'
}
],
],
@@ -212,8 +216,8 @@ export default {
* @param data
* @param id
*/
- nodeInit(data, id,tableName) {
- this.tableName=tableName;
+ nodeInit(data, id, tableName) {
+ this.tableName = tableName;
this.type = 'node'
this.data = data;
// this.tableName=data.
@@ -227,7 +231,7 @@ export default {
})
})
if (!node.filters) {
- node.filters=[];
+ node.filters = [];
}
this.node = node;// cloneDeep(node)
if (node.type != 'start' && node.type != 'end') {
diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/panel.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/panel.vue"
index dd3eaa65..02d7cf2e 100644
--- "a/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/panel.vue"
+++ "b/Vol.Vue3\347\211\210\346\234\254/src/components/workflow/panel.vue"
@@ -8,8 +8,8 @@
-
+ :disabled="disabled" :formRules="formRules">
+
@@ -17,10 +17,10 @@
-
+ :disabled="disabled" @changeNodeSite="changeNodeSite" @nodeRightMenu="nodeRightMenu"
+ @clickNode="clickNode">
@@ -29,7 +29,7 @@
-
@@ -50,13 +50,19 @@ import lodash from 'lodash'
// import { getDataA } from './data_A'
import VolForm from '@/components/basic/VolForm.vue';
export default {
+ props: {
+ disabled: {
+ typeof: Boolean,
+ default: false
+ }
+ },
data() {
return {
formFields: {
WorkName: '',
WorkTable: '',
WorkTableName: '',
- Weight:1,
+ Weight: 1,
AuditingEdit: 0,
Remark: ''
},
@@ -276,7 +282,7 @@ export default {
this.jsPlumb.makeSource(node.id, lodash.merge(this.jsplumbSourceOptions, {}))
// // 设置目标点，其他源点拖出的线可以连接该节点
this.jsPlumb.makeTarget(node.id, this.jsplumbTargetOptions)
- if (!node.viewOnly) {
+ if (!node.viewOnly && !this.disabled) {
this.jsPlumb.draggable(node.id, {
containment: 'parent',
stop: function (el) {
@@ -292,7 +298,7 @@ export default {
var connParam = {
source: line.from,
target: line.to,
- label: line.label ? line.label : 'x',
+ label: this.disabled ? null : (line.label ? line.label : 'x'),
connector: line.connector ? line.connector : '',
anchors: line.anchors ? line.anchors : undefined,
@@ -328,6 +334,8 @@ export default {
},
// 删除激活的元素
deleteElement() {
+ if (this.disabled)
+ return
if (this.activeElement.type === 'node') {
this.deleteNode(this.activeElement.nodeId)
} else if (this.activeElement.type === 'line') {
diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/extension/system/flow/Sys_WorkFlow.js" "b/Vol.Vue3\347\211\210\346\234\254/src/extension/system/flow/Sys_WorkFlow.js"
index 68b572bc..afc62d5a 100644
--- "a/Vol.Vue3\347\211\210\346\234\254/src/extension/system/flow/Sys_WorkFlow.js"
+++ "b/Vol.Vue3\347\211\210\346\234\254/src/extension/system/flow/Sys_WorkFlow.js"
@@ -52,6 +52,21 @@ let extension = {
// });
//示例：设置修改新建、编辑弹出框字段标签的长度
// this.boxOptions.labelWidth = 150;
+ this.columns.forEach(x => {
+ if (x.field == "WorkName") {
+ //懒得改代码生成器重新生成超链接
+ x.link = false;
+ x.formatter = (row, column, event) => {
+ return '
' + row.WorkName + ''
+ };
+ //绑定点击事件
+ x.click = (row, column, event) => {
+ this.isLink = true;
+ this.edit(row)
+ this.isLink = false;
+ };
+ }
+ })
},
onInited() {
this.height = this.height - 50;
@@ -83,8 +98,14 @@ let extension = {
async modelOpenBeforeAsync(row) {
//点击编辑/新建按钮弹出框前，可以在此处写逻辑，如，从后台获取数据
this.$refs.gridHeader.open(row);
+ if (this.isLink) {
+ this.$refs.gridHeader.disabled = true;
+ }
+ else {
+ this.$refs.gridHeader.disabled = false;
+ }
return false;
- }
+ }
}
};
export default extension;
diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/extension/system/flow/Sys_WorkFlow/WorkFlowGridHeader.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/extension/system/flow/Sys_WorkFlow/WorkFlowGridHeader.vue"
index a0abc2cf..f2ce06c7 100644
--- "a/Vol.Vue3\347\211\210\346\234\254/src/extension/system/flow/Sys_WorkFlow/WorkFlowGridHeader.vue"
+++ "b/Vol.Vue3\347\211\210\346\234\254/src/extension/system/flow/Sys_WorkFlow/WorkFlowGridHeader.vue"
@@ -1,12 +1,12 @@
-
+
取消
- 保存
+ 保存
@@ -23,6 +23,7 @@ export default {
},
data() {
return {
+ disabled:false,
nodeList: [],
lineList: [],
model: false,
@@ -83,11 +84,11 @@ export default {
}, this.isAdd);
Object.assign(this.$refs.flow.formFields, row);
if (this.isAdd) {
- this.$refs.flow.formFields.WorkName="";
- this.$refs.flow.formFields.WorkTable="";
- this.$refs.flow.formFields.WorkTableName="";
- this.$refs.flow.formFields.Remark="";
- this.$refs.flow.formFields.Weight=1;
+ this.$refs.flow.formFields.WorkName = "";
+ this.$refs.flow.formFields.WorkTable = "";
+ this.$refs.flow.formFields.WorkTableName = "";
+ this.$refs.flow.formFields.Remark = "";
+ this.$refs.flow.formFields.Weight = 1;
}
if (this.$refs.flow) {
this.$refs.flow.$refs.nodeForm.$refs.filter.getOptions(row.WorkTable);
@@ -95,7 +96,7 @@ export default {
this.$refs.flow.$refs.form.reset(
Object.keys(row).length
? row
- : { WorkName: '', WorkTable: '', WorkTableName: '', Remark: '',Weight:1 }
+ : { WorkName: '', WorkTable: '', WorkTableName: '', Remark: '', Weight: 1 }
);
}
});
@@ -208,7 +209,7 @@ export default {
value: Array.isArray(m.value) ? m.value.join(',') : m.value
}
});
- item.Filters =JSON.stringify(item.Filters)
+ item.Filters = JSON.stringify(item.Filters)
} else {
item.Filters = null;
}
--
Gitee
From 4973b21524a9a33169aa63c041092742e9ba8d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A9=E7=8E=8B=E7=9B=96=E5=9C=B0=E8=99=8E?=
<提莫二百五>
Date: Thu, 25 May 2023 08:18:51 +0800
Subject: [PATCH 3/3] =?UTF-8?q?VolBox=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E5=85=A8=E5=B1=8F=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/basic/VolBox.vue" | 54 ++++++++++++-------
1 file changed, 36 insertions(+), 18 deletions(-)
diff --git "a/Vol.Vue3\347\211\210\346\234\254/src/components/basic/VolBox.vue" "b/Vol.Vue3\347\211\210\346\234\254/src/components/basic/VolBox.vue"
index a4d46305..f9f5a250 100644
--- "a/Vol.Vue3\347\211\210\346\234\254/src/components/basic/VolBox.vue"
+++ "b/Vol.Vue3\347\211\210\346\234\254/src/components/basic/VolBox.vue"
@@ -1,11 +1,15 @@
-
- {{ title }}
+
+
+ {{ title }}
+
+
-
@@ -31,45 +35,47 @@ export default defineComponent({
lazy: {
//是否开启懒加载2020.12.06
type: Boolean,
- default: false
+ default: false,
},
icon: {
type: String,
- default: 'el-icon-warning-outline'
+ default: "el-icon-warning-outline",
},
title: {
type: String,
- default: '基本信息'
+ default: "基本信息",
},
height: {
type: Number,
- default: 200
+ default: 200,
},
width: {
type: Number,
- default: 650
+ default: 650,
},
padding: {
type: Number,
- default: 16
+ default: 16,
},
- modal: { //是否需要遮罩层
+ modal: {
+ //是否需要遮罩层
type: Boolean,
- default: true
+ default: true,
},
- draggable: { //启用可拖拽功能
+ draggable: {
+ //启用可拖拽功能
type: Boolean,
- default: false
+ default: false,
},
mask: {
type: Boolean,
- default: true
+ default: true,
},
onModelClose: {
//2021.07.11增加弹出框关闭事件
type: Function,
default: (iconClick) => {
- return true;
+ return true;
}
},
footer:{ //是否显示底部按钮
@@ -78,6 +84,11 @@ export default defineComponent({
}
},
+ data() {
+ return {
+ fullscreen: false
+ }
+ },
setup(props, context) {
const clientHeight = document.body.clientHeight * 0.95 - 60;
const inited = ref(true);
@@ -92,7 +103,7 @@ export default defineComponent({
let result = props.onModelClose(!!iconClose);
if (result === false) return;
vmodel.value = false;
- context.emit('update:modelValue', false);
+ context.emit("update:modelValue", false);
done && done();
};
const calcHeight = (val) => {
@@ -104,7 +115,6 @@ export default defineComponent({
// contentHeight.value = val || props.height;
// return (props.height + 56) / -2 + 'px';
};
-
top.value = calcHeight();
watch(
() => props.modelValue,
@@ -127,6 +137,11 @@ export default defineComponent({
calcHeight,
contentHeight
};
+ },
+ methods: {
+ handleFullScreen() {
+ this.fullscreen = !this.fullscreen;
+ }
}
});
@@ -178,6 +193,9 @@ export default defineComponent({
top: 0;
padding-top: 8px;
height: 50px;
+ width: 0;
+ padding-right: 30px;
+ padding-left: 5px;
}
// .vol-dialog ::v-deep(.el-dialog__headerbtn .el-dialog__close) {
// color: #fff;
--
Gitee