From bc7bc3cda61f410a2ed2edbf84e6c58a7b6e559e Mon Sep 17 00:00:00 2001
From: 1638245306 <1638245306@qq.com>
Date: Fri, 14 Mar 2025 17:33:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(system):=20=E4=BC=98=E5=8C=96=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E8=A1=A8=E5=8D=95=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 crudTable组件中添加 afterSubmit 钩子，更新 modelValue
-重构 formContent 组件中的 formData，使用 ref 替代 reactive
- 优化 formContent 组件的提交逻辑，简化代码结构
---
 .../config/components/components/crudTable.vue  |  7 +++++--
 .../system/config/components/formContent.vue    | 17 +++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/src/views/system/config/components/components/crudTable.vue b/web/src/views/system/config/components/components/crudTable.vue
index 016f40f..1bfcfe9 100644
--- a/web/src/views/system/config/components/components/crudTable.vue
+++ b/web/src/views/system/config/components/components/crudTable.vue
@@ -6,7 +6,7 @@
 </template>
 
 <script setup lang="ts">
-import {defineComponent, onMounted, watch} from "vue";
+import {computed, defineComponent, onMounted, watch} from "vue";
 import {CreateCrudOptionsProps, CreateCrudOptionsRet, useFs, AddReq,
   compute,
   DelReq,
@@ -34,6 +34,9 @@ const createCrudOptions = function ({ crudExpose, context }: CreateCrudOptionsPr
         },
         col:{
           span:24
+        },
+        afterSubmit({mode}){
+          emit('update:modelValue', crudBinding.value.data);
         }
       },
       toolbar:{
@@ -96,6 +99,7 @@ const props = defineProps({
 })
 const emit = defineEmits(['update:modelValue'])
 
+
 //通过导出modelValue, 可以导出成为一个input组件
 watch(
     () => {
@@ -103,7 +107,6 @@ watch(
     },
     (value = []) => {
       crudBinding.value.data = value;
-      //emit('update:modelValue', value);
     },
     {
       immediate: true
diff --git a/web/src/views/system/config/components/formContent.vue b/web/src/views/system/config/components/formContent.vue
index fafa186..16faf51 100644
--- a/web/src/views/system/config/components/formContent.vue
+++ b/web/src/views/system/config/components/formContent.vue
@@ -210,7 +210,7 @@ import {Edit,Finished,Delete} from "@element-plus/icons-vue";
 import crudTable from "./components/crudTable.vue"
 const props = defineProps(['options', 'editableTabsItem']);
 
-let formData: any = reactive({});
+let formData: any = ref({});
 let formList: any = ref([]);
 const formRef =  ref<FormInstance>()
 let uploadUrl = ref(getBaseURL() + 'api/system/file/');
@@ -233,29 +233,26 @@ const getInit = () => {
         _formData[key] = item.value;
       } else {
         if ([5, 12,11, 14].indexOf(item.form_item_type) !== -1) {
-          _formData[key] = [];
+          _formData[key] = item.value || [];
         } else {
           _formData[key] = item.value;
         }
       }
     }
-    formData = Object.assign({}, _formData)
+    formData.value = Object.assign({}, _formData)
   });
 };
 
 // 提交数据
 const onSubmit = (formEl: FormInstance | undefined) => {
-  // const form = JSON.parse(JSON.stringify(form));
-  const keys = Object.keys(formData);
-  const values = Object.values(formData);
+  const keys = Object.keys(formData.value);
+  const values = Object.values(formData.value);
   for (const index in formList.value) {
     const item = formList.value[index];
     // 赋值操作
-    keys.map((mapKey, mapIndex) => {
+    keys.forEach((mapKey, mapIndex) => {
       if (mapKey === item.key) {
-        if (item.form_item_type_label !== 'array') {
-          item.value = values[mapIndex];
-        }
+        item.value = values[mapIndex];
         // 必填项的验证
         if (['img', 'imgs'].indexOf(item.form_item_type_label) > -1) {
           for (const arr of item.rule) {

From 4c644ae8cb80a4f2580dfa489c09ea04492fce6a Mon Sep 17 00:00:00 2001
From: 1638245306 <1638245306@qq.com>
Date: Mon, 17 Mar 2025 14:40:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?build(development):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=20API=20=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84=E6=9E=84=E5=BB=BA?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将开发环境 API 地址从 http://127.0.0.1:8000 改为 http://127.0.0.1:8001- 在 package.json 中添加了 build:dev 脚本，用于开发环境的构建
---
 web/.env.development | 2 +-
 web/package.json     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/web/.env.development b/web/.env.development
index 1c3ca5d..dc36b29 100644
--- a/web/.env.development
+++ b/web/.env.development
@@ -2,7 +2,7 @@
 ENV = 'development'
 
 # 本地环境接口地址
-VITE_API_URL = 'http://127.0.0.1:8000'
+VITE_API_URL = 'http://127.0.0.1:8001'
 
 # 是否启用按钮权限
 VITE_PM_ENABLED = true
diff --git a/web/package.json b/web/package.json
index 448d1fb..61d8bc4 100644
--- a/web/package.json
+++ b/web/package.json
@@ -5,6 +5,7 @@
 	"license": "MIT",
 	"scripts": {
 		"dev": "vite --force",
+		"build:dev":"vite build --mode development",
 		"build": "vite build",
 		"build:local": "vite build --mode local_prod",
 		"lint-fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/"

From 2fabc210b21e886d04d15424cc415a36d7aa0565 Mon Sep 17 00:00:00 2001
From: 1638245306 <1638245306@qq.com>
Date: Wed, 19 Mar 2025 15:54:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?refactor(system):=20=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=8A=A0=E5=AF=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将明文密码修改为经过 MD5 加密的密码
- 保留了原有的密码加密方式，提高了系统安全性
---
 backend/dvadmin/system/views/user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/dvadmin/system/views/user.py b/backend/dvadmin/system/views/user.py
index 16fcbe9..464e77d 100644
--- a/backend/dvadmin/system/views/user.py
+++ b/backend/dvadmin/system/views/user.py
@@ -336,7 +336,7 @@ class UserViewSet(CustomModelViewSet):
                 verify_password = check_password(str(old_pwd_md5), request.user.password)
         if verify_password:
             # request.user.password = make_password(hashlib.md5(new_pwd.encode(encoding='UTF-8')).hexdigest())
-            request.user.password = make_password(new_pwd)
+            request.user.password = make_password(hashlib.md5(new_pwd.encode(encoding='UTF-8')).hexdigest())
             request.user.pwd_change_count += 1
             request.user.save()
             return DetailResponse(data=None, msg="修改成功")