hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-07-24 16:05:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro

Browse Source
This commit is contained in:
shizhong
2023-02-06 11:35:34 +08:00
parent 4247061b96 c3f95aa9ee
commit c0639d713f
893 changed files with 23094 additions and 8780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-ui-admin/src/components/DocAlert/index.vue
View File

@ -28,5 +28,6 @@ export default {
<style scoped>
.el-alert--success.is-light {
margin-bottom: 10px;
cursor: pointer;
}
</style>

112
yudao-ui-admin/src/components/bpmnProcessDesigner/package/penal/base/ElementBaseInfo.vue
View File

@ -1,23 +1,51 @@
<template>
<div class="panel-tab__content">
<el-form size="mini" label-width="90px" :model="model" :rules="rules" @submit.native.prevent>
<div v-if="elementBaseInfo.$type === 'bpmn:Process'"> <!-- 如果是 Process 信息的时候，使用自定义表单 -->
<el-link href="https://doc.iocoder.cn/bpm/#_3-%E6%B5%81%E7%A8%8B%E5%9B%BE%E7%A4%BA%E4%BE%8B"
type="danger" target="_blank">如何实现实现会签、或签？</el-link>
<el-form
size="mini"
label-width="90px"
:model="model"
:rules="rules"
@submit.native.prevent
>
<div v-if="elementBaseInfo.$type === 'bpmn:Process'">
<!-- 如果是 Process 信息的时候，使用自定义表单 -->
<el-link
href="https://doc.iocoder.cn/bpm/#_3-%E6%B5%81%E7%A8%8B%E5%9B%BE%E7%A4%BA%E4%BE%8B"
type="danger"
target="_blank"
>如何实现实现会签、或签？</el-link
>
<el-form-item label="流程标识" prop="key">
<el-input v-model="model.key" placeholder="请输入流标标识"
:disabled="model.id !== undefined && model.id.length > 0" @change="handleKeyUpdate" />
<el-input
v-model="model.key"
placeholder="请输入流标标识"
:disabled="model.id !== undefined && model.id.length > 0"
@change="handleKeyUpdate"
/>
</el-form-item>
<el-form-item label="流程名称" prop="name">
<el-input v-model="model.name" placeholder="请输入流程名称" clearable @change="handleNameUpdate" />
<el-input
v-model="model.name"
placeholder="请输入流程名称"
clearable
@change="handleNameUpdate"
/>
</el-form-item>
</div>
<div v-else>
<el-form-item label="ID">
<el-input v-model="elementBaseInfo.id" clearable @change="updateBaseInfo('id')"/>
<el-input
v-model="elementBaseInfo.id"
clearable
@change="updateBaseInfo('id')"
/>
</el-form-item>
<el-form-item label="名称">
<el-input v-model="elementBaseInfo.name" clearable @change="updateBaseInfo('name')" />
<el-input
v-model="elementBaseInfo.name"
clearable
@change="updateBaseInfo('name')"
/>
</el-form-item>
</div>
</el-form>
@ -31,7 +59,7 @@ export default {
businessObject: Object,
model: Object, // 流程模型的数据
},
data() {
data () {
return {
elementBaseInfo: {},
// 流程表单的下拉框的数据
@ -41,14 +69,14 @@ export default {
key: [{ required: true, message: "流程标识不能为空", trigger: "blur" }],
name: [{ required: true, message: "流程名称不能为空", trigger: "blur" }],
},
};
}
},
watch: {
businessObject: {
immediate: false,
handler: function(val) {
handler: function (val) {
if (val) {
this.$nextTick(() => this.resetBaseInfo());
this.$nextTick(() => this.resetBaseInfo())
}
}
},
@ -59,7 +87,7 @@ export default {
// }
// }
},
created() {
created () {
// 针对上传的 bpmn 流程图时，需要延迟 1 秒的时间，保证 key 和 name 的更新
setTimeout(() => {
this.handleKeyUpdate(this.model.key)
@ -67,53 +95,53 @@ export default {
}, 1000)
},
methods: {
resetBaseInfo() {
this.bpmnElement = window?.bpmnInstances?.bpmnElement;
this.elementBaseInfo = JSON.parse(JSON.stringify(this.bpmnElement.businessObject));
resetBaseInfo () {
this.bpmnElement = window?.bpmnInstances?.bpmnElement
this.elementBaseInfo = JSON.parse(JSON.stringify(this.bpmnElement.businessObject))
},
handleKeyUpdate(value) {
handleKeyUpdate (value) {
// 校验 value 的值，只有 XML NCName 通过的情况下，才进行赋值。否则，会导致流程图报错，无法绘制的问题
if (!value) {
return;
}
if (!value.match(/[a-zA-Z_][\-_.0-9a-zA-Z$]*/)) {
console.log('key 不满足 XML NCName 规则，所以不进行赋值');
return;
}
console.log('key 满足 XML NCName 规则，所以进行赋值');
// 在 BPMN 的 XML 中，流程标识 key，其实对应的是 id 节点
this.elementBaseInfo['id'] = value;
this.updateBaseInfo('id');
},
handleNameUpdate(value) {
if (!value) {
return
}
this.elementBaseInfo['name'] = value;
this.updateBaseInfo('name');
if (!value.match(/[a-zA-Z_][\-_.0-9a-zA-Z$]*/)) {
console.log('key 不满足 XML NCName 规则，所以不进行赋值')
return
}
console.log('key 满足 XML NCName 规则，所以进行赋值')
// 在 BPMN 的 XML 中，流程标识 key，其实对应的是 id 节点
this.elementBaseInfo['id'] = value
this.updateBaseInfo('id')
},
handleDescriptionUpdate(value) {
handleNameUpdate (value) {
if (!value) {
return
}
this.elementBaseInfo['name'] = value
this.updateBaseInfo('name')
},
handleDescriptionUpdate (value) {
// TODO 芋艿：documentation 暂时无法修改，后续在看看
// this.elementBaseInfo['documentation'] = value;
// this.updateBaseInfo('documentation');
},
updateBaseInfo(key) {
updateBaseInfo (key) {
// 触发 elementBaseInfo 对应的字段
const attrObj = Object.create(null);
attrObj[key] = this.elementBaseInfo[key];
const attrObj = Object.create(null)
attrObj[key] = this.elementBaseInfo[key]
if (key === "id") {
window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
id: this.elementBaseInfo[key],
di: { id: `${this.elementBaseInfo[key]}_di` }
});
})
} else {
window.bpmnInstances.modeling.updateProperties(this.bpmnElement, attrObj);
window.bpmnInstances.modeling.updateProperties(this.bpmnElement, attrObj)
}
}
},
beforeDestroy() {
this.bpmnElement = null;
beforeDestroy () {
this.bpmnElement = null
}
};
</script>

2
yudao-ui-admin/src/store/modules/permission.js
View File

@ -73,6 +73,8 @@ function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
} else {
route.component = ParentView
}
// 解决只有一个菜单时无法显示目录
route.alwaysShow = true
} else { // 根节点
route.component = loadView(route.component)
}

7
yudao-ui-admin/src/utils/request.js
View File

@ -119,6 +119,13 @@ service.interceptors.response.use(async res => {
type: 'error'
})
return Promise.reject(new Error(msg))
} else if (code === 501) {
Message({
type: 'error',
duration: 0,
message: msg
})
return Promise.reject(new Error(msg))
} else if (code === 901) {
Message({
type: 'error',

22
yudao-ui-admin/src/views/bpm/processInstance/detail.vue
View File

@ -163,10 +163,7 @@ export default {
rules: {
assigneeUserId: [{ required: true, message: "新审批人不能为空", trigger: "change" }],
}
},
// 数据字典
categoryDictDatas: getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY),
}
};
},
created() {
@ -275,23 +272,6 @@ export default {
this.tasksLoad = false;
});
},
/** 处理选择流程的按钮操作 **/
handleSelect(row) {
// 设置选择的流程
this.selectProcessInstance = row;
// 流程表单
if (row.formId) {
// 设置对应的表单
this.detailForm = {
...JSON.parse(row.formConf),
fields: decodeFields(row.formFields)
}
} else if (row.formCustomCreatePath) {
this.$router.push({ path: row.formCustomCreatePath});
// 这里暂时无需加载流程图，因为跳出到另外个 Tab；
}
},
getDateStar(ms) {
return getDate(ms);
},

2
yudao-ui-admin/src/views/bpm/processInstance/index.vue
View File

@ -58,7 +58,7 @@
</el-table-column>
<el-table-column label="当前审批任务" align="center" prop="tasks">
<template v-slot="scope">
<el-button v-for="task in scope.row.tasks" :key="task.id" type="text" @click="handleFormDetail(task.id)">
<el-button v-for="task in scope.row.tasks" :key="task.id" type="text"">
<span>{{ task.name }}</span>
</el-button>
</template>

4
yudao-ui-admin/src/views/infra/build/RightPanel.vue
View File

@ -545,7 +545,7 @@
<el-switch v-model="activeData.__config__.required" />
</el-form-item>
<template v-if="activeData.__config__.layoutTree">
<template v-if="activeData.__config__.layoutTree" v-slot="{ node, data }">
<el-divider>布局结构树</el-divider>
<el-tree
:data="[activeData.__config__]"
@ -554,7 +554,7 @@
default-expand-all
draggable
>
<span v-slot="{ node, data }">
<span>
<span class="node-label">
<svg-icon class="node-icon" :icon-class="data.__config__?data.__config__.tagIcon:data.tagIcon" />
{{ node.label }}

3
yudao-ui-admin/src/views/infra/swagger/index.vue
View File

@ -11,7 +11,8 @@ export default {
components: { iFrame },
data() {
return {
url: process.env.VUE_APP_BASE_API + "/doc.html"
// url: process.env.VUE_APP_BASE_API + "/doc.html"
url: process.env.VUE_APP_BASE_API + "/swagger-ui"
};
},
};

1
yudao-ui-admin/src/views/mall/market/banner/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

3
yudao-ui-admin/src/views/mall/product/brand/index.vue
View File

@ -1,7 +1,8 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
« <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="品牌名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入品牌名称" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>

1
yudao-ui-admin/src/views/mall/product/category/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

1
yudao-ui-admin/src/views/mall/product/property/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

2
yudao-ui-admin/src/views/mall/product/property/value.vue
View File

@ -1,5 +1,7 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="属性项" prop="propertyId">
<el-select v-model="queryParams.propertyId">

2
yudao-ui-admin/src/views/mall/product/spu/index.vue
View File

@ -1,5 +1,7 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="商品名称" prop="name">
<el-input v-model="queryParams.name" placeholder="请输入商品名称" clearable @keyup.enter.native="handleQuery"/>

2
yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
View File

@ -1,5 +1,7 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="会员昵称" prop="nickname">

1
yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="82px">

1
yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

1
yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

1
yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"

1
yudao-ui-admin/src/views/mall/promotion/seckill/seckillTime/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">

1
yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
View File

@ -1,5 +1,6 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">

2
yudao-ui-admin/src/views/mall/trade/order/index.vue
View File

@ -1,5 +1,7 @@
<template>
<div class="app-container">
<doc-alert title="功能开启" url="https://doc.iocoder.cn/mall/build/" />
<!-- 搜索工作栏 -->
<!-- TODO: inline 看看是不是需要; v-show= 那块逻辑还是要的 -->
<el-row :gutter="20">