HC_YFZX
/
CaiYuanYiTiHua
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: HC_YFZX:2c8aeec6203f3aebf8d2d6c5cdf059cc9d5aaa25
Branches Tags
HC_YFZX:dianlixunjian
HC_YFZX:hefeichangfeng
HC_YFZX:main
HC_YFZX:hc_zhufu
HC_YFZX:zzq
..
compare: HC_YFZX:178972d0373da76ab94f2b4fd9b48ca5a20dbd67
Branches Tags
HC_YFZX:dianlixunjian
HC_YFZX:hefeichangfeng
HC_YFZX:main
HC_YFZX:hc_zhufu
HC_YFZX:zzq

No commits in common. "2c8aeec6203f3aebf8d2d6c5cdf059cc9d5aaa25" and "178972d0373da76ab94f2b4fd9b48ca5a20dbd67" have entirely different histories.
2c8aeec620 ... 178972d037

8 changed files with 72 additions and 201 deletions
Show Stats Expand all files Collapse all files

61
src/components/FormViewer/index.vue
View File

@ -7,7 +7,7 @@
:data-source="subTableList"
:pagination="false"
v-if="subTableId"
:scroll="scrollValue"
:scroll="{ x: 3000, y: 300 }"
>
<template #headerCell="{ column, record }">
<template v-if="column.key === 'setting'">
@ -49,29 +49,11 @@
});
console.log(props);
const subTableId = ref(null);
const subTableColumns: any = ref([
{
dataIndex: 'setting',
key: 'setting',
fixed: 'left',
width: 60,
},
]);
const subTableColumns: any = ref([]);
const subTableData = ref([]);
const subTableList: any = ref([]);
const scrollValue = ref();
const masterData = ref([])
props.formConfig.forEach((element) => {
console.log(element);
var obj = {
...element.componentProps,
disabled: false,
};
if (!element.disabled) {
obj.disabled = true;
element.componentProps = obj;
}
// element.componentProps.disabled = !element.disabled;
element.componentProps.disabled = !element.disabled;
if (element.rules !== undefined) {
let myString = element.rules[0].pattern;
const lastCharacter = myString.charAt(myString.length - 1);
@ -82,27 +64,36 @@
}
}
formColumns.push(element);
subTableColumns.value = [
{
dataIndex: 'setting',
key: 'setting',
fixed: 'left',
width: 60,
},
];
if (element.type === 'childData' && element.ifShow) {
subTableId.value = element.gridprop;
subTableColumns.value.push({
key: element.field,
title: element.label,
dataIndex: element.field,
...element,
width: 120,
if (element.type === 'subTable') {
subTableId.value = element.field;
let tableData = [];
element.columns.forEach((itemColumn) => {
itemColumn.children.forEach((itemColumnChild) => {
tableData.push(itemColumnChild);
subTableColumns.value.push({
key: itemColumnChild.field,
title: itemColumnChild.label,
dataIndex: itemColumnChild.field,
...itemColumnChild,
});
});
});
subTableData.value.push(element);
}else if(!element.type){
masterData.value.push(element);
subTableData.value = tableData;
}
});
console.log(subTableColumns.value);
scrollValue.value = { x: (subTableColumns.value.length - 1) * 140, y: 400 };
formColumns.value = props.formConfig;
const [registerForm, { getFieldsValue, setFieldsValue, resetFields, validate }] = useForm({
labelWidth: 100,
schemas: masterData.value,
schemas: props.formConfig,
showActionButtonGroup: false,
baseColProps: { lg: 24, md: 24 },
});

15
src/components/ProcessDesigner/package/penal/exclusiveGateway/index.vue
View File

@ -93,7 +93,6 @@
(newVal) => {
if (newVal.type == 'bpmn:ExclusiveGateway') {
const currentNode = flowWfDataStore.getWfDataNode(newVal.id);
console.log(currentNode);
if (currentNode) {
node.value = currentNode;
} else {
@ -102,7 +101,7 @@
}
},
);
const data = reactive({
columns: [
{ title: '类型', dataIndex: 'type' },
@ -178,17 +177,13 @@
data.formulaVisible = true;
} else {
if (data.isEdit) {
var currentIndex = node.value.conditions.findIndex(
(element) => element.code === propsData.value.code,
);
node.value.conditions[currentIndex] = obj;
node.value.conditions[data.rowIndex] = obj;
} else {
obj.code = buildGUID();
node.value.conditions.push(obj);
}
data.formulaVisible = false;
}
console.log(node.value.conditions);
}
function handleSqlOk() {
conditionSqlRef.value.validateForm();
@ -198,10 +193,7 @@
data.sqlVisible = true;
} else {
if (data.isEdit) {
var currentIndex = node.value.conditions.findIndex(
(element) => element.code === propsData.value.code,
);
node.value.conditions[currentIndex] = obj;
node.value.conditions[data.rowIndex] = obj;
} else {
obj.code = buildGUID();
node.value.conditions.push(obj);
@ -210,7 +202,6 @@
}
}
function onEdit(record) {
console.log(record);
data.isEdit = true;
propsData.value = record;
if (record.type == 1) {

45
src/components/ProcessDesigner/package/penal/startEvent/index.vue
View File

@ -338,7 +338,6 @@
}[] = [];
scheme.formInfo.schemas.forEach(
(element: { label?: string; field?: string; component: any; itemProps: any }) => {
console.log(element);
if (['InputGuid'].includes(element.component)) {
rfields.push({
label: element.label,
@ -347,7 +346,7 @@
});
}
if (!['Divider', 'Grid'].includes(element.component) && !element.itemProps.hidden) {
if (!['Divider'].includes(element.component) && !element.itemProps.hidden) {
let obj: any = element;
obj.required = element.itemProps.required;
obj.componentProps.disabled = true;
@ -355,48 +354,6 @@
obj.ifShow = true;
obj.fieldName = element.componentProps.fieldName;
fields.push(obj);
} else if (['Grid'].includes(element.component) || element.type == 'subTable') {
console.log('gridtable');
fields.push({
field: `${element.field}_add`,
label: `${element.label || '表格'}-添加按钮`,
required: false,
disabled: true,
ifShow: false,
type: 'grid',
});
fields.push({
field: `${element.field}_remove`,
label: `${element.label || '表格'}-删除按钮`,
required: false,
disabled: true,
ifShow: false,
type: 'grid',
});
fields.push({
field: `${element.field}_required`,
label: `${element.label || '表格'}-数据`,
required: element.itemProps.required,
disabled: false,
ifShow: false,
type: 'gridrequired',
});
element.columns.forEach((child) => {
child.children.forEach((t) => {
fields.push({
type: 'childData',
gridprop: element.field,
field: t.field,
label: `${element.label || '表格'}-${t.label}`,
required: t.itemProps.required,
disabled: true,
ifShow: true,
fieldName: t.componentProps.fieldName,
...t,
});
});
});
}
},
);

44
src/components/ProcessDesigner/package/penal/userTask/index.vue
View File

@ -868,7 +868,7 @@
});
}
if (!['Divider', 'Grid'].includes(element.component) && !element.itemProps.hidden) {
if (!['Divider'].includes(element.component) && !element.itemProps.hidden) {
let obj: any = element;
obj.required = element.itemProps.required;
obj.componentProps.disabled = true;
@ -876,48 +876,6 @@
obj.ifShow = true;
obj.fieldName = element.componentProps.fieldName;
fields.push(obj);
} else if (['Grid'].includes(element.component) || element.type == 'subTable') {
console.log('gridtable');
fields.push({
field: `${element.field}_add`,
label: `${element.label || '表格'}-添加按钮`,
required: false,
disabled: true,
ifShow: false,
type: 'grid',
});
fields.push({
field: `${element.field}_remove`,
label: `${element.label || '表格'}-删除按钮`,
required: false,
disabled: true,
ifShow: false,
type: 'grid',
});
fields.push({
field: `${element.field}_required`,
label: `${element.label || '表格'}-数据`,
required: element.itemProps.required,
disabled: false,
ifShow: false,
type: 'gridrequired',
});
element.columns.forEach((child) => {
child.children.forEach((t) => {
fields.push({
type: 'childData',
gridprop: element.field,
field: t.field,
label: `${element.label || '表格'}-${t.label}`,
required: t.itemProps.required,
disabled: true,
ifShow: true,
fieldName: t.componentProps.fieldName,
...t,
});
});
});
}
},
);

7
src/views/demo/form-design/components/VFormCreate/components/FormRender.vue
View File

@ -7,7 +7,7 @@
:pagination="false"
style="width: 100%"
v-if="subTableId"
:scroll="scrollValue"
:scroll="{ x: 3000, y: 300 }"
>
<template #headerCell="{ column, record }">
<template v-if="column.key === 'setting'">
@ -117,14 +117,13 @@
},
});
const emit = defineEmits(['change', 'submit', 'reset']);
const scrollValue = ref();
const isCreateOrModifyComponent = ['createuser','createtime','modifyuser','modifytime'].includes(props.schema.type)
let subTableColumns = ref([
{
dataIndex: 'setting',
key: 'setting',
fixed: 'left',
width: 60,
width: 60,
},
]);
let subTableId = ref(null);
@ -141,12 +140,10 @@
key: itemColumnChild.field,
title: itemColumnChild.label,
dataIndex: itemColumnChild.field,
width: 120,
...itemColumnChild,
});
});
});
scrollValue.value = { x: (subTableColumns.value.length - 1) * 140, y: 300 };
subTableData.value = tableData;
}
});

6
src/views/demo/onlineform/formCall/CallModal.vue
View File

@ -17,7 +17,7 @@
:data-source="subTableList"
:pagination="false"
v-if="subTableId"
:scroll="scrollValue"
:scroll="{ x: 3000, y: 300 }"
>
<template #headerCell="{ column, record }">
<template v-if="column.key === 'setting'">
@ -72,7 +72,7 @@
const subTableColumns: any = ref([]);
const subTableData = ref([]);
const subTableList: any = ref([]);
const scrollValue = ref();
const [registerModal, { setModalProps, closeModal }] = useModalInner((data: any) => {
console.log('daaaaa', data);
isUpdate.value = !!data?.isUpdate;
@ -108,11 +108,9 @@
title: itemColumnChild.label,
dataIndex: itemColumnChild.field,
...itemColumnChild,
width: 120,
});
});
});
scrollValue.value = { x: (subTableColumns.value.length - 1) * 140, y: 300 };
subTableData.value = tableData;
}
});

20
src/views/demo/onlineform/formCall/ShowFormModal/FormItem/index.vue
View File

@ -1,18 +1,16 @@
<template>
<Comp
:style="props.data.component === 'Select' ? 'width:120px' : 'width:120px'"
:options="props.data.componentProps.options"
:placeholder="props.data.placeholder"
v-model:value="props.record[props.data.dataIndex]"
:title="props.record[props.data.dataIndex]"
/>
<Comp
:style="props.data.component === 'Select'? 'width:120px': ''"
:options="props.data.componentProps.options"
:placeholder="props.data.placeholder"
v-model:value="props.record[props.data.dataIndex]"/>
</template>
<script setup lang="ts">
import { defineProps, defineEmits, ref } from 'vue';
import { componentMap } from '@/components/Form/src/componentMap';
const props = defineProps(['data', 'record']);
const Comp = componentMap.get(props.data.component);
import { defineProps, defineEmits, ref } from "vue"
import { componentMap } from '@/components/Form/src/componentMap';
const props = defineProps(['data','record'])
const Comp = componentMap.get(props.data.component)
</script>
<style lang="scss" scoped></style>

75
src/views/demo/onlineform/formCall/ShowFormModal/index.vue
View File

@ -13,7 +13,7 @@
:pagination="false"
:customRow="customRow"
v-if="subTableId"
:scroll="scrollValue"
:scroll="{ x: 3000, y: 300 }"
>
<template #headerCell="{ column, record }">
<template v-if="column.key === 'setting'">
@ -50,16 +50,9 @@
import { v4 as uuidv4 } from 'uuid';
const { createMessage } = useMessage();
const myDataBaseFormRef = ref();
const props = defineProps([
'open',
'showFormModalData',
'mapgemoList',
'formData',
'MapboxComponent',
'mapSetData',
'haveMap',
]);
const emits = defineEmits(['closeShowFormModal', 'setSelectedSubTableDataId']);
const props = defineProps(['open', 'showFormModalData', 'mapgemoList',
'formData','MapboxComponent','mapSetData','haveMap']);
const emits = defineEmits(['closeShowFormModal','setSelectedSubTableDataId']);
const subTableList = ref();
const subTableId = ref(null);
const isUpdate = ref(false);
@ -76,13 +69,12 @@
userId: userInfo.id,
title: '',
});
const scrollValue = ref();
const subTableColumns = ref([
{
dataIndex: 'setting',
key: 'setting',
fixed: 'left',
width: 60,
width: 60,
},
]);
const subTableData = ref([]);
@ -96,45 +88,36 @@
const customRow = (record) => {
return {
onClick: (event) => {
if (!props.haveMap) return;
let mapDataList = [
{
columnName: 'mapgeom',
value: record.MapGeom || null,
},
];
if (unref(isDetail)) {
props.MapboxComponent.handlerDraw(mapDataList, false);
return;
if(!props.haveMap) return
let mapDataList = [{
columnName: "mapgeom",
value: record.MapGeom || null
}]
if(unref(isDetail)){
props.MapboxComponent.handlerDraw(mapDataList,false)
return
}
emits('setSelectedSubTableDataId', record.key);
if (record.isInsert) {
props.mapSetData.isAllowAddPolygon &&
props.MapboxComponent.handlerDraw(mapDataList, true);
} else {
props.MapboxComponent.handlerDraw(mapDataList, props.mapSetData.isAllowEditPolygon);
emits('setSelectedSubTableDataId',record.key)
if(record.isInsert){
props.mapSetData.isAllowAddPolygon && props.MapboxComponent.handlerDraw(mapDataList,true);
}else{
props.MapboxComponent.handlerDraw(mapDataList,props.mapSetData.isAllowEditPolygon,);
}
if (record.MapGeom.length > 0 && props.mapSetData.isEnablePostionJump) {
let jumpDataString = record.MapGeom;
let jumpDataList = jumpDataString.replace(/[A-Z|(|)]/g, '').split(' ');
if (jumpDataString.slice(0, 5) === 'POINT') {
let jumpData =
jumpDataList[0].length > 0
? [jumpDataList[0], jumpDataList[1]]
: [jumpDataList[1], jumpDataList[2]];
let jumpData = jumpDataList[0].length> 0? [jumpDataList[0], jumpDataList[1]]: [jumpDataList[1], jumpDataList[2]]
props.MapboxComponent.handlerLocation(jumpData);
} else {
let jumpData =
jumpDataList[0].length > 0
? [jumpDataList[0], jumpDataList[1].split(',')[0]]
: [jumpDataList[1], jumpDataList[2].split(',')[0]];
let jumpData = jumpDataList[0].length> 0? [jumpDataList[0], jumpDataList[1].split(',')[0]]: [jumpDataList[1], jumpDataList[2].split(',')[0]]
props.MapboxComponent.handlerLocation(jumpData);
}
}
},
};
};
}
}
const closeModal = () => {
emits('closeShowFormModal', false);
};
@ -172,12 +155,10 @@
key: itemColumnChild.field,
title: itemColumnChild.label,
dataIndex: itemColumnChild.field,
width: 120,
...itemColumnChild,
});
});
});
scrollValue.value = { x: (subTableColumns.value.length - 1) * 140, y: 300 };
subTableData.value = tableData;
}
});
@ -239,10 +220,10 @@
subTableList.value.forEach((item) => {
let emptyObj = {};
for (const key in item) {
if (key.indexOf('guid') !== -1 && item[key] == '') {
let guid = generateUniqueDigits(20).join('');
item[key] = guid;
emptyObj[key] = guid;
if(key.indexOf('guid') !== -1 && item[key] == ""){
let guid = generateUniqueDigits(20).join('')
item[key] = guid
emptyObj[key] = guid
}
if (key === 'key') continue;
if (key === 'isInsert') continue;
@ -311,7 +292,7 @@
let keyList = subTableData.value.map((item) => {
return item.field;
});
let emptyItem = { key: uuidv4(), isInsert: true };
let emptyItem = { key: uuidv4(),isInsert:true };
keyList.forEach((item) => {
emptyItem[item] = '';
});