diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue
index 38593ef59..e9871969a 100644
--- a/src/components/DesignForm/app/index.vue
+++ b/src/components/DesignForm/app/index.vue
@@ -358,8 +358,8 @@ const confirmEvent = (val:any) => {
.then((data)=>{
console.log('cancel!',data)
ElNotification({
- title: '温馨提示!',
- message: data.mag,
+ title: '系统提示!',
+ message: data.mag?data.mag:"删除成功",
type: 'success',
})
getPageData()
diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue
index 59f5eef4d..dd938747d 100644
--- a/src/components/DesignForm/formControlAttr.vue
+++ b/src/components/DesignForm/formControlAttr.vue
@@ -1348,7 +1348,11 @@
// 校验规则必填勾选设置,存在校验规则时勾选
const checkboxRequired = computed(() => {
const val = controlData.value && controlData.value.item?.rules
- return val && val.length > 0
+ if(val && val.length > 0){
+ return true
+ }else{
+ return false
+ }
})
// 快速添加一条校验规则
const addRulesFast = () => {
diff --git a/src/components/DesignForm/formControlAttr_2024024.vue b/src/components/DesignForm/formControlAttr_2024024.vue
index bce9f04f2..703eaceec 100644
--- a/src/components/DesignForm/formControlAttr_2024024.vue
+++ b/src/components/DesignForm/formControlAttr_2024024.vue
@@ -1148,7 +1148,11 @@ const tableColumnAdd = (val: string) => {
// 校验规则必填勾选设置,存在校验规则时勾选
const checkboxRequired = computed(() => {
const val = controlData.value && controlData.value.item?.rules
- return val && val.length > 0
+ if(val && val.length > 0){
+ return true
+ }else{
+ return false
+ }
})
// 快速添加一条校验规则
const addRulesFast = () => {
diff --git a/src/components/DesignForm/formControlAttres.vue b/src/components/DesignForm/formControlAttres.vue
index 67bf990a6..4b0631fe4 100644
--- a/src/components/DesignForm/formControlAttres.vue
+++ b/src/components/DesignForm/formControlAttres.vue
@@ -988,7 +988,11 @@ const tableColumnAdd = (val: string) => {
// 校验规则必填勾选设置,存在校验规则时勾选
const checkboxRequired = computed(() => {
const val = controlData.value && controlData.value.item?.rules
- return val && val.length > 0
+ if(val && val.length > 0){
+ return true
+ }else{
+ return false
+ }
})
// 快速添加一条校验规则
const addRulesFast = () => {
diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue
index 107ac521f..9fcec388a 100644
--- a/src/components/DesignForm/formControlPropertiNew.vue
+++ b/src/components/DesignForm/formControlPropertiNew.vue
@@ -1387,7 +1387,13 @@ const tableColumnAdd = (val: string) => {
// 校验规则必填勾选设置,存在校验规则时勾选
const checkboxRequired = computed(() => {
const val = controlData.value && controlData.value.item?.rules
- return val && val.length > 0
+ console.log("校验规则必填勾选设置",val && val.length > 0)
+ if(val && val.length > 0){
+ return true
+ }else{
+ return false
+ }
+ // return val && val.length > 0
})
// 快速添加一条校验规则
const addRulesFast = () => {
@@ -3323,13 +3329,14 @@ const disabledIstrue = (val:string) => {
>
- 校验设置
+ 校验1设置
+
{
+
{
// 校验规则必填勾选设置,存在校验规则时勾选
const checkboxRequired = computed(() => {
const val = controlData.value && controlData.value.item?.rules
- return val && val.length > 0
+ if(val && val.length > 0){
+ return true
+ }else{
+ return false
+ }
})
/**
@ 作者: 秦东
diff --git a/src/components/DesignForm/tableListPage/index.vue b/src/components/DesignForm/tableListPage/index.vue
index be9061914..bf8de2ec5 100644
--- a/src/components/DesignForm/tableListPage/index.vue
+++ b/src/components/DesignForm/tableListPage/index.vue
@@ -348,8 +348,8 @@ const confirmEvent = (val:any) => {
.then((data)=>{
console.log('cancel!',data)
ElNotification({
- title: '温馨提示!',
- message: data.mag,
+ title: '系统提示!',
+ message: data.mag?data.mag:"删除成功",
type: 'success',
})
getPageData()
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 0468cbbde..e0a41835a 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -26,6 +26,7 @@ declare module '@vue/runtime-core' {
DragControlApp: typeof import('./../components/DesignForm/dragControlApp.vue')['default']
DragControlNew: typeof import('./../components/DesignForm/dragControlNew.vue')['default']
ElAffix: typeof import('element-plus/es')['ElAffix']
+ ElAlert: typeof import('element-plus/es')['ElAlert']
ElAside: typeof import('element-plus/es')['ElAside']
ElAvatar: typeof import('element-plus/es')['ElAvatar']
ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
@@ -35,6 +36,7 @@ declare module '@vue/runtime-core' {
ElCard: typeof import('element-plus/es')['ElCard']
ElCarousel: typeof import('element-plus/es')['ElCarousel']
ElCarouselItem: typeof import('element-plus/es')['ElCarouselItem']
+ ElCascader: typeof import('element-plus/es')['ElCascader']
ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
ElCol: typeof import('element-plus/es')['ElCol']
@@ -59,6 +61,7 @@ declare module '@vue/runtime-core' {
ElImageViewer: typeof import('element-plus/es')['ElImageViewer']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+ ElLink: typeof import('element-plus/es')['ElLink']
ElMain: typeof import('element-plus/es')['ElMain']
ElMenu: typeof import('element-plus/es')['ElMenu']
ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
@@ -66,6 +69,7 @@ declare module '@vue/runtime-core' {
ElPagination: typeof import('element-plus/es')['ElPagination']
ElPopconfirm: typeof import('element-plus/es')['ElPopconfirm']
ElPopover: typeof import('element-plus/es')['ElPopover']
+ ElProgress: typeof import('element-plus/es')['ElProgress']
ElRadio: typeof import('element-plus/es')['ElRadio']
ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
@@ -73,6 +77,7 @@ declare module '@vue/runtime-core' {
ElRow: typeof import('element-plus/es')['ElRow']
ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
ElSelect: typeof import('element-plus/es')['ElSelect']
+ ElSelectV2: typeof import('element-plus/es')['ElSelectV2']
ElSlider: typeof import('element-plus/es')['ElSlider']
ElSpace: typeof import('element-plus/es')['ElSpace']
ElStep: typeof import('element-plus/es')['ElStep']
@@ -89,6 +94,7 @@ declare module '@vue/runtime-core' {
ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
ElTimePicker: typeof import('element-plus/es')['ElTimePicker']
ElTooltip: typeof import('element-plus/es')['ElTooltip']
+ ElTransfer: typeof import('element-plus/es')['ElTransfer']
ElTree: typeof import('element-plus/es')['ElTree']
ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
ElUpload: typeof import('element-plus/es')['ElUpload']
@@ -119,12 +125,26 @@ declare module '@vue/runtime-core' {
HeadToolsNew: typeof import('./../components/DesignForm/public/headToolsNew.vue')['default']
IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
+ IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
IEpClose: typeof import('~icons/ep/close')['default']
+ IEpCollection: typeof import('~icons/ep/collection')['default']
+ IEpDelete: typeof import('~icons/ep/delete')['default']
+ IEpDownload: typeof import('~icons/ep/download')['default']
IEpEdit: typeof import('~icons/ep/edit')['default']
IEpMessageBox: typeof import('~icons/ep/message-box')['default']
+ IEpMinus: typeof import('~icons/ep/minus')['default']
+ IEpOperation: typeof import('~icons/ep/operation')['default']
+ IEpPicture: typeof import('~icons/ep/picture')['default']
+ IEpPlus: typeof import('~icons/ep/plus')['default']
+ IEpPosition: typeof import('~icons/ep/position')['default']
IEpRefresh: typeof import('~icons/ep/refresh')['default']
+ IEpRefreshLeft: typeof import('~icons/ep/refresh-left')['default']
IEpSearch: typeof import('~icons/ep/search')['default']
IEpSetting: typeof import('~icons/ep/setting')['default']
+ IEpTop: typeof import('~icons/ep/top')['default']
+ IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
+ IEpUser: typeof import('~icons/ep/user')['default']
+ IEpView: typeof import('~icons/ep/view')['default']
LangSelect: typeof import('./../components/LangSelect/index.vue')['default']
LayoutPage: typeof import('./../components/DesignForm/layoutPage/index.vue')['default']
List: typeof import('./../components/DesignForm/public/form/components/list.vue')['default']
diff --git a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
index 57f46f7d0..bf24faab3 100644
--- a/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
+++ b/src/views/sysworkflow/lowcodepage/runApp/regularPage/myCreate.vue
@@ -165,7 +165,7 @@ const confirmEvent = (val:any) => {
.then((data)=>{
console.log('cancel!',data)
ElNotification({
- title: '温馨提示!',
+ title: '系统提示!',
message: data.mag,
type: 'success',
})