diff --git a/admin/src/components/flow/Approver.vue b/admin/src/components/flow/Approver.vue index 34bf2dd..2787bc3 100644 --- a/admin/src/components/flow/Approver.vue +++ b/admin/src/components/flow/Approver.vue @@ -179,7 +179,7 @@ export default defineComponent({ .catch((err) => { console.error(err) err.target && (this.activeStep = err.target) - err.msg && this.$message.error(err.msg) + err.message && this.$message.error(err.message) }) }, diff --git a/admin/src/components/flow/flowEdit/Diagram.vue b/admin/src/components/flow/flowEdit/Diagram.vue index 99277e8..b8597c5 100644 --- a/admin/src/components/flow/flowEdit/Diagram.vue +++ b/admin/src/components/flow/flowEdit/Diagram.vue @@ -191,13 +191,13 @@ export default { if (haveMoreChildNode) { // 如果都是网关就可以,等优化 return reject({ - msg: '流程设计-一个节点只能有一个子节点,可以有多个网关' + message: '流程设计-一个节点只能有一个子节点,可以有多个网关' }) } // if (data.nodes.length != data.edges.length + 1) { // return reject({ - // msg: "流程设计-节点之间必须连线,可以清理多余的节点",//不是很重要 + // message: "流程设计-节点之间必须连线,可以清理多余的节点",//不是很重要 // }); // } // 检查开始节点和结束节点是否存在 @@ -205,7 +205,7 @@ export default { const findEndNode = nodes.filter((item) => item.type == 'bpmn:endEvent') if (findStartNode.length != 1 || findEndNode.length != 1) { return reject({ - msg: '流程设计-流程必须有且只有一个开始节点和结束节点' + message: '流程设计-流程必须有且只有一个开始节点和结束节点' }) } diff --git a/admin/src/components/upload/index.vue b/admin/src/components/upload/index.vue index 227f54c..ea90591 100644 --- a/admin/src/components/upload/index.vue +++ b/admin/src/components/upload/index.vue @@ -113,8 +113,8 @@ export default defineComponent({ visible.value = false emit('change') } - if (response.code == RequestCodeEnum.FAILED && response.msg) { - feedback.msgError(response.msg) + if (response.code == RequestCodeEnum.FAILED && response.message) { + feedback.msgError(response.message) } } const handleError = (event: any, file: any) => { diff --git a/admin/src/utils/request/index.ts b/admin/src/utils/request/index.ts index 6d866c4..67a0ce3 100644 --- a/admin/src/utils/request/index.ts +++ b/admin/src/utils/request/index.ts @@ -49,7 +49,7 @@ const axiosHooks: AxiosHooks = { if (!isTransformResponse) { return response.data } - const { code, data, msg } = response.data + const { code, data, message } = response.data switch (code) { case RequestCodeEnum.SUCCESS: return data @@ -64,7 +64,7 @@ const axiosHooks: AxiosHooks = { case RequestCodeEnum.NO_PERMISSTION: case RequestCodeEnum.FAILED: case RequestCodeEnum.SYSTEM_ERROR: - msg && feedback.msgError(msg) + message && feedback.msgError(message) return Promise.reject(data) case RequestCodeEnum.TOKEN_INVALID: diff --git a/admin/src/utils/request/type.d.ts b/admin/src/utils/request/type.d.ts index 3a3c6a7..0277ff6 100644 --- a/admin/src/utils/request/type.d.ts +++ b/admin/src/utils/request/type.d.ts @@ -33,5 +33,5 @@ export interface AxiosHooks { export interface ResponseData { code: number data: T - msg: string + message: string } diff --git a/admin/src/views/monitor_client/edit.vue b/admin/src/views/monitor_client/edit.vue index 0e403a3..7f38905 100644 --- a/admin/src/views/monitor_client/edit.vue +++ b/admin/src/views/monitor_client/edit.vue @@ -179,7 +179,7 @@ const handleSubmit = async () => { feedback.msgSuccess('操作成功') emit('success') }).catch((err) => { - feedback.msgError(err.msg) + feedback.msgError(err.message) }) } catch (error) {} }) diff --git a/server/admin/generator/tpl_utils/templates/uniapp/api.ts.tpl b/server/admin/generator/tpl_utils/templates/uniapp/api.ts.tpl index 338c306..4951f16 100644 --- a/server/admin/generator/tpl_utils/templates/uniapp/api.ts.tpl +++ b/server/admin/generator/tpl_utils/templates/uniapp/api.ts.tpl @@ -47,7 +47,6 @@ export function {{{.ModuleName}}}_edit(data: Record) { // {{{.FunctionName}}}删除 export function {{{.ModuleName}}}_delete({{{ .PrimaryKey }}}: number | string) { - return request.post({ url: '/{{{.ModuleName}}}/del', { {{{ .PrimaryKey }}} } }) return request({ url: '/{{{.ModuleName}}}/del', method: "POST", diff --git a/server/admin/generator/tpl_utils/templates/uniapp/details.vue.tpl b/server/admin/generator/tpl_utils/templates/uniapp/details.vue.tpl index deac5e5..880defc 100644 --- a/server/admin/generator/tpl_utils/templates/uniapp/details.vue.tpl +++ b/server/admin/generator/tpl_utils/templates/uniapp/details.vue.tpl @@ -43,11 +43,11 @@ onShow } from "@dcloudio/uni-app"; import { - useDictOptions - } from "@/api/dict.js"; + useDictData + } from "@/hooks/useDictOptions"; import { {{{ .ModuleName }}}_detail - } from "@/api/{{{ .ModuleName }}}.js"; + } from "@/api/{{{ .ModuleName }}}"; import { @@ -57,7 +57,10 @@ } from "@/utils/utils"; let form = ref({}); - +{{{- if ge (len .DictFields) 1 }}} +{{{- $dictSize := sub (len .DictFields) 1 }}} +const { dictData } = useDictData([{{{- range .DictFields }}}'{{{ . }}}'{{{- if ne (index $.DictFields $dictSize) . }}},{{{- end }}}{{{- end }}}]) +{{{- end }}} onLoad((e) => { console.log("onLoad", e); getDetails(e.id); @@ -67,18 +70,22 @@ getDetails(form.value.id); } }); - + onPullDownRefresh(() => { + getDetails(form.value.id); + }); function getDetails(id) { {{{ .ModuleName }}}_detail(id).then((res) => { + uni.stopPullDownRefresh(); if (res.code == 200) { - if (res?.result) { - form.value = res?.result + if (res?.data) { + form.value = res?.data } } else { toast(res.message); } }) .catch((err) => { + uni.stopPullDownRefresh(); toast(err.message||"网络错误"); }); } diff --git a/server/admin/generator/tpl_utils/templates/uniapp/edit.vue.tpl b/server/admin/generator/tpl_utils/templates/uniapp/edit.vue.tpl index 91b88da..508f89b 100644 --- a/server/admin/generator/tpl_utils/templates/uniapp/edit.vue.tpl +++ b/server/admin/generator/tpl_utils/templates/uniapp/edit.vue.tpl @@ -5,13 +5,17 @@ {{{- if .IsEdit }}} {{{- if eq .HtmlType "input" }}} - + {{{- else if eq .HtmlType "number" }}} - + {{{- else if eq .HtmlType "textarea" }}} - + {{{- else if or (eq .HtmlType "checkbox") (eq .HtmlType "radio") (eq .HtmlType "select")}}} - + {{{- if ne .DictType "" }}} + + {{{- else }}} + 请选择字典生成代码 + {{{- end }}} {{{- end }}} {{{- end }}} @@ -35,12 +39,15 @@ import { {{{ .ModuleName }}}_detail, {{{ .ModuleName }}}_edit - } from "@/api/{{{ .ModuleName }}}.js"; + } from "@/api/{{{ .ModuleName }}}"; import { toast, alert } from "@/utils/utils"; - + import { + useDictData + } from "@/hooks/useDictOptions"; + let formRef = ref(); let form = ref({ {{{- range .Columns }}} diff --git a/server/admin/generator/tpl_utils/templates/uniapp/index.vue.tpl b/server/admin/generator/tpl_utils/templates/uniapp/index.vue.tpl index b1b81ad..882b59b 100644 --- a/server/admin/generator/tpl_utils/templates/uniapp/index.vue.tpl +++ b/server/admin/generator/tpl_utils/templates/uniapp/index.vue.tpl @@ -65,8 +65,8 @@ import { onReachBottom, onPageScroll, } from "@dcloudio/uni-app"; -import { {{{ .ModuleName }}}_list } from "@/api/{{{ .ModuleName }}}.js"; -import { usePaging } from "@/utils/usePaging"; +import { {{{ .ModuleName }}}_list } from "@/api/{{{ .ModuleName }}}"; +import { usePaging } from "@/hooks/usePaging"; import { toPath } from "@/utils/utils"; const queryParams = reactive({ key: "", diff --git a/server/admin/generator/tpl_utils/templates/uniapp/search.vue.tpl b/server/admin/generator/tpl_utils/templates/uniapp/search.vue.tpl index d41991c..c8bdd36 100644 --- a/server/admin/generator/tpl_utils/templates/uniapp/search.vue.tpl +++ b/server/admin/generator/tpl_utils/templates/uniapp/search.vue.tpl @@ -1,32 +1,20 @@ -