From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 Weben_CMS专用代码生成器/Code/Templete/Web/Controllers/EntityModeDrawer模板.txt |   40 +++++++++++++++++++++++++++++++---------
 1 files changed, 31 insertions(+), 9 deletions(-)

diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeDrawer\346\250\241\346\235\277.txt" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeDrawer\346\250\241\346\235\277.txt"
index 156b0a6..7be9486 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeDrawer\346\250\241\346\235\277.txt"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Code/Templete/Web/Controllers/EntityModeDrawer\346\250\241\346\235\277.txt"
@@ -14,7 +14,12 @@
 import isEqual from 'lodash/isEqual'
 import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
 import { cloneDeep } from 'lodash'
-
+// 引入公共选项配置 
+import {  
+  BOOLEAN_OPTIONS_AddEdit 
+} from '@/utils/commonOptionConstants'; 
+// 引入公共表单工具文件  
+import { extractFormDataForOnConfirm,extractAndAssignFormData } from '@/utils/myformUtils'; 
 export const use$EntityName$Drawer = (props: any, ctx?: any) => {
   const $PageMenuInstanceName$Drawer = injectModel<$EntityName$Drawer>('$PageMenuInstanceName$Drawer')
   /**
@@ -31,6 +36,17 @@
     return props.row || null
   })
 
+  
+  const datePicker = (attrs) => {
+    return (
+      <el-date-picker
+        type="date"
+        format="YYYY-MM-DD HH:mm:ss"
+        formatValue="YYYY-MM-DD HH:mm:ss"
+        {...attrs}
+      ></el-date-picker>
+    )
+  }
   const inputNumber = (attrs) => {
     return (
       <el-input-number
@@ -39,6 +55,17 @@
         precision="0"
         {...attrs}
       ></el-input-number>
+    )
+  }
+
+  const dateTimePicker = (attrs) => {
+    return (
+      <el-date-picker
+        type="datetime"
+        format="YYYY-MM-DD HH:mm:ss"
+        formatValue="YYYY-MM-DD HH:mm:ss"
+        {...attrs}
+      ></el-date-picker>
     )
   }
 
@@ -54,7 +81,7 @@
    * 添加的form字段
    */
   const formItems = reactive([
-    $PageAddFormAttributes$
+    $PageAddFormAttributes_formItems$
   ])
   /**
    * 校验是否有数据变化
@@ -89,9 +116,7 @@
    */
   const onConfirm = async () => {
     await formRef.value?.validate()
-    const data = {
-      $Save_PageAddFormAttributes$
-    }
+    const data=extractFormDataForOnConfirm(formData);
     if (!current.value) {
       await $PageMenuInstanceName$Drawer.add$EntityName$(data)
     } else {
@@ -132,10 +157,7 @@
     if (current.value) {
       const res = await $PageMenuInstanceName$Drawer.get$EntityName$Detail(current.value)
 
-      formData.value = {
-        $PageAddFormAttributesByOpen$
-        id: res.id,
-      }
+      extractAndAssignFormData(res,formData);
       disabled.value = true
       updateCheckData()
     } else {

--
Gitblit v1.9.3