wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

1、样式调整

Browse Source
This commit is contained in:
Jerry
2024-09-26 15:01:08 +08:00
parent e9d724e3a2
commit 14d0bd8c5d
52 changed files with 482 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/OnlineAdvanceQueryForm/index.vue
View File

@@ -157,13 +157,14 @@
:getTableIndex="queryTableWidget.getTableIndex"
:sortChange="queryTableWidget.onSortChange"
:onSelectChange="onSelectRowChange"
:treeConfig="getTableTreeConfig"
@operationClick="onOperationClick"
>
<template #pagination>
<el-row
justify="end"
style="margin-top: 10px"
v-if="queryTable && queryTable.props.paged"
v-if="queryTable && queryTable.props.paged && getTableTreeConfig == null"
>
<el-pagination
:total="queryTableWidget.totalCount"
@@ -261,6 +262,7 @@
:getTableIndex="queryTableWidget.getTableIndex"
:sortChange="queryTableWidget.onSortChange"
:onSelectChange="onSelectRowChange"
:treeConfig="getTableTreeConfig"
@operationClick="onOperationClick"
@refresh="refreshTable(false)"
>
@@ -268,7 +270,7 @@
<el-row
justify="end"
style="margin-top: 10px"
v-if="queryTable && queryTable.props.paged"
v-if="queryTable && queryTable.props.paged && getTableTreeConfig == null"
>
<el-pagination
:total="queryTableWidget.totalCount"
@@ -293,7 +295,7 @@
import { nextTick } from 'vue';
import { Close, Search, Plus, Delete, Download, Upload } from '@element-plus/icons-vue';
import { ElMessage, ElMessageBox } from 'element-plus';
import { findItemFromList } from '@/common/utils';
import { findItemFromList, treeDataTranslate } from '@/common/utils';
import OnlineCustomWidget from '@/online/components/OnlineCustomWidget.vue';
import OnlineCustomTable from '@/online/components/OnlineCustomTable.vue';
import { DialogProp } from '@/components/Dialog/types';
@@ -504,6 +506,17 @@ const loadTableData = (params: ANY_OBJECT) => {
httpCall
.then(res => {
if (
queryTable.value &&
queryTable.value.props.treeFlag &&
queryTable.value.props.parentIdColumn
) {
res.data.dataList = treeDataTranslate(
res.data.dataList,
primaryColumnName.value,
queryTable.value.props.parentIdColumn,
);
}
resolve({
dataList: res.data.dataList,
totalCount: res.data.totalCount,
@@ -537,6 +550,7 @@ const activeOperationList = computed(() => {
return form.value.operationList;
});
const primaryColumnName = computed(() => {
if (dialogParams.value.isEdit) return;
let table = form.value.tableMap.get(queryTable.value.bindData.tableId);
if (table && Array.isArray(table.columnList)) {
for (let i = 0; i < table.columnList.length; i++) {
@@ -549,14 +563,26 @@ const primaryColumnName = computed(() => {
return null;
});
const getTableTreeConfig = computed(() => {
if (
queryTable.value &&
queryTable.value.props.treeFlag &&
queryTable.value.props.parentIdColumn
) {
return {
rowField: primaryColumnName.value,
parentField: queryTable.value.props.parentIdColumn,
};
} else {
return null;
}
});
// TODO 弹窗关闭
const onCancel = () => {
if (props.dialog) {
props.dialog.cancel();
}
// else {
// this.onCloseThirdDialog();
// }
};
const onCopyWidget = (widget: ANY_OBJECT) => {
activeWidgetList.value.push(widget);

1
OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/OnlineEditForm/index.vue
View File

@@ -118,7 +118,6 @@
v-show="isReady"
ref="root"
v-model:value="form.widgetList"
@input="onInput"
:height="height"
:isEdit="dialogParams.isEdit"
:showBorder="false"

2
OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/OnlineOneToOneForm/OnlineFilterBox.vue
View File

@@ -15,7 +15,7 @@
style="position: relative; width: 100%"
:style="{
border: isEdit && !isAdvance ? '1px solid #e8eaec' : 'none',
'min-height': isEdit && widgetList.length <= 0 ? '70px' : '0px',
'min-height': isEdit && widgetList.length <= 0 ? '86px' : '0px',
}"
:disabled="!isEdit"
>

3
OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/OnlineOneToOneForm/index.vue
View File

@@ -299,6 +299,7 @@ const activeOperationList = computed(() => {
// };
// });
const primaryColumnName = computed(() => {
if (dialogParams.value.isEdit) return;
let table = form.value.tableMap.get(queryTable.value.bindData.tableId);
if (table && Array.isArray(table.columnList)) {
for (let i = 0; i < table.columnList.length; i++) {
@@ -496,7 +497,7 @@ const onOperationClick = (operation: ANY_OBJECT, row: ANY_OBJECT | null) => {
} else if (operation.type === SysCustomWidgetOperationType.EXPORT) {
onExport(operation);
} else if (operation.type === SysCustomWidgetOperationType.PRINT) {
if (row) onPrint(operation, row, null, queryTable.value.showName + '.pdf');
if (row) onPrint(operation, row, null, queryTable.value.showName);
} else {
handlerOperation(operation, {
isEdit: dialogParams.value.isEdit,

2
OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/OnlineQueryForm/OnlineFilterBox.vue
View File

@@ -15,7 +15,7 @@
style="position: relative; width: 100%"
:style="{
border: isEdit && !isAdvance ? '1px solid #e8eaec' : 'none',
'min-height': isEdit && widgetList.length <= 0 ? '70px' : '0px',
'min-height': isEdit && widgetList.length <= 0 ? '86px' : '0px',
}"
:disabled="!isEdit"
>

35
OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/OnlineQueryForm/index.vue
View File

@@ -69,6 +69,7 @@
:getTableIndex="queryTableWidget.getTableIndex"
:sortChange="queryTableWidget.onSortChange"
:onSelectChange="onSelectRowChange"
:treeConfig="getTableTreeConfig"
@refresh="refreshTable(false)"
@operationClick="onOperationClick"
/>
@@ -77,7 +78,7 @@
type="flex"
justify="end"
style="margin-top: 16px"
v-if="queryTable && queryTable.props.paged"
v-if="queryTable && queryTable.props.paged && getTableTreeConfig == null"
>
<el-pagination
:total="queryTableWidget.totalCount"
@@ -126,6 +127,7 @@
:getTableIndex="queryTableWidget.getTableIndex"
:sortChange="queryTableWidget.onSortChange"
:onSelectChange="onSelectRowChange"
:treeConfig="getTableTreeConfig"
@operationClick="onOperationClick"
@refresh="refreshTable(false)"
>
@@ -134,7 +136,7 @@
type="flex"
justify="end"
style="margin-top: 16px"
v-if="queryTable && queryTable.props.paged"
v-if="queryTable && queryTable.props.paged && getTableTreeConfig == null"
>
<el-pagination
:total="queryTableWidget.totalCount"
@@ -156,6 +158,7 @@
<script setup lang="ts">
import { ElMessage, ElMessageBox } from 'element-plus';
import { Close } from '@element-plus/icons-vue';
import { treeDataTranslate } from '@/common/utils';
import { ANY_OBJECT } from '@/types/generic';
import OnlineCustomTable from '@/online/components/OnlineCustomTable.vue';
import { TableOptions } from '@/common/types/pagination';
@@ -354,6 +357,17 @@ const loadTableData = (params: ANY_OBJECT) => {
httpCall
.then((res: ANY_OBJECT) => {
if (
queryTable.value &&
queryTable.value.props.treeFlag &&
queryTable.value.props.parentIdColumn
) {
res.data.dataList = treeDataTranslate(
res.data.dataList,
primaryColumnName.value,
queryTable.value.props.parentIdColumn,
);
}
resolve({
dataList: res.data.dataList,
totalCount: res.data.totalCount,
@@ -395,6 +409,7 @@ const activeOperationList = computed(() => {
return form.value.operationList;
});
const primaryColumnName = computed(() => {
if (dialogParams.value.isEdit) return;
let table = form.value.tableMap.get(queryTable.value.bindData.tableId);
if (table && Array.isArray(table.columnList)) {
for (let i = 0; i < table.columnList.length; i++) {
@@ -406,6 +421,20 @@ const primaryColumnName = computed(() => {
}
return null;
});
const getTableTreeConfig = computed(() => {
if (
queryTable.value &&
queryTable.value.props.treeFlag &&
queryTable.value.props.parentIdColumn
) {
return {
rowField: primaryColumnName.value,
parentField: queryTable.value.props.parentIdColumn,
};
} else {
return null;
}
});
const onCopyWidget = (widget: ANY_OBJECT) => {
activeWidgetList.value.push(widget);
@@ -582,7 +611,7 @@ const onOperationClick = (operation: ANY_OBJECT, row: ANY_OBJECT | null) => {
} else if (operation.type === SysCustomWidgetOperationType.EXPORT) {
onExport(operation);
} else if (operation.type === SysCustomWidgetOperationType.PRINT) {
onPrint(operation, row, selectRows.value, queryTable.value.showName + '.pdf');
onPrint(operation, row, selectRows.value, queryTable.value.showName);
} else if (operation.type === SysCustomWidgetOperationType.START_FLOW) {
console.log('启动流程');
onStartFlow(operation, row);

22
OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/dataModel/onlinePageTableColumnRule.vue
View File

@@ -112,7 +112,7 @@
>
<div v-if="currentColumn != null" style="padding: 20px" class="attibute-box">
<el-col class="attribute-item">
<el-form-item label="字段名：">
<el-form-item label="字段名">
<span :title="currentColumn.columnComment">{{ currentColumn.columnName }}</span>
<el-tag
:size="formItemSize"
@@ -124,7 +124,7 @@
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="字段类型：">
<el-form-item label="字段类型">
<span>{{ currentColumn.fullColumnType }}</span>
<el-tag :size="formItemSize" type="success" effect="dark" style="margin-left: 10px">{{
currentColumn.tag.objectFieldType
@@ -132,12 +132,12 @@
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="是否必填：">
<el-form-item label="是否必填">
<el-switch v-model="currentColumn.required" />
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="显示名称：">
<el-form-item label="显示名称">
<el-input
v-model="currentColumn.columnComment"
style="width: 278px"
@@ -147,7 +147,7 @@
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="字典数据：">
<el-form-item label="字典数据">
<el-select
v-model="currentColumn.dictId"
placeholder="选择字段绑定的字典"
@@ -167,7 +167,7 @@
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="过滤支持：">
<el-form-item label="过滤支持">
<el-radio-group v-model="currentColumn.filterType" @change="dirty = true">
<el-radio-button
v-for="item in SysOnlineColumnFilterType.getList()"
@@ -184,7 +184,7 @@
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="数据权限过滤：">
<el-form-item label="数据权限过滤">
<el-select
v-model="dataPermFilterType"
placeholder="字段用于数据权限过滤规则"
@@ -202,7 +202,7 @@
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="字段类别：">
<el-form-item label="字段类别">
<el-select
v-model="currentColumn.fieldKind"
clearable
@@ -227,7 +227,7 @@
currentColumn.fieldKind === SysOnlineFieldKind.UPLOAD_IMAGE
"
>
<el-form-item label="存储类型：">
<el-form-item label="存储类型">
<el-select
v-model="currentColumn.uploadFileSystemType"
clearable
@@ -247,7 +247,7 @@
currentColumn.fieldKind === SysOnlineFieldKind.UPLOAD_IMAGE
"
>
<el-form-item label="上传文件数量：">
<el-form-item label="上传文件数量">
<el-input-number
v-model="currentColumn.maxFileCount"
style="width: 278px"
@@ -778,7 +778,7 @@ onMounted(() => {
height: 35px;
padding: 0 10px;
margin-bottom: 8px;
font-size: 12px;
font-size: 14px;
color: #043254;
background: #f4f7fa;
border: 1px dashed #f3f9ff;

41
OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/dataModel/onlinePageVirtualColumn.vue
View File

@@ -131,25 +131,13 @@
</el-select>
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="结果字段类型" prop="objectFieldType">
<el-select
v-model="currentColumn.objectFieldType"
placeholder="结果字段类型"
@change="currentColumn.aggregationType = undefined"
>
<el-option
v-for="item in getVirtualColumnFieldType"
:key="item"
:value="item"
:label="item"
></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="聚合计算规则" prop="relationId">
<el-select v-model="currentColumn.aggregationType" placeholder="聚合字段计算规则">
<el-select
v-model="currentColumn.aggregationType"
placeholder="聚合字段计算规则"
@change="currentColumn.objectFieldType = undefined"
>
<el-option
v-for="item in getAggregationTypeList"
:key="item.id"
@@ -159,6 +147,18 @@
</el-select>
</el-form-item>
</el-col>
<el-col class="attribute-item">
<el-form-item label="结果字段类型" prop="objectFieldType">
<el-select v-model="currentColumn.objectFieldType" placeholder="结果字段类型">
<el-option
v-for="item in getVirtualColumnFieldType"
:key="item"
:value="item"
:label="item"
></el-option>
</el-select>
</el-form-item>
</el-col>
</div>
</el-form>
</div>
@@ -306,6 +306,11 @@ const aggregationColumn = computed(() => {
});
const getVirtualColumnFieldType = computed(() => {
if (!aggregationColumn.value) return [];
if (
currentColumn.value &&
currentColumn.value.aggregationType === SysOnlineAggregationType.GROUP_CONCAT
)
return ['String'];
switch (aggregationColumn.value.objectFieldType) {
case 'String':
@@ -346,6 +351,8 @@ const getAggregationTypeList = computed(() => {
) !== -1
);
}
case SysOnlineAggregationType.GROUP_CONCAT:
return true;
default:
return false;
}

5
OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/formDesign/components/CustomWidgetAttributeSetting.vue
View File

@@ -84,6 +84,8 @@ const buildAttributeList = () => {
attributeKey: attributeKey,
},
);
temp.disabled =
typeof temp.disabled === 'function' ? temp.disabled(formConfig()) : temp.disabled;
if (temp.visible == null || temp.visible) attributeList.value.push(temp);
}
});
@@ -94,18 +96,17 @@ const buildAttributeList = () => {
watch(
() => currentWidget.value,
() => {
console.log('CustomWidgetAttributeSetting.currentWidget change');
buildAttributeList();
},
{
immediate: true,
deep: true,
},
);
watch(
() => props.widget,
() => {
console.log('CustomWidgetAttributeSetting.widget change');
buildAttributeList();
},
{

2
OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/formDesign/components/CustomWidgetBindData.vue
View File

@@ -183,7 +183,7 @@ const formType = computed(() => {
return formConfig().form.formType;
});
const getValidTableList = computed(() => {
if (data.value.parent != null) {
if (data.value.hasParent) {
return formConfig().getTableWidgetTableList;
} else if (
data.value.widgetType === SysCustomWidgetType.Table ||

16
OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/formDesign/editTableColumn.vue
View File

@@ -12,7 +12,7 @@
label-position="right"
@submit.prevent
>
<el-form-item label="字段名：">
<el-form-item label="字段名">
<span :title="formData.columnComment">{{ formData.columnName }}</span>
<el-tag
:size="formItemSize"
@@ -22,16 +22,16 @@
>主键</el-tag
>
</el-form-item>
<el-form-item label="字段类型：">
<el-form-item label="字段类型">
<span>{{ formData.fullColumnType }}</span>
<el-tag :size="formItemSize" type="success" effect="dark" style="margin-left: 10px">{{
formData.objectFieldType
}}</el-tag>
</el-form-item>
<el-form-item label="是否必填：">
<el-form-item label="是否必填">
<el-switch v-model="formData.required" />
</el-form-item>
<el-form-item label="显示名称：">
<el-form-item label="显示名称">
<el-input
v-model="formData.columnComment"
style="width: 100%"
@@ -39,7 +39,7 @@
placeholder="字段在表单上的显示名称"
/>
</el-form-item>
<el-form-item label="字典数据：">
<el-form-item label="字典数据">
<el-select
v-model="formData.dictId"
placeholder="选择字段绑定的字典"
@@ -57,7 +57,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="过滤支持：">
<el-form-item label="过滤支持">
<el-radio-group v-model="formData.filterType" @change="dirty = true">
<el-radio-button
v-for="item in SysOnlineColumnFilterType.getList()"
@@ -72,7 +72,7 @@
</el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="字段类别：">
<el-form-item label="字段类别">
<el-select
v-model="formData.fieldKind"
clearable
@@ -94,7 +94,7 @@
formData.fieldKind === SysOnlineFieldKind.UPLOAD ||
formData.fieldKind === SysOnlineFieldKind.UPLOAD_IMAGE
"
label="存储类型："
label="存储类型"
>
<el-select
v-model="formData.uploadFileSystemType"

12
OrangeFormsOpen-VUE3/src/pages/online/editOnlinePage/formDesign/index.vue
View File

@@ -275,7 +275,7 @@
link
size="default"
:icon="Refresh"
style="font-size: 12px; color: #999; font-weight: normal"
style="font-size: 14px; color: #999; font-weight: normal"
@click="onClearWidget"
>重置表单</el-button
>
@@ -362,7 +362,7 @@
<span>属性</span>
</template>
<el-scrollbar :style="{ height: getClientHeight - 138 + 'px' }">
<el-row style="padding: 10px 16px">
<el-row style="padding: 16px">
<template v-if="currentWidget != null">
<CustomWidgetBindData v-model:value="currentWidget" />
<CustomWidgetAttributeSetting
@@ -381,7 +381,7 @@
<span>操作</span>
</template>
<el-scrollbar :style="{ height: getClientHeight - 138 + 'px' }">
<el-row style="width: 100%; padding: 10px 16px">
<el-row style="width: 100%; padding: 16px">
<!-- 组件操作 -->
<CustomFormOperateSetting
v-if="
@@ -1105,7 +1105,7 @@ defineExpose({
span {
overflow: hidden;
max-width: 100px;
font-size: 12px;
font-size: 14px;
text-overflow: ellipsis;
white-space: nowrap;
color: #333;
@@ -1115,7 +1115,7 @@ defineExpose({
.tag {
padding: 3px 8px;
margin-left: 8px;
font-size: 12px;
font-size: 14px;
color: #999;
background: #f6f7f9;
border-radius: 4px;
@@ -1299,7 +1299,7 @@ defineExpose({
}
.attribute-panel :deep(.el-form-item__label) {
padding-right: 0;
font-size: 12px;
font-size: 14px;
color: #666;
}
.attribute-panel :deep(.el-tabs__nav-wrap::after) {

2
OrangeFormsOpen-VUE3/src/pages/online/formOnlineDblink/index.vue
View File

@@ -9,7 +9,7 @@
>
<template v-slot:table>
<table-box
class="page-table"
style="padding-bottom: 16px"
:data="onlineDblinkWidget.dataList"
:size="layoutStore.defaultFormItemSize"
header-cell-class-name="table-header-gray"

2
OrangeFormsOpen-VUE3/src/pages/workflow/components/CopyForSelect/addCopyForItem.vue
View File

@@ -5,7 +5,7 @@
:model="formData"
class="full-width-input form-box"
style="width: 100%"
label-width="150px"
label-width="90px"
:size="layoutStore.defaultFormItemSize"
label-position="right"
@submit.prevent

4
OrangeFormsOpen-VUE3/src/pages/workflow/components/ProcessDesigner.vue
View File

@@ -36,9 +36,9 @@ import { ANY_OBJECT } from '@/types/generic';
import ProcessDesigner from '../package/process-designer/ProcessDesigner.vue';
import PropertiesPanel from '../package/refactor/PropertiesPanel.vue';
// 自定义元素选中时的弹出菜单（修改 默认任务 为 用户任务）
import CustomContentPadProvider from '../package/process-designer/plugins/content-pad';
import CustomContentPadProvider from '../package/process-designer/plugins/content-pad/index.js';
// 自定义左侧菜单（修改 默认任务 为 用户任务）
import CustomPaletteProvider from '../package/process-designer/plugins/palette';
import CustomPaletteProvider from '../package/process-designer/plugins/palette/index.js';
// Then register the languages you need
//hljs.registerLanguage('javascript', javascript);

2
OrangeFormsOpen-VUE3/src/pages/workflow/components/TagSelect.vue
View File

@@ -20,10 +20,10 @@
<script setup lang="ts">
import { ANY_OBJECT } from '@/types/generic';
import { useLayoutStore } from '@/store';
const emit = defineEmits<{ 'update:value': ANY_OBJECT[] | string[] }>();
const props = defineProps<{ value: string | Array<ANY_OBJECT> }>();
import { useLayoutStore } from '@/store';
const layoutStore = useLayoutStore();
const selectValues = ref<ANY_OBJECT[]>([]);

3
OrangeFormsOpen-VUE3/src/pages/workflow/components/TaskMultipleSelect.vue
View File

@@ -3,7 +3,7 @@
<slot />
<div class="tag-box" v-if="selectValues.length">
<el-tag
:size="layoutStore.defaultFormItemSize"
size="large"
effect="dark"
v-for="item in selectValues"
:key="item.id"
@@ -80,7 +80,6 @@ watch(
<style lang="scss" scoped>
.task-multiple-select {
:deep(.el-tag) {
padding-right: 4px;
margin-right: 8px;
color: #666;
background-color: #f6f6f6;

356
OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formEditFlowEntry.vue
View File

@@ -96,187 +96,189 @@
label-width="80px"
@submit.prevent
>
<el-col :span="24">
<el-form-item label="表单类型" prop="bindFormType">
<el-select
v-model="formFlowEntryData.bindFormType"
placeholder=""
@change="onBindFormTypeChange"
:disabled="isEdit"
>
<el-option
:label="
SysFlowEntryBindFormType.getValue(SysFlowEntryBindFormType.ROUTER_FORM)
"
:value="SysFlowEntryBindFormType.ROUTER_FORM"
/>
<el-option
:label="
SysFlowEntryBindFormType.getValue(SysFlowEntryBindFormType.ONLINE_FORM)
"
:value="SysFlowEntryBindFormType.ONLINE_FORM"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="流程名称" prop="processDefinitionName">
<el-input v-model="formFlowEntryData.processDefinitionName" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="流程标识" prop="processDefinitionKey">
<el-input v-model="formFlowEntryData.processDefinitionKey" :disabled="isEdit" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="流程分类" prop="categoryId">
<el-select
v-model="formFlowEntryData.categoryId"
placeholder=""
:loading="categoryIdWidget.loading"
@visible-change="categoryIdWidget.onVisibleChange"
>
<el-option
v-for="item in categoryIdWidget.dropdownList"
:key="item.id"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="工单编码">
<el-row type="flex" align="middle" style="flex-wrap: nowrap">
<el-input
v-model="formFlowEntryData.encodedRule.prefix"
style="width: 150px"
placeholder="前缀"
:disabled="!formFlowEntryData.encodedRule.calculateWhenView"
>
<template v-slot:prepend>
<el-checkbox v-model="formFlowEntryData.encodedRule.calculateWhenView" />
</template>
</el-input>
<el-row :gutter="16">
<el-col :span="24">
<el-form-item label="表单类型" prop="bindFormType">
<el-select
v-model="formFlowEntryData.encodedRule.precisionTo"
style="width: 160px; margin-left: 5px"
placeholder="日期精度"
:disabled="!formFlowEntryData.encodedRule.calculateWhenView"
v-model="formFlowEntryData.bindFormType"
placeholder=""
@change="onBindFormTypeChange"
:disabled="isEdit"
>
<el-option
v-for="item in SysAutoCodeType.getList()"
:key="item.id"
:label="item.name"
:value="item.id"
:label="
SysFlowEntryBindFormType.getValue(SysFlowEntryBindFormType.ROUTER_FORM)
"
:value="SysFlowEntryBindFormType.ROUTER_FORM"
/>
<el-option
:label="
SysFlowEntryBindFormType.getValue(SysFlowEntryBindFormType.ONLINE_FORM)
"
:value="SysFlowEntryBindFormType.ONLINE_FORM"
/>
</el-select>
<el-input
v-model="formFlowEntryData.encodedRule.middle"
style="width: 80px; margin-left: 5px"
placeholder="后缀"
:disabled="!formFlowEntryData.encodedRule.calculateWhenView"
/>
<el-input-number
v-model="formFlowEntryData.encodedRule.idWidth"
style="width: 100px; margin-left: 5px"
:controls="false"
placeholder="序号宽度"
:disabled="!formFlowEntryData.encodedRule.calculateWhenView"
/>
</el-row>
</el-form-item>
</el-col>
<el-col
:span="24"
v-if="formFlowEntryData.bindFormType === SysFlowEntryBindFormType.ONLINE_FORM"
>
<el-form-item label="流程页面" prop="pageId">
<el-select
v-model="formFlowEntryData.pageId"
:disabled="isEdit"
placeholder=""
:loading="pageIdWidget.loading"
@visible-change="pageIdWidget.onVisibleChange"
@change="onEntryPageChange"
>
<el-option
v-for="item in pageIdWidget.dropdownList"
:key="item.pageId"
:value="item.pageId"
:label="item.pageName"
/>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="24"
v-if="formFlowEntryData.bindFormType === SysFlowEntryBindFormType.ONLINE_FORM"
>
<el-form-item label="默认表单" prop="defaultFormId">
<el-select
v-model="formFlowEntryData.defaultFormId"
placeholder=""
:loading="defaultFormIdWidget.loading"
@visible-change="defaultFormIdWidget.onVisibleChange"
>
<el-option
v-for="item in defaultFormIdWidget.dropdownList"
:key="item.formId"
:value="item.formId"
:label="item.formName"
/>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="24"
v-if="formFlowEntryData.bindFormType === SysFlowEntryBindFormType.ROUTER_FORM"
>
<el-form-item label="默认表单" prop="defaultRouterName">
<el-input
v-model="formFlowEntryData.defaultRouterName"
clearable
placeholder="请填写路由名称"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="通知类型">
<el-select
v-model="formFlowEntryData.notifyTypes"
placeholder=""
clearable
multiple
>
<el-option label="邮件" value="email" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="级联删除业务数据" label-width="128px">
<el-switch v-model="formFlowEntryData.cascadeDeleteBusinessData" />
</el-form-item>
</el-col>
<el-col :span="24" v-if="isEdit && shareFormList.length > 0">
<el-form-item label="工单分享">
<el-row type="flex">
<el-button
v-for="form in (defaultFormIdWidget.dropdownList || []).filter(
item => item.formType === SysOnlineFormType.WORK_ORDER,
)"
:key="form.formId"
:class="form.formCode"
:data-clipboard-text="getFormShareInfo(form)"
title="生成分享链接"
@click="handleShare(form.formCode)"
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="流程名称" prop="processDefinitionName">
<el-input v-model="formFlowEntryData.processDefinitionName" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="流程标识" prop="processDefinitionKey">
<el-input v-model="formFlowEntryData.processDefinitionKey" :disabled="isEdit" />
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="流程分类" prop="categoryId">
<el-select
v-model="formFlowEntryData.categoryId"
placeholder=""
:loading="categoryIdWidget.loading"
@visible-change="categoryIdWidget.onVisibleChange"
>
{{ form.formName }}
</el-button>
</el-row>
</el-form-item>
</el-col>
<el-option
v-for="item in categoryIdWidget.dropdownList"
:key="item.id"
:value="item.id"
:label="item.name"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="工单编码">
<el-row type="flex" align="middle" style="flex-wrap: nowrap">
<el-input
v-model="formFlowEntryData.encodedRule.prefix"
style="width: 150px"
placeholder="前缀"
:disabled="!formFlowEntryData.encodedRule.calculateWhenView"
>
<template v-slot:prepend>
<el-checkbox v-model="formFlowEntryData.encodedRule.calculateWhenView" />
</template>
</el-input>
<el-select
v-model="formFlowEntryData.encodedRule.precisionTo"
style="width: 160px; margin-left: 5px"
placeholder="日期精度"
:disabled="!formFlowEntryData.encodedRule.calculateWhenView"
>
<el-option
v-for="item in SysAutoCodeType.getList()"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select>
<el-input
v-model="formFlowEntryData.encodedRule.middle"
style="width: 80px; margin-left: 5px"
placeholder="后缀"
:disabled="!formFlowEntryData.encodedRule.calculateWhenView"
/>
<el-input-number
v-model="formFlowEntryData.encodedRule.idWidth"
style="width: 100px; margin-left: 5px"
:controls="false"
placeholder="序号宽度"
:disabled="!formFlowEntryData.encodedRule.calculateWhenView"
/>
</el-row>
</el-form-item>
</el-col>
<el-col
:span="24"
v-if="formFlowEntryData.bindFormType === SysFlowEntryBindFormType.ONLINE_FORM"
>
<el-form-item label="流程页面" prop="pageId">
<el-select
v-model="formFlowEntryData.pageId"
:disabled="isEdit"
placeholder=""
:loading="pageIdWidget.loading"
@visible-change="pageIdWidget.onVisibleChange"
@change="onEntryPageChange"
>
<el-option
v-for="item in pageIdWidget.dropdownList"
:key="item.pageId"
:value="item.pageId"
:label="item.pageName"
/>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="24"
v-if="formFlowEntryData.bindFormType === SysFlowEntryBindFormType.ONLINE_FORM"
>
<el-form-item label="默认表单" prop="defaultFormId">
<el-select
v-model="formFlowEntryData.defaultFormId"
placeholder=""
:loading="defaultFormIdWidget.loading"
@visible-change="defaultFormIdWidget.onVisibleChange"
>
<el-option
v-for="item in defaultFormIdWidget.dropdownList"
:key="item.formId"
:value="item.formId"
:label="item.formName"
/>
</el-select>
</el-form-item>
</el-col>
<el-col
:span="24"
v-if="formFlowEntryData.bindFormType === SysFlowEntryBindFormType.ROUTER_FORM"
>
<el-form-item label="默认表单" prop="defaultRouterName">
<el-input
v-model="formFlowEntryData.defaultRouterName"
clearable
placeholder="请填写路由名称"
/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="通知类型">
<el-select
v-model="formFlowEntryData.notifyTypes"
placeholder=""
clearable
multiple
>
<el-option label="邮件" value="email" />
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="级联删除业务数据" label-width="128px">
<el-switch v-model="formFlowEntryData.cascadeDeleteBusinessData" />
</el-form-item>
</el-col>
<el-col :span="24" v-if="isEdit && shareFormList.length > 0">
<el-form-item label="工单分享">
<el-row type="flex">
<el-button
v-for="form in (defaultFormIdWidget.dropdownList || []).filter(
item => item.formType === SysOnlineFormType.WORK_ORDER,
)"
:key="form.formId"
:class="form.formCode"
:data-clipboard-text="getFormShareInfo(form)"
title="生成分享链接"
@click="handleShare(form.formCode)"
>
{{ form.formName }}
</el-button>
</el-row>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-col>
<!-- 流程变量设置 -->
@@ -313,9 +315,9 @@
<el-tag
:size="formItemSize"
effect="dark"
:type="scope.row.builtIn ? 'success' : 'danger'"
:type="scope.row.builtin ? 'success' : 'danger'"
>
{{ scope.row.builtIn ? '是' : '否' }}
{{ scope.row.builtin ? '是' : '否' }}
</el-tag>
</template>
</vxe-column>

2
OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formFlowEntry.vue
View File

@@ -109,7 +109,7 @@
</el-tag>
</template>
</vxe-column>
<vxe-column title="流程主版本" field="mainFlowEntryPublish">
<vxe-column title="流程主版本" field="mainFlowEntryPublish" width="200px">
<template v-slot="scope">
<el-tag
v-if="scope.row.mainFlowEntryPublish"

4
OrangeFormsOpen-VUE3/src/pages/workflow/flowEntry/formPublishedFlowEntry.vue
View File

@@ -58,7 +58,7 @@
</template>
</vxe-column>
<vxe-column title="发布时间" field="publishTime" min-width="150px" />
<vxe-column title="操作" fixed="right" width="200px">
<vxe-column title="操作" fixed="right" width="220px">
<template v-slot="scope">
<el-button
@click.stop="onSetActiveStatus(scope.row)"
@@ -83,7 +83,7 @@
link
:size="formItemSize"
>
设置为主版本
设置主版本
</el-button>
</template>
</vxe-column>

11
OrangeFormsOpen-VUE3/src/pages/workflow/handlerFlowTask/hook.ts
View File

@@ -18,6 +18,11 @@ export const useFlowAction = (props: IProp) => {
const dialogParams = computed(() => {
console.log('dialogParams props', props);
let operationList =
props.operationList == null || props.operationList === ''
? thirdParams.value.operationList
: props.operationList;
operationList = typeof operationList == 'string' ? JSON.parse(operationList) : operationList;
return {
isRuntime: props.isRuntime === 'true' || thirdParams.value.isRuntime || false,
isDraft: props.isDraft === 'true' || thirdParams.value.isDraft || false,
@@ -34,16 +39,14 @@ export const useFlowAction = (props: IProp) => {
processInstanceInitiator:
props.processInstanceInitiator || thirdParams.value.processInstanceInitiator,
taskName: props.taskName || thirdParams.value.taskName,
operationList:
typeof props.operationList == 'string'
? JSON.parse(props.operationList)
: props.operationList, // || thirdParams.value.operationList,
operationList: operationList,
variableList:
typeof props.variableList == 'string'
? JSON.parse(props.variableList)
: props.variableList || thirdParams.value.variableList,
};
});
// 加签
const submitConsign = (
assignee: Array<string> | string,
isAdd = true,

2
OrangeFormsOpen-VUE3/src/pages/workflow/handlerFlowTask/types.ts
View File

@@ -13,7 +13,7 @@ export interface IProp extends ThirdProps {
// 路由名称
routerName?: string;
// 只读页面
readOnly: boolean | string;
readOnly?: boolean | string;
// 消息id，用于抄送消息回显
messageId?: string;
// 流程实例id

10
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/PropertiesPanel.vue
View File

@@ -50,7 +50,7 @@
</div>
<div v-if="conditionFormVisible" key="status">
<div class="panel-title">更新工单状态</div>
<div class="panel-title">工单状态</div>
<SetApproveStatus :id="elementId" :type="elementType" />
</div>
</div>
@@ -295,7 +295,7 @@ onBeforeUnmount(() => {
}
}
.el-tabs__header {
margin-bottom: 10px !important;
margin-bottom: 15px !important;
}
.el-tabs__content {
overflow: auto;
@@ -326,7 +326,7 @@ onBeforeUnmount(() => {
}
.el-form-item__label {
font-size: 12px;
font-size: 14px;
color: #333;
}
@@ -338,7 +338,7 @@ onBeforeUnmount(() => {
display: flex;
justify-content: space-between;
align-items: center;
font-size: 12px;
font-size: 14px;
color: #333;
line-height: 32px;
}
@@ -350,7 +350,7 @@ onBeforeUnmount(() => {
margin-top: 0;
}
.el-table th {
font-size: 12px;
font-size: 14px;
color: #666 !important;
background-color: #f6f7f9 !important;
font-weight: normal;

10
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/base/ElementBaseInfo.vue
View File

@@ -1,6 +1,9 @@
<template>
<div>
<el-form :size="layoutStore.defaultFormItemSize" @submit.prevent label-position="top">
<el-form-item label="流程名称">
<el-input :value="flowEntry().value.processDefinitionName" :disabled="true" />
</el-form-item>
<el-form-item label="任务ID">
<el-input
v-model="elementBaseInfo.id"
@@ -34,14 +37,17 @@
<script setup lang="ts">
import { ref, onBeforeUnmount, watch, nextTick, inject } from 'vue';
import { ANY_OBJECT } from '@/types/generic';
import { useLayoutStore } from '@/store';
const layoutStore = useLayoutStore();
const props = withDefaults(
defineProps<{ businessObject: ANY_OBJECT; type?: string; idEditDisabled?: boolean }>(),
{ idEditDisabled: true },
);
import { useLayoutStore } from '@/store';
const layoutStore = useLayoutStore();
const flowEntry = inject('flowEntry', () => {
return {} as ANY_OBJECT;
});
const elementBaseInfo = ref<ANY_OBJECT>({});
let bpmnElement: ANY_OBJECT | null = null;

14
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/flowFormConfig.vue
View File

@@ -56,7 +56,7 @@
<span>表单权限设置</span>
<el-button
type="primary"
size="mini"
size="default"
style="margin-left: 18px"
@click="onSetOnlineFormAuth"
>设置</el-button
@@ -79,7 +79,7 @@
<vxe-column title="序号" width="70px" type="seq" />
<vxe-column title="按钮名称" min-width="100px">
<template v-slot="scope">
<span style="font-size: 12px">{{ scope.row.label }}</span>
<span>{{ scope.row.label }}</span>
</template>
</vxe-column>
<vxe-column title="按钮类型" min-width="100px">
@@ -138,15 +138,11 @@ const layoutStore = useLayoutStore();
const props = defineProps<{ id: string; type: string; tabType: string }>();
const flowEntry = inject('flowEntry', () => {
console.warn('flowFormConfig not inject flowEntry yet.');
return {} as ANY_OBJECT;
});
console.log('flowEntry()', flowEntry());
const formList = inject('formList', () => {
console.warn('flowFormConfig not inject formList yet.');
return {} as ANY_OBJECT;
});
console.log('formList()', formList());
const prefix = inject('prefix');
const win: ANY_OBJECT = window;
@@ -249,6 +245,12 @@ const onSetOnlineFormAuth = () => {
{
formAuth: formData.value.formAuth || {},
formWidgetConfig: tempConfig,
path: 'thirdSetOnlineFormAuth',
},
{
width: '1000px',
height: '700px',
pathName: '/thirdParty/formSetOnlineFormAuth',
},
)
.then(res => {

2
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/formEditOperation.vue
View File

@@ -41,7 +41,7 @@
</el-form-item>
</el-col>
<el-col :span="24">
<el-form-item label="更新工单状态">
<el-form-item label="工单状态">
<el-select
class="input-item"
v-model="formData.latestApprovalStatus"

4
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/formSetOnlineFormAuth.vue
View File

@@ -18,7 +18,7 @@
<template #default="scope">
<el-switch
v-model="scope.row.disabled"
size="mini"
size="default"
@change="val => onWidgetDisableChange(scope.row, val)"
/>
</template>
@@ -27,7 +27,7 @@
<template #default="scope">
<el-switch
v-model="scope.row.hidden"
size="mini"
size="default"
@change="val => onWidgetHideChange(scope.row, val)"
/>
</template>

4
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/listeners/ElementListeners.vue
View File

@@ -13,7 +13,7 @@
{{ listenerTypeObject[scope.row.listenerType] }}
</template>
</vxe-column>
<vxe-column title="操作" width="90px">
<vxe-column title="操作" width="110px">
<template v-slot="{ row, $rowIndex }">
<el-button
:size="layoutStore.defaultFormItemSize"
@@ -298,10 +298,10 @@ import { ElMessageBox } from 'element-plus';
import { Menu } from '@element-plus/icons-vue';
import { VxeTable, VxeColumn, SizeType } from 'vxe-table';
import { ANY_OBJECT } from '@/types/generic';
import { useLayoutStore } from '@/store';
import { createListenerObject, updateElementExtensions } from '../../utils';
import { initListenerType, initListenerForm, listenerType, fieldType } from './utilSelf';
import { useLayoutStore } from '@/store';
const layoutStore = useLayoutStore();
const props = defineProps<{ id: string; type: string }>();

5
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/listeners/UserTaskListeners.vue
View File

@@ -12,13 +12,12 @@
{{ listenerEventTypeObject[scope.row.event] }}
</template>
</vxe-column>
<vxe-column title="监听器ID" min-width="80px" field="id" show-overflow-tooltip />
<vxe-column title="监听器类型" min-width="80px" show-overflow-tooltip>
<template v-slot="scope">
{{ listenerTypeObject[scope.row.listenerType] }}
</template>
</vxe-column>
<vxe-column title="操作" width="90px">
<vxe-column title="操作" width="110px">
<template v-slot="{ row, $rowIndex }">
<el-button
:size="layoutStore.defaultFormItemSize"
@@ -332,10 +331,10 @@ import { ElMessageBox } from 'element-plus';
import { Menu } from '@element-plus/icons-vue';
import { VxeTable, VxeColumn } from 'vxe-table';
import { ANY_OBJECT } from '@/types/generic';
import { useLayoutStore } from '@/store';
import { createListenerObject, updateElementExtensions } from '../../utils';
import { initListenerType, initListenerForm, eventType, listenerType, fieldType } from './utilSelf';
import { useLayoutStore } from '@/store';
const layoutStore = useLayoutStore();
const props = defineProps<{ id: string; type: string }>();

10
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/multi-instance/ElementMultiInstance.vue
View File

@@ -62,8 +62,8 @@
<el-form-item label="完成条件" key="completionCondition">
<el-input
v-model="loopInstanceForm.completionCondition"
clearable
:disabled="loopCharacteristics === 'SequentialMultiInstance'"
clearable
@change="updateLoopCondition"
/>
</el-form-item>
@@ -170,7 +170,7 @@ const defaultLoopInstanceForm = {
const loopInstanceForm = ref<ANY_OBJECT>({
collection: 'assigneeList',
elementVariable: 'assignee',
completionCondition: '',
completionCondition: '${nrOfInstances == nrOfCompletedInstances}',
});
const variableList = [
{
@@ -290,7 +290,9 @@ const getElementLoop = (businessObject: ANY_OBJECT) => {
loopInstanceForm.value = {
...defaultLoopInstanceForm,
...businessObject.loopCharacteristics,
completionCondition: businessObject.loopCharacteristics?.completionCondition?.body ?? '',
completionCondition:
businessObject.loopCharacteristics?.completionCondition?.body ??
'${nrOfInstances == nrOfCompletedInstances}',
loopCardinality: businessObject.loopCharacteristics?.loopCardinality?.body ?? '',
};
// 保留当前元素 businessObject 上的 loopCharacteristics 实例
@@ -307,7 +309,7 @@ const getElementLoop = (businessObject: ANY_OBJECT) => {
}
};
const changeLoopCharacteristicsType = (type: string) => {
if (type === 'SequentialMultiInstance') {
if (type === 'SequentialMultiInstance' || loopInstanceForm.value.completionCondition === '') {
// eslint-disable-next-line no-template-curly-in-string
loopInstanceForm.value.completionCondition = '${nrOfInstances == nrOfCompletedInstances}';
}

2
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/properties/ElementProperties.vue
View File

@@ -11,7 +11,7 @@
<vxe-column title="序号" width="70px" type="seq" />
<vxe-column title="属性名" field="name" min-width="100px" show-overflow-tooltip />
<vxe-column title="属性值" field="value" min-width="90px" show-overflow-tooltip />
<vxe-column title="操作" width="100px">
<vxe-column title="操作" width="110px">
<template v-slot="{ row, $rowIndex }">
<el-button
type="primary"

4
OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/task/task-components/UserTask.vue
View File

@@ -908,7 +908,7 @@ watch(candidateGroupIds, () => {
}
.el-radio__label {
padding-left: 4px;
font-size: 12px;
font-size: 14px;
color: #333;
font-weight: normal;
}
@@ -929,7 +929,7 @@ watch(candidateGroupIds, () => {
display: inline-block;
float: right;
i {
font-size: 12px;
font-size: 14px;
transform: scale(0.8);
}
& > .icon {