From 52e04dfd54bd42c9a25aa47d626ed1f1147b2c1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 7 Oct 2023 08:15:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mdp/form/formDef/Form.vue | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/mdp/form/formDef/Form.vue b/src/views/mdp/form/formDef/Form.vue
index 0b0905c..a964270 100644
--- a/src/views/mdp/form/formDef/Form.vue
+++ b/src/views/mdp/form/formDef/Form.vue
@@ -32,19 +32,19 @@
                 <el-form-item label="存储方式" prop="dataType">
                     <mdp-select item-code="form_data_type" show-style="tag" v-model="editForm.dataType"></mdp-select>
                 </el-form-item>
+                <el-form-item label="主键" prop="pks">
+                    <mdp-select  show-style="tag" v-model="editForm.pks" :plus-options="pkOptions" :props="{id:'id',name:'title'}" split=","></mdp-select>
+                </el-form-item>
                 <span v-if="['2','3'].some(k=>k==editForm.dataType)">
                     <el-form-item label="表名">
                         <el-input v-model="editForm.tableName" placeholder="请保持与数据库表名一致"></el-input>
                     </el-form-item> 
                     <el-form-item label="存储字段">
-                        <el-input v-model="editForm.dataField"  placeholder="驼峰命名，默认extInfos对应数据库字段ext_infos"></el-input>
+                        <el-input v-model="editForm.dataField"  placeholder="非驼峰命名，默认ext_infos对应数据库字段ext_infos"></el-input>
                     </el-form-item> 
                     <el-form-item label="数据库用户" v-if="editForm.dataType=='3'">
                         <el-input v-model="editForm.tableOwner" ></el-input>
                     </el-form-item> 
-                    <el-form-item label="已建表" v-if="editForm.dataType=='3'">
-                        <el-checkbox v-model="editForm.isCreateTable" :true-label="'1'" :false-label="'1'"></el-checkbox>
-                    </el-form-item>
                 </span> 
                 
                 <mdp-form-expand v-if="showExpand" label-width="120px" label-position="right" v-model="editForm.extInfos" :expand-id="expandId"></mdp-form-expand> 
@@ -72,6 +72,18 @@ export default {
         FormField
     },
     computed: {
+        pkOptions(){
+            var pkOptions=this.formFields?this.formFields:[]
+            pkOptions.push({id:'cuserid',title:'创建用户编号'})
+            pkOptions.push({id:'deptid',title:'创建部门编号'})
+            pkOptions.push({id:'ctime:1',title:'创建日期(yyy)'})
+            pkOptions.push({id:'ctime:2',title:'创建日期(yyy-MM)'})
+            pkOptions.push({id:'ctime:3',title:'创建日期(yyy-MM-dd)'})
+            pkOptions.push({id:'ctime:4',title:'创建日期(yyy-MM-dd HH)'})
+            pkOptions.push({id:'ctime:5',title:'创建日期(yyy-MM-dd HH:mm)'})
+            pkOptions.push({id:'ctime:6',title:'创建日期(yyy-MM-dd HH:mm:ss)'}) 
+            return pkOptions;
+        }
     },
     props:{
         formId:{