diff --git a/snowy-admin-web/src/components/Table/index.vue b/snowy-admin-web/src/components/Table/index.vue index 1fc1d0e7..908bba0a 100644 --- a/snowy-admin-web/src/components/Table/index.vue +++ b/snowy-admin-web/src/components/Table/index.vue @@ -163,9 +163,14 @@ * @param bool Boolean */ refresh(bool = false) { - bool && (this.localPagination = Object.assign({}, { - current: 1, size: this.size - })) + bool && + (this.localPagination = Object.assign( + {}, + { + current: 1, + size: this.size + } + )) this.loadData() }, /** @@ -176,18 +181,29 @@ */ loadData(pagination, filters, sorter) { this.localLoading = true - const parameter = Object.assign({ - current: (pagination && pagination.current) || - this.showPagination && this.localPagination.current || this.pageNum, - size: (pagination && pagination.pageSize) || - this.showPagination && this.localPagination.pageSize || this.pageSize || this.localPagination.size + const parameter = Object.assign( + { + current: + (pagination && pagination.current) || + (this.showPagination && this.localPagination.current) || + this.pageNum, + size: + (pagination && pagination.pageSize) || + (this.showPagination && this.localPagination.pageSize) || + this.pageSize || + this.localPagination.size }, - (sorter && sorter.field && { - sortField: sorter.field - }) || {}, - (sorter && sorter.order && { - sortOrder: sorter.order - }) || {}, { + (sorter && + sorter.field && { + sortField: sorter.field + }) || + {}, + (sorter && + sorter.order && { + sortOrder: sorter.order + }) || + {}, + { ...filters } ) @@ -325,7 +341,7 @@ const needTotalItems = this.needTotalList.map((item) => { return ( - {item.title} 总计 {' '} + {item.title} 总计{' '} {!item.customRender ? item.total : item.customRender(item.total)} ) @@ -416,10 +432,8 @@
{this.toolConfig.striped ? (
- 斑马纹 + + 斑马纹
) : null} diff --git a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue index bcdd3b6c..f9e3937a 100644 --- a/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/emailFindForm.vue @@ -92,7 +92,7 @@ import router from '@/router' import { required, rules } from '@/utils/formRules' import userCenterApi from '@/api/sys/userCenterApi' - import smCrypto from "@/utils/smCrypto" + import smCrypto from '@/utils/smCrypto' const emailResetFormRef = ref() const emailFormData = ref({}) const islogin = ref(false) diff --git a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue index ce948866..827c00af 100644 --- a/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue +++ b/snowy-admin-web/src/views/auth/findPwd/phoneFindForm.vue @@ -93,7 +93,7 @@ import router from '@/router' import { required, rules } from '@/utils/formRules' import userCenterApi from '@/api/sys/userCenterApi' - import smCrypto from "@/utils/smCrypto" + import smCrypto from '@/utils/smCrypto' const phoneLoginFormRef = ref() const phoneFormData = ref({}) const islogin = ref(false) diff --git a/snowy-admin-web/src/views/auth/monitor/tokenInfoList.vue b/snowy-admin-web/src/views/auth/monitor/tokenInfoList.vue index 6325afa8..f71b0554 100644 --- a/snowy-admin-web/src/views/auth/monitor/tokenInfoList.vue +++ b/snowy-admin-web/src/views/auth/monitor/tokenInfoList.vue @@ -66,7 +66,7 @@ diff --git a/snowy-admin-web/src/views/auth/third/index.vue b/snowy-admin-web/src/views/auth/third/index.vue index 5243b14b..b07636a5 100644 --- a/snowy-admin-web/src/views/auth/third/index.vue +++ b/snowy-admin-web/src/views/auth/third/index.vue @@ -88,10 +88,5 @@ }) } // 分类 - const categoryOptions = tool.dictTypeList('THIRD_CATEGORY').map((item) => { - return { - value: item['dictValue'], - label: item['name'] - } - }) + const categoryOptions = tool.dictList('THIRD_CATEGORY') diff --git a/snowy-admin-web/src/views/biz/org/form.vue b/snowy-admin-web/src/views/biz/org/form.vue index 744c2fb9..88f97e16 100644 --- a/snowy-admin-web/src/views/biz/org/form.vue +++ b/snowy-admin-web/src/views/biz/org/form.vue @@ -124,12 +124,7 @@ sortCode: [required('请选择排序')] } // 机构分类字典 - let orgCategoryOptions = proxy.$TOOL.dictTypeList('ORG_CATEGORY').map((item) => { - return { - value: item['dictValue'], - label: item['name'] - } - }) + let orgCategoryOptions = proxy.$TOOL.dictList('ORG_CATEGORY') // 打开人员选择器，选择主管 const openSelector = (id) => { let checkedUserIds = [] @@ -157,13 +152,15 @@ .then(() => { submitLoading.value = true formData.value.extJson = JSON.stringify(extJson.value) - bizOrgApi.submitForm(formData.value, !formData.value.id).then(() => { - visible = false - emit('successful') - }) - .finally(() => { - submitLoading.value = false - }) + bizOrgApi + .submitForm(formData.value, !formData.value.id) + .then(() => { + visible = false + emit('successful') + }) + .finally(() => { + submitLoading.value = false + }) }) .catch(() => {}) } diff --git a/snowy-admin-web/src/views/biz/org/index.vue b/snowy-admin-web/src/views/biz/org/index.vue index 77b33ea8..99c815ad 100644 --- a/snowy-admin-web/src/views/biz/org/index.vue +++ b/snowy-admin-web/src/views/biz/org/index.vue @@ -137,28 +137,30 @@ } // 加载左侧的树 const loadTreeData = () => { - bizOrgApi.orgTree().then((res) => { - cardLoading.value = false - if (res !== null) { - treeData.value = res - // 默认展开2级 - treeData.value.forEach((item) => { - // 因为0的顶级 - if (item.parentId === '0') { - defaultExpandedKeys.value.push(item.id) - // 取到下级ID - if (item.children) { - item.children.forEach((items) => { - defaultExpandedKeys.value.push(items.id) - }) + bizOrgApi + .orgTree() + .then((res) => { + cardLoading.value = false + if (res !== null) { + treeData.value = res + // 默认展开2级 + treeData.value.forEach((item) => { + // 因为0的顶级 + if (item.parentId === '0') { + defaultExpandedKeys.value.push(item.id) + // 取到下级ID + if (item.children) { + item.children.forEach((items) => { + defaultExpandedKeys.value.push(items.id) + }) + } } - } - }) - } - }) - .finally(() => { - cardLoading.value = false - }) + }) + } + }) + .finally(() => { + cardLoading.value = false + }) } // 点击树查询 const treeSelect = (selectedKeys) => { diff --git a/snowy-admin-web/src/views/biz/position/form.vue b/snowy-admin-web/src/views/biz/position/form.vue index fc7bc488..5b5a2ee1 100644 --- a/snowy-admin-web/src/views/biz/position/form.vue +++ b/snowy-admin-web/src/views/biz/position/form.vue @@ -101,25 +101,22 @@ category: [required('请选择岗位分类')], sortCode: [required('请选择排序')] } - let positionCategoryOptions = proxy.$TOOL.dictTypeList('POSITION_CATEGORY').map((item) => { - return { - value: item['dictValue'], - label: item['name'] - } - }) + let positionCategoryOptions = proxy.$TOOL.dictList('POSITION_CATEGORY') // 验证并提交数据 const onSubmit = () => { formRef.value .validate() .then(() => { submitLoading.value = true - bizPositionApi.submitForm(formData.value, !formData.value.id).then(() => { - visible = false - emit('successful') - }) - .finally(() => { - submitLoading.value = false - }) + bizPositionApi + .submitForm(formData.value, !formData.value.id) + .then(() => { + visible = false + emit('successful') + }) + .finally(() => { + submitLoading.value = false + }) }) .catch(() => {}) } diff --git a/snowy-admin-web/src/views/biz/position/index.vue b/snowy-admin-web/src/views/biz/position/index.vue index 90e4cba6..9b31e221 100644 --- a/snowy-admin-web/src/views/biz/position/index.vue +++ b/snowy-admin-web/src/views/biz/position/index.vue @@ -136,28 +136,30 @@ }) } // 加载左侧的树 - bizOrgApi.orgTree().then((res) => { - cardLoading.value = false - if (res !== null) { - treeData.value = res - // 默认展开2级 - treeData.value.forEach((item) => { - // 因为0的顶级 - if (item.parentId === '0') { - defaultExpandedKeys.value.push(item.id) - // 取到下级ID - if (item.children) { - item.children.forEach((items) => { - defaultExpandedKeys.value.push(items.id) - }) + bizOrgApi + .orgTree() + .then((res) => { + cardLoading.value = false + if (res !== null) { + treeData.value = res + // 默认展开2级 + treeData.value.forEach((item) => { + // 因为0的顶级 + if (item.parentId === '0') { + defaultExpandedKeys.value.push(item.id) + // 取到下级ID + if (item.children) { + item.children.forEach((items) => { + defaultExpandedKeys.value.push(items.id) + }) + } } - } - }) - } - }) - .finally(() => { - cardLoading.value = false - }) + }) + } + }) + .finally(() => { + cardLoading.value = false + }) // 点击树查询 const treeSelect = (selectedKeys) => { if (selectedKeys.length > 0) { diff --git a/snowy-admin-web/src/views/biz/user/form.vue b/snowy-admin-web/src/views/biz/user/form.vue index 7bc15e79..c5e51d05 100644 --- a/snowy-admin-web/src/views/biz/user/form.vue +++ b/snowy-admin-web/src/views/biz/user/form.vue @@ -514,33 +514,13 @@ }) } // 性别 - const genderOptions = proxy.$TOOL.dictTypeList('GENDER').map((item) => { - return { - value: item['dictValue'], - label: item['name'] - } - }) + const genderOptions = proxy.$TOOL.dictList('GENDER') // 民族 - const nationOptions = proxy.$TOOL.dictTypeList('NATION').map((item) => { - return { - value: item['dictValue'], - label: item['name'] - } - }) + const nationOptions = proxy.$TOOL.dictList('NATION') // 身份证件 - const idcardTypeOptions = proxy.$TOOL.dictTypeList('IDCARD_TYPE').map((item) => { - return { - value: item['dictValue'], - label: item['name'] - } - }) + const idcardTypeOptions = proxy.$TOOL.dictList('IDCARD_TYPE') // 文化程度 - const cultureLevelOptions = proxy.$TOOL.dictTypeList('CULTURE_LEVEL').map((item) => { - return { - value: item['dictValue'], - label: item['name'] - } - }) + const cultureLevelOptions = proxy.$TOOL.dictList('CULTURE_LEVEL') // 调用这个函数将子组件的一些数据和方法暴露出去 defineExpose({ diff --git a/snowy-admin-web/src/views/biz/user/index.vue b/snowy-admin-web/src/views/biz/user/index.vue index f18c73a4..bdead4e1 100644 --- a/snowy-admin-web/src/views/biz/user/index.vue +++ b/snowy-admin-web/src/views/biz/user/index.vue @@ -28,8 +28,8 @@ - {{ - item.name + {{ + item.label }} @@ -207,7 +207,7 @@ width: '220px' }) } - const statusData = tool.dictTypeList('COMMON_STATUS') + const statusData = tool.dictList('COMMON_STATUS') const searchFormRef = ref() let defaultExpandedKeys = ref([]) let searchFormState = reactive({}) diff --git a/snowy-admin-web/src/views/dev/config/emailConfig/aliyunEmailForm.vue b/snowy-admin-web/src/views/dev/config/emailConfig/aliyunEmailForm.vue index 5b88f552..f644cff2 100644 --- a/snowy-admin-web/src/views/dev/config/emailConfig/aliyunEmailForm.vue +++ b/snowy-admin-web/src/views/dev/config/emailConfig/aliyunEmailForm.vue @@ -59,24 +59,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/config/emailConfig/localEmailForm.vue b/snowy-admin-web/src/views/dev/config/emailConfig/localEmailForm.vue index e58e614d..ae941c1f 100644 --- a/snowy-admin-web/src/views/dev/config/emailConfig/localEmailForm.vue +++ b/snowy-admin-web/src/views/dev/config/emailConfig/localEmailForm.vue @@ -55,24 +55,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/config/fileConfig/aliyunFileForm.vue b/snowy-admin-web/src/views/dev/config/fileConfig/aliyunFileForm.vue index 9f594dab..fd7d7c70 100644 --- a/snowy-admin-web/src/views/dev/config/fileConfig/aliyunFileForm.vue +++ b/snowy-admin-web/src/views/dev/config/fileConfig/aliyunFileForm.vue @@ -63,24 +63,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/config/fileConfig/localFileForm.vue b/snowy-admin-web/src/views/dev/config/fileConfig/localFileForm.vue index 987f8389..65de5d72 100644 --- a/snowy-admin-web/src/views/dev/config/fileConfig/localFileForm.vue +++ b/snowy-admin-web/src/views/dev/config/fileConfig/localFileForm.vue @@ -55,24 +55,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/config/fileConfig/minioFileForm.vue b/snowy-admin-web/src/views/dev/config/fileConfig/minioFileForm.vue index 5b2fbd24..ab14e116 100644 --- a/snowy-admin-web/src/views/dev/config/fileConfig/minioFileForm.vue +++ b/snowy-admin-web/src/views/dev/config/fileConfig/minioFileForm.vue @@ -63,24 +63,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/config/fileConfig/tencentFileForm.vue b/snowy-admin-web/src/views/dev/config/fileConfig/tencentFileForm.vue index 7b5492e4..0806473e 100644 --- a/snowy-admin-web/src/views/dev/config/fileConfig/tencentFileForm.vue +++ b/snowy-admin-web/src/views/dev/config/fileConfig/tencentFileForm.vue @@ -63,24 +63,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/config/otherConfig/form.vue b/snowy-admin-web/src/views/dev/config/otherConfig/form.vue index aaa3b176..3b69259c 100644 --- a/snowy-admin-web/src/views/dev/config/otherConfig/form.vue +++ b/snowy-admin-web/src/views/dev/config/otherConfig/form.vue @@ -68,20 +68,18 @@ // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - configApi - .submitForm(formData.value, !formData.value.id) - .then(() => { - onClose() - emit('successful') - }) - .finally(() => { - submitLoading.value = false - }) - }) + formRef.value.validate().then(() => { + submitLoading.value = true + configApi + .submitForm(formData.value, !formData.value.id) + .then(() => { + onClose() + emit('successful') + }) + .finally(() => { + submitLoading.value = false + }) + }) } // 调用这个函数将子组件的一些数据和方法暴露出去 diff --git a/snowy-admin-web/src/views/dev/config/smsConfig/aliyunSmsForm.vue b/snowy-admin-web/src/views/dev/config/smsConfig/aliyunSmsForm.vue index 766f040a..cabc31ed 100644 --- a/snowy-admin-web/src/views/dev/config/smsConfig/aliyunSmsForm.vue +++ b/snowy-admin-web/src/views/dev/config/smsConfig/aliyunSmsForm.vue @@ -63,24 +63,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/config/smsConfig/tencentSmsForm.vue b/snowy-admin-web/src/views/dev/config/smsConfig/tencentSmsForm.vue index 39678ae6..84c9c45b 100644 --- a/snowy-admin-web/src/views/dev/config/smsConfig/tencentSmsForm.vue +++ b/snowy-admin-web/src/views/dev/config/smsConfig/tencentSmsForm.vue @@ -67,24 +67,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/config/sysConfig.vue b/snowy-admin-web/src/views/dev/config/sysConfig.vue index bd419cd5..0452ac7a 100644 --- a/snowy-admin-web/src/views/dev/config/sysConfig.vue +++ b/snowy-admin-web/src/views/dev/config/sysConfig.vue @@ -140,19 +140,9 @@ } }) // 文件引擎 - const fileEngineOptions = tool.dictTypeList('FILE_ENGINE').map((item) => { - return { - value: item['dictValue'], - label: item['name'] - } - }) + const fileEngineOptions = tool.dictList('FILE_ENGINE') // 开关 - const commonSwitchOptions = tool.dictTypeList('COMMON_SWITCH').map((item) => { - return { - value: item['dictValue'], - label: item['name'] - } - }) + const commonSwitchOptions = tool.dictList('COMMON_SWITCH') const customRequest = (data) => { formData.value.SNOWY_SYS_LOGO = ref([]) diff --git a/snowy-admin-web/src/views/dev/config/thirdConfig/giteeThirdForm.vue b/snowy-admin-web/src/views/dev/config/thirdConfig/giteeThirdForm.vue index 3672bfcb..17ff5a05 100644 --- a/snowy-admin-web/src/views/dev/config/thirdConfig/giteeThirdForm.vue +++ b/snowy-admin-web/src/views/dev/config/thirdConfig/giteeThirdForm.vue @@ -59,24 +59,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/config/thirdConfig/wechatThirdForm.vue b/snowy-admin-web/src/views/dev/config/thirdConfig/wechatThirdForm.vue index f48ee0f0..4a4d5c77 100644 --- a/snowy-admin-web/src/views/dev/config/thirdConfig/wechatThirdForm.vue +++ b/snowy-admin-web/src/views/dev/config/thirdConfig/wechatThirdForm.vue @@ -59,24 +59,22 @@ } // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - submitLoading.value = true - let submitParam = cloneDeep(formData.value) - const param = Object.entries(submitParam).map((item) => { - return { - configKey: item[0], - configValue: item[1] - } - }) - configApi - .configEditForm(param) - .then(() => {}) - .finally(() => { - submitLoading.value = false - }) + formRef.value.validate().then(() => { + submitLoading.value = true + let submitParam = cloneDeep(formData.value) + const param = Object.entries(submitParam).map((item) => { + return { + configKey: item[0], + configValue: item[1] + } }) + configApi + .configEditForm(param) + .then(() => {}) + .finally(() => { + submitLoading.value = false + }) + }) } const layout = { labelCol: { diff --git a/snowy-admin-web/src/views/dev/dict/category/form.vue b/snowy-admin-web/src/views/dev/dict/category/form.vue index 02597ba2..96572760 100644 --- a/snowy-admin-web/src/views/dev/dict/category/form.vue +++ b/snowy-admin-web/src/views/dev/dict/category/form.vue @@ -31,7 +31,12 @@ - + @@ -104,14 +109,12 @@ }) // 验证并提交数据 const onSubmit = () => { - formRef.value - .validate() - .then(() => { - dictApi.submitForm(formData.value, !formData.value.id).then(() => { - visible = false - emit('successful') - }) + formRef.value.validate().then(() => { + dictApi.submitForm(formData.value, !formData.value.id).then(() => { + visible = false + emit('successful') }) + }) } // 调用这个函数将子组件的一些数据和方法暴露出去 defineExpose({ diff --git a/snowy-admin-web/src/views/dev/email/index.vue b/snowy-admin-web/src/views/dev/email/index.vue index e2022b52..0fd01ac8 100644 --- a/snowy-admin-web/src/views/dev/email/index.vue +++ b/snowy-admin-web/src/views/dev/email/index.vue @@ -70,16 +70,14 @@