mirror of
https://github.com/jeecgboot/JeecgBoot.git
synced 2025-12-13 21:52:48 +00:00
commit b7519d71992b644f6c17643169959983c8d92669
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 15:18:52 2025 +0800
中文乱码
commit 81ba07c853d18115d2bacb1f940b60e209fc0a4b
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 15:09:21 2025 +0800
增加代码生成用法文档
commit 92ed296e634f427a6d9dbe47636dc50aa5e80de0
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 14:04:22 2025 +0800
【issues/8709】LayoutContent样式多出1px
commit c2aff84914750c20659e93b9bf6ca92a1308e29f
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 14:04:09 2025 +0800
【issues/8683】DatePicker组件的componentProps使用函数形式时初始值获取不对
commit e002cd3bf3861111c1619b28490251a36c2985de
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 14:03:51 2025 +0800
【issues/8680】editComponentProps 可接受一个函数传入record
commit 1de07ff3ffa5fb77fa972c76f7daf9073f058915
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 14:03:32 2025 +0800
-- author:liaozhiyang---date:20250813--for:【issues/8690】BasicTable的rowSelection新增onSelect方法 ---
commit 35852d41f1582010cf4c97ebdf23d17b412873cd
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 14:03:04 2025 +0800
jvxeTable表格切换disabled属性时,相邻的两个枚举下拉,如果值是一样的,但是label不一样,会把第二个下拉的显示值渲染到第一个下拉中 #8593
commit a2cb1d9f25fbcd03711515008b901f3ad6f25819
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 14:00:01 2025 +0800
【issues/8529】setColumns将原本隐藏的列展示后,列配置里却没有勾选该列
commit 2002af54d0ec9128debaf1eccb5afb0f677f0c14
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 13:59:42 2025 +0800
JVxeTypes.image组件action字段只能定义第1张图片的上传接口,后面图片的接口还是使用公共上传接口 #8628
commit 89747403a2c16314746c952665569aa9335425d4
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 13:59:28 2025 +0800
JVxeTable组件全选翻页后会被取消选中 #8630
commit 3db0995c3f0bb3b1825fe7989721a6ed1e0b41c1
Author: JEECG <445654970@qq.com>
Date: Tue Aug 19 11:23:19 2025 +0800
[代码生成]前端代码支持直接生成到前端项目、菜单sql会自动生成到start项目的flyway目录
commit 950621dd88dab3d365585abafde4317be15df6c2
Author: JEECG <445654970@qq.com>
Date: Mon Aug 18 23:04:59 2025 +0800
升级代码生成器,一键生成代码,vue3代码会生成到前端项目、菜单升级sql自动迁移到flyway目录重启自动执行(不需要手工迁移前端代码和手工执行升级sql)
commit 033cf51d69a96177fbb3bc4a5706e5da9792c57c
Author: JEECG <445654970@qq.com>
Date: Mon Aug 18 23:04:52 2025 +0800
升级代码生成器,一键生成代码,vue3代码会生成到前端项目、菜单升级sql自动迁移到flyway目录重启自动执行(不需要手工迁移前端代码和手工执行升级sql)
commit fb9f367517e6671efd1f7e40dee67f05251154a6
Author: JEECG <445654970@qq.com>
Date: Mon Aug 18 23:02:53 2025 +0800
代码生成,online自定义按钮无排序报错
commit b2da45d80399c9e5aa7ec962a91c4b532e0bb95d
Author: JEECG <445654970@qq.com>
Date: Mon Aug 18 16:23:22 2025 +0800
演示地址
commit 2840f0d325427db82ef71b8576cc78f1e1d9117f
Author: JEECG <445654970@qq.com>
Date: Mon Aug 18 15:37:10 2025 +0800
默认账号密码
commit 6ace7eae8a5b0831317ba994b3ac1c18efe19aa6
Author: JEECG <445654970@qq.com>
Date: Sun Aug 17 15:11:45 2025 +0800
开发环境关闭日志生成,项目启动快;生产环境请按需打开注释
commit 3d88147c59e679017f0f89de77ba762c7e0d004e
Author: JEECG <445654970@qq.com>
Date: Thu Aug 14 23:03:46 2025 +0800
调整微服务启动文档
commit ba0052d4522775abcae78c4053a12408e78ac895
Author: JEECG <445654970@qq.com>
Date: Wed Aug 13 13:55:13 2025 +0800
支持lazy-initialization启动,项目大了后启动会更快
commit 69fca254f05646ea2c38892a8d97d37d687f4147
Author: JEECG <445654970@qq.com>
Date: Wed Aug 13 11:47:27 2025 +0800
补充注释
commit b3de5961991e6cb81207bacf8bda827fba659bb7
Author: JEECG <445654970@qq.com>
Date: Wed Aug 13 11:47:16 2025 +0800
彻底关闭 prettier 校验规则
commit f46273d15e9d37e9cbe897ea86cdbb44f3b1221e
Author: JEECG <445654970@qq.com>
Date: Wed Aug 13 10:26:23 2025 +0800
设置ESLint 的 vue/html-self-closing 自闭合标签警告配置
commit 0fe258dbc2743c2b123690c6b6efd4ee85fb9977
Author: JEECG <445654970@qq.com>
Date: Wed Aug 13 09:26:16 2025 +0800
修复 onExportXls defSort 不生效问题 #7570
commit de7f23c5555eedadce01b093618c6f9aa82a646c
Merge: d97e56b2 444c7140
Author: JEECG <zhangdaiscott@163.com>
Date: Wed Aug 13 09:20:31 2025 +0800
Merge pull request #8496 from lileiAimee/developer
解决TableAction中自定义图标颜色不起作用的问题
commit d97e56b2f0a225a055902b30dec430c7af1fb791
Author: JEECG <445654970@qq.com>
Date: Tue Aug 12 19:08:43 2025 +0800
多租户模式下系统系统会给租户默认增加上测试的角色菜单,但是后台获取菜单时异常,无法打开相关页面 #8667
commit c868496b78c048d9fe98fb57b7904b8ea69f04f4
Author: JEECG <445654970@qq.com>
Date: Tue Aug 12 19:02:49 2025 +0800
映射警告
commit c5150baa69a764d826742c813ba461c9aa13f2db
Author: JEECG <445654970@qq.com>
Date: Tue Aug 12 18:18:34 2025 +0800
支持通过用户账号邀请加入租户
commit 3d9f59c69b3f7c0bbef3f733f055d6da4b79c2c0
Author: JEECG <445654970@qq.com>
Date: Tue Aug 12 18:17:55 2025 +0800
邀请用户加入租户,支持通过用户账号
commit 420d6db3fbf7351f1cf1a40d7b357b3172c1ec38
Author: JEECG <445654970@qq.com>
Date: Tue Aug 12 18:06:20 2025 +0800
登录用户没有部门,不提示警告
commit 473a626039561ebc9b313f841043b0bbfc1e250c
Author: JEECG <445654970@qq.com>
Date: Tue Aug 12 14:10:02 2025 +0800
增加JPopup组件带参数示例
commit 0308b0597ce99b4cd073557302f652df266c0cb6
Author: JEECG <445654970@qq.com>
Date: Tue Aug 12 14:08:18 2025 +0800
【issues/8426】解决JPopup组件传参不能接收
commit 2191f5d48c54abbe89af8fd60df1c27b18b06f93
Author: JEECG <445654970@qq.com>
Date: Mon Aug 11 22:43:07 2025 +0800
调整位置
commit 1158b0b6e76b1fea6da46376ee6ba753273ef073
Author: JEECG <445654970@qq.com>
Date: Mon Aug 11 22:30:39 2025 +0800
升级seata到1.7.0;升级dynamic-datasource-spring-boot-starter到3.5.2
commit ead2cef1f474f401fed6eb97fc161b4d08c05609
Author: JEECG <445654970@qq.com>
Date: Mon Aug 11 18:47:48 2025 +0800
支持多字段默认排序defSort数组、解决多列排序无效 #8659
commit 83bb0a0a6a4aba255e81294d5355ec0872eb79bc
Author: JEECG <445654970@qq.com>
Date: Mon Aug 11 18:47:43 2025 +0800
支持多字段默认排序defSort数组
commit b474e9e5a54d366cfc496baa3e1dc648025f55ac
Author: JEECG <445654970@qq.com>
Date: Sun Aug 10 17:06:01 2025 +0800
开发环境安装
commit 422373e300b633a70ddf4a875bf508e473522992
Author: JEECG <445654970@qq.com>
Date: Sun Aug 10 16:30:13 2025 +0800
提供JeecgBoot 运行环境python检查脚本
commit 1cf11a4c2aa53c1a0567dbe556436552555d6266
Author: JEECG <445654970@qq.com>
Date: Sat Aug 9 09:41:57 2025 +0800
提供jeecgboot-oracle11g.dmp
commit 925f1637844eb0a158a7e78f544b93aff66c1644
Author: JEECG <445654970@qq.com>
Date: Fri Aug 8 22:07:24 2025 +0800
引入jeecg-boot-starter-job依赖启动报错 #8694
commit d01c1d7d477473b2250d0b4d3a2d35b939b9e210
Author: JEECG <445654970@qq.com>
Date: Thu Aug 7 15:41:21 2025 +0800
支持lazy-initialization
commit 3576b549458d877f3e3ae3f61ffd55f3d64b10d4
Author: JEECG <445654970@qq.com>
Date: Thu Aug 7 15:36:51 2025 +0800
升级积木报表和积木BI到最新版v2.1.2
commit 444c7140f6b67a51a633dbbbeddcf7e3fbf26924
Author: lileiAimee <345697385@qq.com>
Date: Wed Jun 25 09:55:07 2025 +0800
解决TableAction中自定义图标颜色不起作用的问题
# Conflicts:
# README-EN.md
# README.md
# jeecg-boot/jeecg-server-cloud/jeecg-visual/jeecg-cloud-test/jeecg-cloud-test-seata/pom.xml
# jeecg-boot/pom.xml
87 lines
2.4 KiB
Vue
87 lines
2.4 KiB
Vue
<!--邀请用户加入租户弹窗-->
|
||
<template>
|
||
<BasicModal @register="registerModal" :width="500" :title="title" @ok="handleSubmit">
|
||
<BasicForm @register="registerForm" />
|
||
</BasicModal>
|
||
</template>
|
||
|
||
<script lang="ts">
|
||
import { BasicModal, useModalInner } from '/@/components/Modal';
|
||
import { BasicForm, useForm } from '/@/components/Form/index';
|
||
import { defineComponent, ref } from 'vue';
|
||
export default defineComponent({
|
||
name: 'TenantInviteUserModal',
|
||
components: {
|
||
BasicModal,
|
||
BasicForm,
|
||
},
|
||
setup(props, { emit }) {
|
||
const title = ref<string>('邀请成员');
|
||
const [registerForm, { resetFields, validate }] = useForm({
|
||
schemas: [
|
||
{
|
||
label: '邀请方式',
|
||
field: 'invitedMode',
|
||
component: 'RadioButtonGroup',
|
||
defaultValue: 1,
|
||
componentProps: {
|
||
options: [
|
||
{ label: '手机号', value: 1 },
|
||
{ label: '用户账号', value: 2 },
|
||
],
|
||
},
|
||
},
|
||
{
|
||
label: '手机号',
|
||
field: 'phone',
|
||
component: 'Input',
|
||
ifShow: ({ values }) => values.invitedMode === 1,
|
||
dynamicRules: ({ values }) => {
|
||
return values.invitedMode === 1
|
||
? [
|
||
{ required: true, message: '请填写手机号' },
|
||
{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' },
|
||
]
|
||
: [{ pattern: /^1[3456789]\d{9}$/, message: '手机号码格式有误' }];
|
||
},
|
||
},
|
||
{
|
||
field: 'user',
|
||
component: 'Input',
|
||
label: '用户账号',
|
||
ifShow: ({ values }) => values.invitedMode === 2,
|
||
dynamicRules: ({ values }) => {
|
||
return values.invitedMode === 2 ? [{ required: true, message: '请输入用户账号' }] : [];
|
||
},
|
||
},
|
||
],
|
||
showActionButtonGroup: false,
|
||
});
|
||
//表单赋值
|
||
const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data) => {
|
||
//重置表单
|
||
await resetFields();
|
||
setModalProps({ minHeight: 100 });
|
||
});
|
||
|
||
/**
|
||
* 提交,返回给租户list页面
|
||
*/
|
||
async function handleSubmit() {
|
||
let values = await validate();
|
||
emit('inviteOk', values.phone, values.user);
|
||
closeModal();
|
||
}
|
||
|
||
return {
|
||
title,
|
||
registerModal,
|
||
registerForm,
|
||
handleSubmit,
|
||
};
|
||
},
|
||
});
|
||
</script>
|
||
|
||
<style scoped></style>
|