From 80fbf18b10333979e2cd0e267cef3c4027fa0d2e Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 01 七月 2024 18:31:33 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/system/user/edit.vue | 174 +++++++++++++++++++
zy-asrs-framework/src/main/resources/templates/vue/Edit.txt | 18 +
zy-asrs-admin/src/utils/request.js | 12 +
zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java | 48 ++++
zy-asrs-admin/src/views/system/user/index.vue | 253 ++++++++++++++++++++++++++++
5 files changed, 492 insertions(+), 13 deletions(-)
diff --git a/zy-asrs-admin/src/utils/request.js b/zy-asrs-admin/src/utils/request.js
index eb7803e..9b5bcd7 100644
--- a/zy-asrs-admin/src/utils/request.js
+++ b/zy-asrs-admin/src/utils/request.js
@@ -40,4 +40,16 @@
})
}
+export const postForm = (url, params) => {
+ return instance({
+ url: url,
+ method: 'post',
+ data: params,
+ headers: {
+ Authorization: globalState.token,
+ 'Content-Type': 'multipart/form-data'
+ }
+ })
+}
+
export default instance;
\ No newline at end of file
diff --git a/zy-asrs-admin/src/views/system/user/edit.vue b/zy-asrs-admin/src/views/system/user/edit.vue
new file mode 100644
index 0000000..516ef43
--- /dev/null
+++ b/zy-asrs-admin/src/views/system/user/edit.vue
@@ -0,0 +1,174 @@
+<script setup>
+import { ref, nextTick } from 'vue';
+import { get, post, postBlob, postForm } from '@/utils/request.js'
+import { formatMessage } from '@/utils/localeUtils.js';
+import { message } from 'ant-design-vue';
+
+const submitButton = ref(null);
+const isSave = ref(true);
+const open = ref(false);
+const initFormData = {}
+let formData = ref(initFormData);
+const treeData = ref(null);
+
+const emit = defineEmits(['tableReload'])
+
+const handleOk = (e) => {
+ nextTick(() => {
+ setTimeout(() => {
+ submitButton.value.$el.click();
+ }, 100);
+ });
+};
+
+const onFinish = values => {
+ // console.log('Success:', values);
+ open.value = false;
+ post(isSave.value ? '/api/user/save' : '/api/user/update', formData.value).then((resp) => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ } else {
+ message.error(result.msg);
+ }
+ emit('tableReload', 'reload')
+ })
+};
+const onFinishFailed = errorInfo => {
+ console.log('Failed:', errorInfo);
+};
+
+const DeptQueryList = ref(null);
+DeptQuery();
+function DeptQuery() {
+ postForm('/api/dept/query', {}).then(resp => {
+ let result = resp.data;
+ DeptQueryList.value = result.data;
+ })
+}
+const UserQueryList = ref(null);
+UserQuery();
+function UserQuery() {
+ postForm('/api/user/query', {}).then(resp => {
+ let result = resp.data;
+ UserQueryList.value = result.data;
+ })
+}
+
+
+defineExpose({
+ open,
+ formData,
+ initFormData,
+ treeData,
+ isSave,
+})
+
+</script>
+
+<script>
+export default {
+ name: '鐢ㄦ埛绠＄悊-edit'
+}
+</script>
+
+<template>
+ <div>
+ <a-modal v-model:open="open"
+ :title="isSave ? formatMessage('page.add', '娣诲姞') : formatMessage('page.edit', '缂栬緫')" @ok="handleOk"
+ style="width: 600px;">
+ <a-form :model="formData" name="formTable" :label-col="{ span: 8 }" :wrapper-col="{ span: 16 }"
+ style="display: flex;justify-content: space-between;flex-wrap: wrap;" autocomplete="off"
+ @finish="onFinish" @finishFailed="onFinishFailed">
+ <a-form-item label="璐﹀彿" name="username" style="width: 250px;" :rules="[{ required: true }]">
+ <a-input v-model:value="formData.username" />
+ </a-form-item>
+ <a-form-item label="瀵嗙爜" name="password" style="width: 250px;">
+ <a-input v-model:value="formData.password" />
+ </a-form-item>
+ <a-form-item label="鏄电О" name="nickname" style="width: 250px;">
+ <a-input v-model:value="formData.nickname" />
+ </a-form-item>
+ <a-form-item label="澶村儚" name="avatar" style="width: 250px;">
+ <a-input v-model:value="formData.avatar" />
+ </a-form-item>
+ <a-form-item label="宸ュ彿" name="code" style="width: 250px;">
+ <a-input v-model:value="formData.code" />
+ </a-form-item>
+ <a-form-item label="鎬у埆" name="sex" style="width: 250px;">
+ <a-select v-model:value="formData.sex" :options="[
+ { label: '鏈煡', value: 0 },
+ { label: '鐢�', value: 1 },
+ { label: '濂�', value: 2 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <a-form-item label="鎵嬫満鍙�" name="phone" style="width: 250px;">
+ <a-input v-model:value="formData.phone" />
+ </a-form-item>
+ <a-form-item label="閭" name="email" style="width: 250px;">
+ <a-input v-model:value="formData.email" />
+ </a-form-item>
+ <a-form-item label="閭楠岃瘉" name="emailVerified" style="width: 250px;">
+ <a-select v-model:value="formData.emailVerified" :options="[
+ { label: '鍚�', value: 0 },
+ { label: '鏄�', value: 1 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <a-form-item label="鎵�灞為儴闂�" name="deptId" style="width: 250px;">
+ <a-select v-model:value="formData.deptId" placeholder="Select users" style="width: 100%" show-search
+ :options="DeptQueryList" optionFilterProp="label" optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item label="鐪熷疄濮撳悕" name="realName" style="width: 250px;">
+ <a-input v-model:value="formData.realName" />
+ </a-form-item>
+ <a-form-item label="韬唤璇佸彿" name="idCard" style="width: 250px;">
+ <a-input v-model:value="formData.idCard" />
+ </a-form-item>
+ <a-form-item label="鍑虹敓鏃ユ湡" name="birthday" style="width: 250px;">
+ <a-input v-model:value="formData.birthday" />
+ </a-form-item>
+ <a-form-item label="涓汉绠�浠�" name="introduction" style="width: 250px;">
+ <a-input v-model:value="formData.introduction" />
+ </a-form-item>
+ <a-form-item label="鐘舵��" name="status" style="width: 250px;">
+ <a-select v-model:value="formData.status" :options="[
+ { label: '姝ｅ父', value: 1 },
+ { label: '绂佺敤', value: 0 },
+ ]">
+ </a-select>
+ </a-form-item>
+ <a-form-item label="娣诲姞鏃堕棿" name="createTime" style="width: 250px;">
+ <a-date-picker v-model:value="formData.createTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item label="娣诲姞浜哄憳" name="createBy" style="width: 250px;">
+ <a-select v-model:value="formData.createBy" placeholder="Select users" style="width: 100%"
+ show-search :options="UserQueryList" optionFilterProp="label" optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item label="淇敼鏃堕棿" name="updateTime" style="width: 250px;">
+ <a-date-picker v-model:value="formData.updateTime" show-time format="YYYY-MM-DD HH:mm:ss"
+ value-format="YYYY-MM-DD HH:mm:ss" />
+ </a-form-item>
+ <a-form-item label="淇敼浜哄憳" name="updateBy" style="width: 250px;">
+ <a-select v-model:value="formData.updateBy" placeholder="Select users" style="width: 100%"
+ show-search :options="UserQueryList" optionFilterProp="label" optionLabelProp="label">
+ </a-select>
+ </a-form-item>
+ <a-form-item label="澶囨敞" name="memo" style="width: 250px;">
+ <a-input v-model:value="formData.memo" />
+ </a-form-item>
+
+ <a-form-item>
+ <a-button type="primary" html-type="submit" ref="submitButton"
+ style="visibility: hidden;">Submit</a-button>
+ </a-form-item>
+ </a-form>
+ </a-modal>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-admin/src/views/system/user/index.vue b/zy-asrs-admin/src/views/system/user/index.vue
new file mode 100644
index 0000000..37c97b1
--- /dev/null
+++ b/zy-asrs-admin/src/views/system/user/index.vue
@@ -0,0 +1,253 @@
+<script setup>
+import { getCurrentInstance, ref, computed, reactive } from 'vue';
+import { useRouter } from "vue-router";
+import { get, post, postBlob } from '@/utils/request.js'
+import { message, Modal } from 'ant-design-vue';
+import { logout } from '@/config.js';
+import EditView from './edit.vue'
+import { formatMessage } from '@/utils/localeUtils.js';
+const context = getCurrentInstance()?.appContext.config.globalProperties;
+
+const router = useRouter();
+
+const TABLE_KEY = 'table-user';
+let currentPage = 1;
+let pageSize = 10;
+const searchInput = ref("")
+const editChild = ref(null)
+
+let tableData = ref([]);
+getPage();
+
+const columns = [
+ {
+ title: '璐﹀彿',
+ dataIndex: 'username',
+ width: 140,
+ },
+ {
+ title: '瀵嗙爜',
+ dataIndex: 'password',
+ width: 140,
+ },
+ {
+ title: '鏄电О',
+ dataIndex: 'nickname',
+ width: 140,
+ },
+ {
+ title: '澶村儚',
+ dataIndex: 'avatar',
+ width: 140,
+ },
+ {
+ title: '宸ュ彿',
+ dataIndex: 'code',
+ width: 140,
+ },
+ {
+ title: '鎬у埆',
+ dataIndex: 'sex$',
+ width: 140,
+ },
+ {
+ title: '鎵嬫満鍙�',
+ dataIndex: 'phone',
+ width: 140,
+ },
+ {
+ title: '閭',
+ dataIndex: 'email',
+ width: 140,
+ },
+ {
+ title: '閭楠岃瘉',
+ dataIndex: 'emailVerified$',
+ width: 140,
+ },
+ {
+ title: '鎵�灞為儴闂�',
+ dataIndex: 'deptId$',
+ width: 140,
+ },
+ {
+ title: '鐪熷疄濮撳悕',
+ dataIndex: 'realName',
+ width: 140,
+ },
+ {
+ title: '韬唤璇佸彿',
+ dataIndex: 'idCard',
+ width: 140,
+ },
+ {
+ title: '鍑虹敓鏃ユ湡',
+ dataIndex: 'birthday',
+ width: 140,
+ },
+ {
+ title: '涓汉绠�浠�',
+ dataIndex: 'introduction',
+ width: 140,
+ },
+ {
+ title: '鐘舵��',
+ dataIndex: 'status$',
+ width: 140,
+ },
+ {
+ title: '娣诲姞鏃堕棿',
+ dataIndex: 'createTime$',
+ width: 140,
+ },
+ {
+ title: '娣诲姞浜哄憳',
+ dataIndex: 'createBy$',
+ width: 140,
+ },
+ {
+ title: '淇敼鏃堕棿',
+ dataIndex: 'updateTime$',
+ width: 140,
+ },
+ {
+ title: '淇敼浜哄憳',
+ dataIndex: 'updateBy$',
+ width: 140,
+ },
+ {
+ title: '澶囨敞',
+ dataIndex: 'memo',
+ width: 140,
+ },
+
+ {
+ title: '鎿嶄綔',
+ name: 'oper',
+ dataIndex: 'oper',
+ key: 'oper',
+ },
+];
+
+const state = reactive({
+ selectedRowKeys: [],
+ loading: false,
+});
+const hasSelected = computed(() => state.selectedRowKeys.length > 0);
+const start = () => {
+ state.loading = true;
+ // ajax request after empty completing
+ setTimeout(() => {
+ state.loading = false;
+ state.selectedRowKeys = [];
+ }, 1000);
+};
+const onSelectChange = selectedRowKeys => {
+ // console.log('selectedRowKeys changed: ', selectedRowKeys);
+ state.selectedRowKeys = selectedRowKeys;
+};
+
+function getPage() {
+ post('/api/user/page', {
+ current: currentPage,
+ pageSize: pageSize,
+ condition: searchInput.value
+ }).then((resp) => {
+ let result = resp.data;
+ if (result.code == 200) {
+ let data = result.data;
+ tableData.value = data;
+ } else if (result.code === 401) {
+ message.error(result.msg);
+ logout()
+ } else {
+ message.error(result.msg);
+ }
+ })
+}
+
+const handleEdit = (item) => {
+ editChild.value.open = true;
+ editChild.value.formData = item == null ? editChild.value.initFormData : JSON.parse(JSON.stringify(item));
+ editChild.value.isSave = item == null;
+}
+
+const handleDel = (rows) => {
+ Modal.confirm({
+ title: formatMessage('page.delete', '鍒犻櫎'),
+ content: formatMessage('page.delete.confirm', '纭畾鍒犻櫎璇ラ」鍚楋紵'),
+ maskClosable: true,
+ onOk: async () => {
+ post('/api/user/remove/' + rows.map((row) => row.id).join(','), {}).then(resp => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(result.msg);
+ } else {
+ message.error(result.msg);
+ }
+ getPage()
+ })
+ },
+ });
+}
+
+const handleExport = async (intl) => {
+ postBlob('/api/user/export', {}).then(result => {
+ const blob = new Blob([result.data], { type: 'application/vnd.ms-excel' });
+ window.location.href = window.URL.createObjectURL(blob);
+ return true;
+ })
+};
+
+const onSearch = () => {
+ // console.log('search');
+ getPage()
+}
+
+const onPageChange = (page, size) => {
+ currentPage = page;
+ pageSize = size;
+ getPage();
+}
+
+function handleTableReload(value) {
+ getPage()
+}
+
+</script>
+
+<script>
+export default {
+ name: '鐢ㄦ埛绠＄悊'
+}
+</script>
+
+<template>
+ <div>
+ <EditView ref="editChild" @tableReload="handleTableReload" />
+ <div class="table-header">
+ <a-input-search v-model:value="searchInput" :placeholder="formatMessage('page.input', '璇疯緭鍏�')"
+ style="width: 200px;" @search="onSearch" />
+ <div class="table-header-right">
+ <a-button @click="handleEdit(null)" type="primary">{{ formatMessage('page.add', '娣诲姞') }}</a-button>
+ <a-button @click="handleExport">{{ formatMessage('page.export', '瀵煎嚭') }}</a-button>
+ </div>
+ </div>
+ <a-table :row-selection="{ selectedRowKeys: state.selectedRowKeys, onChange: onSelectChange }"
+ :data-source="tableData.records" :defaultExpandAllRows="false" :key="TABLE_KEY" rowKey="id"
+ :pagination="{ total: tableData.total, onChange: onPageChange }"
+ :scroll="{ y: 768, scrollToFirstRowOnChange: true }" :columns="columns">
+ <template #bodyCell="{ column, text, record }">
+ <template v-if="column.dataIndex === 'oper'">
+ <div style="display: flex;justify-content: space-evenly;">
+ <a-button type="link" primary @click="handleEdit(record)">{{ formatMessage('page.edit', '缂栬緫') }}</a-button>
+ <a-button type="link" danger @click="handleDel([record])">{{ formatMessage('page.delete', '鍒犻櫎')
+ }}</a-button>
+ </div>
+ </template>
+ </template>
+ </a-table>
+ </div>
+</template>
+
+<style></style>
diff --git a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
index 3fe2222..2adb39a 100644
--- a/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
+++ b/zy-asrs-framework/src/main/java/com/zy/asrs/framework/generators/VueGenerator.java
@@ -73,6 +73,7 @@
private String itemName;
private String tableColumns;
private String formEditColumns;
+ private String formEditForeignKeyColumns;
public void build() throws Exception {
init();
@@ -217,6 +218,7 @@
.replaceAll("@\\{SYSTEMPACKAGE}",systemPackage)
.replaceAll("@\\{TABLECOLUMNS}", tableColumns)
.replaceAll("@\\{FORMEDITCOLUMNS}", formEditColumns)
+ .replaceAll("@\\{FORMEDITFOREIGNKEYCOLUMNS}", formEditForeignKeyColumns)
;
writerFile.createNewFile();
BufferedWriter writer=new BufferedWriter(new FileWriter(writerFile));
@@ -847,7 +849,10 @@
private String createFormEditColumns() {
StringBuilder sb = new StringBuilder();
+ StringBuilder sb2 = new StringBuilder();
+ ArrayList<String> foreignKeyContains = new ArrayList<>();
for (Column column : columns) {
+ boolean has = true;
if (column.isPrimaryKey()
|| column.getHumpName().equals("deleted")
|| column.getHumpName().equals("hostId")
@@ -879,31 +884,60 @@
sb.append(" ]\"\n");
sb.append(" >\n");
sb.append(" </a-select>\n");
+ has = false;
}
// 鏃堕棿
if ("Date".equals(column.getType())) {
- sb.append(" <a-select \n");
+ sb.append(" <a-date-picker \n");
sb.append(" v-model:value=\"formData.").append(column.getHumpName()).append("\" \n");
sb.append(" show-time \n");
sb.append(" format=\"YYYY-MM-DD HH:mm:ss\" \n");
sb.append(" value-format=\"YYYY-MM-DD HH:mm:ss\" \n");
sb.append(" /> \n");
+ has = false;
}
// 鍏宠仈琛�
if (!Cools.isEmpty(column.getForeignKey())) {
-// sb.append(" showSearch\n")
-// .append(" debounceTime={300}\n")
-// .append(" request={async ({ keyWords }) => {\n")
-// .append(" const resp = await Http.doPostForm('api/").append(GeneratorUtils.firstCharConvert(column.getForeignKey())).append("/query', { condition: keyWords });\n")
-// .append(" return resp.data;\n")
-// .append(" }}\n");
+ if (!foreignKeyContains.contains(column.getForeignKey())) {
+ sb2.append("const ").append(column.getForeignKey()).append("QueryList = ref(null); \n");
+ sb2.append(column.getForeignKey()).append("Query();\n");
+ sb2.append("function ").append(column.getForeignKey()).append("Query() { \n");
+ sb2.append(" postForm('/api/").append(column.getForeignKey().toLowerCase()).append("/query', {}).then(resp => { \n");
+ sb2.append(" let result = resp.data;\n");
+ sb2.append(" ").append(column.getForeignKey()).append("QueryList.value = result.data;\n");
+ sb2.append(" })\n");
+ sb2.append("}\n");
+
+ foreignKeyContains.add(column.getForeignKey());
+ }
+
+ sb.append(" <a-select \n");
+ sb.append(" v-model:value=\"formData.").append(column.getHumpName()).append("\" \n");
+ sb.append(" placeholder=\"Select users\" \n");
+ sb.append(" style=\"width: 100%\" \n");
+ sb.append(" show-search \n");
+ sb.append(" :options=\"").append(column.getForeignKey()).append("QueryList\" \n");
+ sb.append(" optionFilterProp=\"label\" \n");
+ sb.append(" optionLabelProp=\"label\" \n");
+ sb.append(" > \n");
+ sb.append(" </a-select>\n");
+ has = false;
+ }
+
+ if (has) {
+ sb.append(" <a-input \n");
+ sb.append(" v-model:value=\"formData.").append(column.getHumpName()).append("\" \n");
+ sb.append(" /> \n");
+ has = false;
}
sb.append(" </a-form-item>\n");
}
+
+ formEditForeignKeyColumns = sb2.toString();
return sb.toString();
}
diff --git a/zy-asrs-framework/src/main/resources/templates/vue/Edit.txt b/zy-asrs-framework/src/main/resources/templates/vue/Edit.txt
index 0e82260..382607d 100644
--- a/zy-asrs-framework/src/main/resources/templates/vue/Edit.txt
+++ b/zy-asrs-framework/src/main/resources/templates/vue/Edit.txt
@@ -1,14 +1,13 @@
<script setup>
import { ref, nextTick } from 'vue';
-import { get, post } from '@/utils/request.js'
+import { get, post, postBlob, postForm } from '@/utils/request.js'
import { formatMessage } from '@/utils/localeUtils.js';
+import { message } from 'ant-design-vue';
const submitButton = ref(null);
const isSave = ref(true);
const open = ref(false);
-const initFormData = {
- name: null
-}
+const initFormData = {}
let formData = ref(initFormData);
const treeData = ref(null);
@@ -25,8 +24,13 @@
const onFinish = values => {
// console.log('Success:', values);
open.value = false;
- post(isSave.value ? '/api/@{SIMPLEENTITYNAME}/save' : '/api/@{SIMPLEENTITYNAME}/update', formData.value).then((result) => {
- console.log(result);
+ post(isSave.value ? '/api/@{SIMPLEENTITYNAME}/save' : '/api/@{SIMPLEENTITYNAME}/update', formData.value).then((resp) => {
+ let result = resp.data;
+ if (result.code === 200) {
+ message.success(formatMessage('page.update.success', '鏇存柊鎴愬姛'));
+ } else {
+ message.error(result.msg);
+ }
emit('tableReload', 'reload')
})
};
@@ -34,6 +38,8 @@
console.log('Failed:', errorInfo);
};
+@{FORMEDITFOREIGNKEYCOLUMNS}
+
defineExpose({
open,
formData,
--
Gitblit v1.9.1