github
/
jeecg-boot-vue3
mirror of https://github.com/jeecgboot/jeecgboot-vue3
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into master

pull/824/head
EightMonth 2023-11-03 13:31:11 +08:00 committed by GitHub
parent d1b81ad018 734068c685
commit e07dd17625
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -47,7 +47,7 @@ JeecgBoot-Vue3采用 Vue3.0、Vite、 Ant-Design-Vue3、TypeScript 等新技术
- 官方文档：[http://help.jeecg.com](http://help.jeecg.com)
- 官方网站： [http://www.jeecg.com](http://www.jeecg.com)
- 快速入门：[快速入门](http://jeecg.com/doc/quickstart) | [常见问题](http://help.jeecg.com/qa.html) | [视频教程](https://www.bilibili.com/video/BV1V34y187Y9 "入门视频") | [ 代码生成](http://help.jeecg.com/vue3/codegen/online.html)
- QQ交流群：⑦791696430、683903138
- QQ交流群：⑧825232878、⑦791696430(满)、683903138(满)
- 在线演示 ： [Vue3演示](http://boot3.jeecg.com) | [APP演示](http://jeecg.com/appIndex)| [敲敲云零代码](https://www.qiaoqiaoyun.com)
> 演示系统的登录账号密码，请点击 [获取账号密码](http://jeecg.com/doc/demo) 获取

4
src/components/Form/src/components/ApiSelect.vue
View File

@ -113,6 +113,10 @@
},
{ deep: true }
);
//监听数值修改，查询数据
watchEffect(() => {
props.value && handleFetch();
});
async function fetch() {
const api = props.api;

9
src/components/Form/src/jeecg/components/JInput.vue
View File

@ -3,10 +3,11 @@
</template>
<script lang="ts">
import { defineComponent, PropType, ref, watchEffect, unref, watch } from 'vue';
import { defineComponent, PropType, ref, watchEffect, unref, watch, computed } from 'vue';
import { useAttrs } from '/@/hooks/core/useAttrs';
import { propTypes } from '/@/utils/propTypes';
import { JInputTypeEnum } from '/@/enums/jeecgEnum.ts';
import { omit } from 'lodash-es';
export default defineComponent({
name: 'JInput',
@ -22,8 +23,12 @@
const attrs = useAttrs();
//表单值
const showText = ref('');
// update-begin--author:liaozhiyang---date:20231026---for：【issues/803】JIput updateSchema不生效
//绑定属性
const getBindValue = Object.assign({}, unref(props), unref(attrs));
const getBindValue = computed(() => {
return omit(Object.assign({}, unref(props), unref(attrs)), ['value']);
});
// update-end--author:liaozhiyang---date:20231026---for：【issues/803】JIput updateSchema不生效
//监听类型变化
watch(
() => props.type,

10
src/components/Form/src/jeecg/components/modal/PositionSelectModal.vue
View File

@ -100,6 +100,16 @@
xl: 10,
xxl: 10,
},
//update-begin-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
actionColOptions: {
xs: 24,
sm: 8,
md: 8,
lg: 8,
xl: 8,
xxl: 8,
},
//update-end-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
schemas: [
{
label: '职务名称',

10
src/components/Form/src/jeecg/components/modal/RoleSelectModal.vue
View File

@ -67,6 +67,16 @@
xl: 14,
xxl: 14,
},
//update-begin-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
actionColOptions: {
xs: 24,
sm: 8,
md: 8,
lg: 8,
xl: 8,
xxl: 8,
},
//update-end-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
schemas: [
{
label: '角色名称',

10
src/components/Form/src/jeecg/components/modal/UserSelectByDepModal.vue
View File

@ -110,6 +110,16 @@
xl: 6,
xxl: 10,
},
//update-begin-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
actionColOptions: {
xs: 24,
sm: 12,
md: 12,
lg: 12,
xl: 8,
xxl: 8,
},
//update-end-author:liusq date:2023-10-30 for: [issues/5514]组件页面显示错位
schemas: [
{
label: '账号',

6
src/components/Form/src/jeecg/hooks/useSelectBiz.ts
View File

@ -1,5 +1,6 @@
import { inject, reactive, ref, watch, unref, Ref } from 'vue';
import { useMessage } from '/@/hooks/web/useMessage';
import { isEmpty } from '@/utils/is';
export function useSelectBiz(getList, props) {
//接收下拉框选项
@ -25,7 +26,10 @@ export function useSelectBiz(getList, props) {
watch(
selectValues,
() => {
if (selectValues['change'] == false) {
//update-begin-author:liusq---date:2023-10-19--for: [issues/788]判断有设置数值才去加载
//if (selectValues['change'] == false && !isEmpty(selectValues['value'])) {
if (selectValues['change'] == false && !isEmpty(selectValues['value'])) {
//update-end-author:liusq---date:2023-10-19--for: [issues/788]判断有设置数值才去加载
//update-begin---author:wangshuai ---date:20220412 for：[VUEN-672]发文草稿箱编辑时拟稿人显示用户名------------
let params = {};
params[props.rowKey] = selectValues['value'].join(',');

19
src/components/jeecg/JVxeTable/src/hooks/useToolbar.ts
View File

@ -20,12 +20,20 @@ export function useToolbar(props: JVxeTableProps, data: JVxeDataProps, methods:
// 保存事件
onSave: () => methods.trigger('save'),
onRemove() {
let $table = methods.getXTable();
let deleteRows = methods.filterNewRows(data.selectedRows.value);
const $table = methods.getXTable();
// update-begin--author:liaozhiyang---date:20231018---for：【QQYUN-6805】修复asyncRemove字段不生效
// 触发删除事件
if (deleteRows.length > 0) {
let removeEvent: any = { deleteRows, $table};
if (props.asyncRemove) {
if (data.selectedRows.value.length > 0) {
const deleteOldRows = methods.filterNewRows(data.selectedRows.value);
const removeEvent: any = { deleteRows: data.selectedRows.value, $table };
const insertRecords = $table.getInsertRecords();
if (props.asyncRemove && deleteOldRows.length) {
data.selectedRows.value.forEach((item) => {
// 删除新添加的数据id
if (insertRecords.includes(item)) {
delete item.id;
}
});
// 确认删除，只有调用这个方法才会真删除
removeEvent.confirmRemove = () => methods.removeSelection();
} else {
@ -35,6 +43,7 @@ export function useToolbar(props: JVxeTableProps, data: JVxeDataProps, methods:
} else {
methods.removeSelection();
}
// update-end--author:liaozhiyang---date:20231018---for：【QQYUN-6805】修复asyncRemove字段不生效
},
// 清除选择事件
onClearSelection: () => methods.clearSelection(),

2
src/views/system/user/user.data.ts
View File

@ -191,6 +191,7 @@ export const formSchema: FormSchema[] = [
api: getAllRolesListNoByTenant,
labelField: 'roleName',
valueField: 'id',
immediate: false,
},
},
{
@ -228,6 +229,7 @@ export const formSchema: FormSchema[] = [
numberToString: true,
labelField: 'name',
valueField: 'id',
immediate: false,
},
},
{