Merge branch 'qin_v10_master'

src/components/DesignForm/app/index.vue

@@ -358,8 +358,8 @@ const confirmEvent = (val:any) => {
 		.then((data)=>{
 			console.log('cancel!',data)
 			ElNotification({
-				title: '温馨提示！',
+				title: '系统提示！',
-				message: data.mag,
+				message: data.mag?data.mag:"删除成功",
 				type: 'success',
 			})
 			getPageData()

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 = () => {

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 = () => {

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 = () => {

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) => {
                         >
                         
                             <!-- <div class="h3"><h3>校验设置</h3></div> -->
-                            <el-divider content-position="left">校验设置</el-divider>
+                            <el-divider content-position="left">校验1设置</el-divider>
                             <div v-if="showHide(['input', 'password', 'component'], true)">
                                 <el-form-item
                                     v-for="(item, index) in controlData.customRules"
                                     :key="item.type"
                                     class="form_cont"
                                 >
+								
                                     <el-input v-model="item.message" placeholder="校验提示信息">
                                         <template #prepend>
                                             <el-select
@@ -3380,6 +3387,7 @@ const disabledIstrue = (val:string) => {
                                 </el-form-item>
                             </div>
                             <el-form-item class="form_cont" v-else>
+							
                             <el-checkbox
                                 :model-value="checkboxRequired"
                                 @change="requiredChange"

src/components/DesignForm/formControlProperties.vue

@@ -1285,7 +1285,11 @@ const addRules = (tooltip: 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
+		}
     })
 /**
 @ 作者: 秦东

src/components/DesignForm/tableListPage/index.vue

@@ -348,8 +348,8 @@ const confirmEvent = (val:any) => {
 		.then((data)=>{
 			console.log('cancel!',data)
 			ElNotification({
-				title: '温馨提示！',
+				title: '系统提示！',
-				message: data.mag,
+				message: data.mag?data.mag:"删除成功",
 				type: 'success',
 			})
 			getPageData()

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']

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',
 			})