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

3.7.0大版本发布(修复几个bug)

pull/186/merge
JEECG 2024-06-12 19:46:12 +08:00
parent 8170a7d123
commit 24e9b93779
12 changed files with 1890 additions and 1304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -72,8 +72,8 @@
"vue-router": "^4.3.0",
"vue-types": "^5.1.1",
"vuedraggable": "^4.1.0",
"vxe-table": "4.6.14",
"vxe-table-plugin-antd": "4.0.5",
"vxe-table": "4.6.17",
"vxe-table-plugin-antd": "4.0.7",
"xe-utils": "3.5.26",
"xss": "^1.0.14"
},

3018
pnpm-lock.yaml
View File

File diff suppressed because it is too large Load Diff

10
src/components/Form/src/container/JFormContainer.vue
View File

@ -94,13 +94,13 @@
:deep(.ant-input-affix-wrapper),
:deep(.ant-picker),
:deep(.ant-input-number) {
color: rgba(51, 51, 51, 0.25) !important;
color: #606266 !important;
}
:deep(.ant-select) {
color: rgba(51, 51, 51, 0.25) !important;
color: #606266 !important;
}
:deep(.ant-select-selection-item-content),:deep(.ant-select-selection-item),:deep(input) {
color: rgba(51, 51, 51, 0.25) !important;
color: #606266 !important;
}
:deep(.ant-radio-wrapper),
@ -110,7 +110,7 @@
}
:deep(.ant-radio-wrapper .ant-radio-inner:after),
:deep(.ant-checkbox-checked .ant-checkbox-inner) {
background-color: rgba(51, 51, 51, 0.25);
color: #606266 !important;
}
:deep(.ant-radio-inner),
:deep(.ant-checkbox-inner) {
@ -142,7 +142,7 @@
:deep(.ant-picker),
:deep(.ant-input-number) {
color: rgba(255, 255, 255, 0.25) !important;
background-color: rgba(255, 255, 255, 0.08) !important;
//background-color: rgba(255, 255, 255, 0.08) !important;
}
:deep(.ant-select) {
color: rgba(255, 255, 255, 0.25) !important;

42
src/components/Form/src/jeecg/components/JAreaLinkage.vue
View File

@ -25,7 +25,7 @@
// 存储数据
saveCode: propTypes.oneOf(['province', 'city', 'region', 'all']).def('all'),
},
emits: ['options-change', 'change'],
emits: ['options-change', 'change', 'update:value'],
setup(props, { emit, refs }) {
const emitData = ref<any[]>([]);
const attrs = useAttrs();
@ -49,7 +49,13 @@
* 监听value变化
*/
watchEffect(() => {
props.value && initValue();
// update-begin--author:liaozhiyang---date:20240612--for：【TV360X-1223】省市区换新组件
if (props.value) {
initValue();
} else {
cascaderValue.value = [];
}
// update-end--author:liaozhiyang---date:20240612---for：【TV360X-1223】省市区换新组件
});
/**
@ -62,7 +68,11 @@
const arr = value.split(',');
cascaderValue.value = transform(arr);
} else if (isArray(value)) {
cascaderValue.value = transform(value);
if (value.length) {
cascaderValue.value = transform(value);
} else {
cascaderValue.value = [];
}
}
// update-end--author:liaozhiyang---date:20240607---for：【TV360X-501】省市区换新组件
}
@ -89,18 +99,24 @@
}
function handleChange(arr, ...args) {
// update-begin--author:liaozhiyang---date:20240607---for：【TV360X-501】省市区换新组件
let result: any = [];
if (props.saveCode === 'region') {
// 可能只有两位（选择香港时，只有省区）
result = [arr[arr.length - 1]];
} else if (props.saveCode === 'city') {
result = [arr[1]];
} else if (props.saveCode === 'province') {
result = [arr[0]];
if (arr?.length) {
let result: any = [];
if (props.saveCode === 'region') {
// 可能只有两位（选择香港时，只有省区）
result = [arr[arr.length - 1]];
} else if (props.saveCode === 'city') {
result = [arr[1]];
} else if (props.saveCode === 'province') {
result = [arr[0]];
} else {
result = arr;
}
emit('change', result);
emit('update:value', result);
} else {
result = arr;
emit('change', arr);
emit('update:value', arr);
}
emit('change', result);
// update-end--author:liaozhiyang---date:20240607---for：【TV360X-501】省市区换新组件
// emitData.value = args;
//update-begin-author:taoyan date:2022-6-27 for: VUEN-1424【vue3】树表、单表、jvxe、erp 、内嵌子表省市县 选择不上

5
src/components/Form/src/jeecg/components/JSelectDept.vue
View File

@ -63,6 +63,11 @@
* 监听组件值
*/
watchEffect(() => {
// update-begin--author:liaozhiyang---date:20240611---for：【TV360X-576】已选中了数据，再次选择打开弹窗点击取消，数据清空了（同步JSelectDept改法）
//update-begin-author:liusq---date:2024-06-03--for: [TV360X-840]用户授权，没有选择，点取消，也会回显一个选过的用户
tempSave = [];
//update-end-author:liusq---date:2024-06-03--for:[TV360X-840]用户授权，没有选择，点取消，也会回显一个选过的用户
// update-end--author:liaozhiyang---date:20240611---for：【TV360X-576】已选中了数据，再次选择打开弹窗点击取消，数据清空了（同步JSelectDept改法）
props.value && initValue();
});

8
src/components/Form/src/jeecg/components/JSelectUser.vue
View File

@ -87,6 +87,11 @@
* 监听组件值
*/
watchEffect(() => {
// update-begin--author:liaozhiyang---date:20240611---for：【TV360X-576】已选中了数据，再次选择打开弹窗点击取消，数据清空了
//update-begin-author:liusq---date:2024-06-03--for: [TV360X-840]用户授权，没有选择，点取消，也会回显一个选过的用户
tempSave = [];
//update-end-author:liusq---date:2024-06-03--for:[TV360X-840]用户授权，没有选择，点取消，也会回显一个选过的用户
// update-end--author:liaozhiyang---date:20240611---for：【TV360X-576】已选中了数据，再次选择打开弹窗点击取消，数据清空了
props.value && initValue();
// 查询条件重置的时候 界面显示未清空
if (!props.value) {
@ -119,9 +124,6 @@
*/
function handleOpen() {
tag.value = true;
//update-begin-author:liusq---date:2024-06-03--for: [TV360X-840]用户授权，没有选择，点取消，也会回显一个选过的用户
tempSave = [];
//update-end-author:liusq---date:2024-06-03--for:[TV360X-840]用户授权，没有选择，点取消，也会回显一个选过的用户
openModal(true, {
isUpdate: false,
});

2
src/components/JVxeCustom/src/components/JVxeFileCell.vue
View File

@ -39,7 +39,7 @@
</template>
<a-upload
v-if="cellProps.allDisable"
v-if="!cellProps.disabledTable"
v-show="!hasFile"
name="file"
:data="{ isup: 1 }"

2
src/components/JVxeCustom/src/components/JVxeImageCell.vue
View File

@ -17,7 +17,7 @@
</a-tooltip>
</div>
</template>
<div class="j-vxe-image-upload" v-if="cellProps.allDisable">
<div class="j-vxe-image-upload" v-if="!cellProps.disabledTable">
<a-upload
:accept="acceptFileType"
name="file"

26
src/components/jeecg/AiChat/index.vue
View File

@ -53,23 +53,33 @@
};
// 初始查询历史
const init = () => {
const priming = () => {
dataSource.value = {
active: 1002,
usingContext: true,
history: [{ uuid: 1002, title: '新建聊天', isEdit: false }],
chat: [{ uuid: 1002, data: [] }],
};
};
defHttp
.get({ url: configUrl.get })
.then((res) => {
const { content } = res;
if (content) {
dataSource.value = JSON.parse(content);
const json = JSON.parse(content);
if (json.history?.length) {
dataSource.value = json;
} else {
priming();
}
} else {
dataSource.value = {
active: 1002,
usingContext: true,
history: [{ uuid: 1002, title: '新建聊天', isEdit: false }],
chat: [{ uuid: 1002, data: [] }],
};
priming();
}
!unwatch01 && execute();
})
.catch(() => {});
.catch(() => {
priming();
});
};
const save = (content) => {
defHttp.post({ url: configUrl.save, params: { content: JSON.stringify(content) } }, { isTransformResponse: false });

2
src/components/jeecg/JVxeTable/src/components/cells/JVxeUploadCell.vue
View File

@ -34,7 +34,7 @@
</a-input>
</template>
<a-upload
v-if="cellProps.allDisable"
v-if="!cellProps.disabledTable"
v-show="!hasFile"
name="file"
:data="{ isup: 1 }"

29
src/design/ant/index.less
View File

@ -179,25 +179,30 @@ html[data-theme='dark'] .ant-input-affix-wrapper-textarea-with-clear-btn {
// update-begin--author:liaozhiyang---date:20240605---for：【TV360X-189】统一只读样式
html[data-theme='light'] {
.ant-select.ant-select-disabled {
.ant-select-selection-item {
color: rgba(51, 51, 51, 0.25) !important;
.ant-select-selection-item-content {
color: rgba(51, 51, 51, 0.25);
.ant-form:not(.jeecg-form-detail-effect) {
.ant-select.ant-select-disabled {
.ant-select-selection-item {
color: rgba(51, 51, 51, 0.25) !important;
// color: rgba(51, 51, 51, 0.25);
.ant-select-selection-item-content {
color: rgba(51, 51, 51, 0.25);
}
}
}
}
.ant-input-number.ant-input-number-disabled {
.ant-input-number-input {
color: rgba(51, 51, 51, 0.25);
.ant-input-number.ant-input-number-disabled {
.ant-input-number-input {
color: rgba(51, 51, 51, 0.25);
}
}
}
}
html[data-theme='dark'] {
.ant-input-number.ant-input-number-disabled {
.ant-input-number-input {
color:rgba(255, 255, 255, 0.25);
.ant-form:not(.jeecg-form-detail-effect) {
.ant-input-number.ant-input-number-disabled {
.ant-input-number-input {
color:rgba(255, 255, 255, 0.25);
}
}
}
}

46
src/design/index.less
View File

@ -134,6 +134,12 @@ img, video {
html[data-theme='light'] {
.jeecg-form-detail-effect {
*:not(.ant-select-selection-placeholder){
color: #606266!important;
}
.ant-row label {
color: #797c81 !important;
}
.ant-select-selector,
.ant-btn,
.ant-input,
@ -142,6 +148,7 @@ html[data-theme='light'] {
.ant-input-number {
// border: none !important;
// color: rgba(51, 51, 51, 0.25) !important;
color: #606266!important;
background-color: #f9f9fa !important;
}
@ -149,12 +156,22 @@ html[data-theme='light'] {
.anticon {
pointer-events: none;
cursor: text;
color: rgba(51, 51, 51, 0.25);
color: #606266!important;
&:hover {
background: transparent;
}
}
.ant-select.ant-select-disabled .ant-select-selection-item .ant-select-selection-item-content {
color: #606266!important;
}
.ant-select-selection-item {
color: #606266!important;
}
:where(.css-dev-only-do-not-override-dvamda).ant-picker .ant-picker-input >input-disabled, :where(.css-dev-only-do-not-override-dvamda).ant-picker .ant-picker-input >input[disabled] {
color: #606266!important;
}
.ant-select-selection-item {
border-color: #eee !important;
background-color: transparent !important;
@ -163,11 +180,31 @@ html[data-theme='light'] {
}
html[data-theme='dark'] {
.jeecg-form-detail-effect {
* {
color: #606266;
}
.ant-upload-text-icon, a {
color:rgba(255, 255, 255, 0.25) ;
}
}
.ant-select-selector,
.ant-btn,
.ant-input,
.ant-input-affix-wrapper,
.ant-picker,
.ant-input-number {
background-color: transparent !important;
}
.ant-select-selection-item {
background-color: transparent !important;
}
// 暗黑模式下输入框等icon隐藏
.ant-picker-suffix,.ant-select-arrow {
content:" ";
display: none;
}
}
.jeecg-form-detail-effect {
.ant-select-selector,
@ -195,8 +232,13 @@ html[data-theme='dark'] {
input {
border: none !important;
}
input, textarea {
user-select: auto;
cursor: text !important;
}
.JSelectDept,
.JselectUser {
.JselectUser,
.JSelectPosition {
> div {
> .ant-row {
.left {