docs: 修正二开文档里一处代码错误

fix: 移除代码生成器中列表页的审批对话框(已经改为路由,对话框无用),以及行中的发起流程按钮,现在查看按钮可以同时处理表单和流程
fix: 环境变量不在git里保存,防止多人开发时互相覆盖
This commit is contained in:
gaoyunqi
2024-06-12 11:38:57 +08:00
parent 832c0f94d8
commit 76a2203237
9 changed files with 721 additions and 725 deletions

View File

@ -581,55 +581,6 @@ export function buildListCode(model: GeneratorConfig): string {
</BasicTable>
${model.listConfig.isLeftMenu ? '</div>' : ''}
${
hasStartWorkButton
? `
<LookProcess
v-if="visibleLookProcessRef"
:taskId="taskIdRef"
:processId="processIdRef"
@close="visibleLookProcessRef = false"
:visible="visibleLookProcessRef"
/>
<LaunchProcess
v-if="visibleLaunchProcessRef"
:schemaId="schemaIdRef"
:form-data="formDataRef"
:form-id="formIdComputedRef"
:rowKeyData="rowKeyData"
:draftsId="draftsId"
@close="handleCloseLaunch"
/>
<ApprovalProcess
v-if="visibleApproveProcessRef"
:taskId="taskIdRef"
:processId="processIdRef"
:schemaId="schemaIdRef"
@close="handleCloseApproval"
:visible="visibleApproveProcessRef"
/>
${
hasFlowRecordButton
? `<BasicModal
v-if="visibleFlowRecordModal"
:visible="visibleFlowRecordModal"
:title="t('查看流转记录')"
:paddingRight="15"
:showOkBtn="false"
:width="1200"
@visible-change="
(v) => {
visibleFlowRecordModal = v;
}
"
:bodyStyle="{ minHeight: '400px !important' }"
>
<FlowRecord :processId="processIdRef" />
</BasicModal>`
: ''
}`
: ''
}
${
hasTemplatePrint
? ` <PrintPreview
@ -999,8 +950,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
});
function dbClickRow(record) {
if (record.workflowData?.taskIds && record.workflowData.taskIds.length) {
const { processId, taskIds, schemaId } = record.workflowData;
const { processId, taskIds, schemaId } = record.workflowData || {};
if (taskIds && taskIds.length) {
router.push({
path: '/flow/' + schemaId + '/' + (processId || '') + '/approveFlow',
query: {
@ -1008,8 +959,7 @@ ${hasTemplatePrint ? ' reactive ' : ''}
formName: formName
}
});
} else if (record.workflowData?.schemaId && !record.workflowData.taskIds && record.workflowData.processId) {
const { processId, schemaId } = record.workflowData;
} else if (schemaId && !taskIds && processId) {
router.push({
path: '/flow/' + schemaId + '/' + processId + '/approveFlow',
query: {
@ -1377,13 +1327,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
${
formType === 'modal'
? `
router.push({
path: '/form/${lowerClassName}/' + record.id + '/viewForm',
query: {
formPath: '${model.outputConfig.outputValue}/${lowerClassName}',
formName: formName
}
});`
dbClickRow(record);
`
: `
openDrawer(true, {
isView: true,
@ -1527,38 +1472,8 @@ ${hasTemplatePrint ? ' reactive ' : ''}
if (record.workflowData?.enabled) {
//与工作流有关联的表单
if (record.workflowData.status) {
//如果是本人需要审批的数据 就会有taskIds 所以需要修改绑定事件
const act: ActionItem = {};
if (record.workflowData.taskIds) {
act.tooltip = '查看流程(待审批)';
act.icon = 'daishenpi|svg';
act.onClick = handleApproveProcess.bind(null, record);
} else {
act.tooltip =
'查看流程' + (record.workflowData.status === 'ACTIVE' ? '(审批中)' : '(已完成)');
act.icon =
record.workflowData.status === 'ACTIVE' ? 'jinshenpi|svg' : 'shenpiwancheng|svg';
act.onClick = handleStartwork.bind(null, record);
}
actionsList.unshift(act);
${
hasFlowRecordButton
? `if (hasFlowRecord) {
actionsList.splice(1, 0, {
tooltip: '查看流转记录',
icon: 'liuzhuanxinxi|svg',
onClick: handleFlowRecord.bind(null, record),
});
}`
: ''
}
// 查看按钮现在同时有流程和表单的功能
} else {
actionsList.unshift({
icon: 'faqishenpi|svg',
tooltip: record.workflowData.draftId ? '编辑草稿' : '发起审批' ,
onClick: handleLaunchProcess.bind(null, record),
});
actionsList = actionsList.concat(editAndDelBtn);
}
} else {
@ -1778,7 +1693,7 @@ export function buildSimpleFormCode(model: GeneratorConfig, _tableInfo: TableInf
}
emits('form-mounted', formProps);
} catch (error) {
}
});
// 根据菜单页面权限,设置表单属性(必填,禁用,显示)
@ -1811,7 +1726,7 @@ export function buildSimpleFormCode(model: GeneratorConfig, _tableInfo: TableInf
systemFormRef.value,
formProps.schemas); //表单事件:获取表单数据
} catch (error) {
}
}
// 辅助设置表单数据
@ -1911,7 +1826,7 @@ ${
<ModalForm ref="formRef" :fromPage="FromPageType.MENU" />
</BasicDrawer>`
}
</template>
<script lang="ts" setup>
import { ref, computed, reactive } from 'vue';