diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
index 0decbe3..8f4e69d 100644
--- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
@@ -204,7 +204,7 @@ namespace ZR.Admin.WebApi.Controllers
             var genTable = genTableDto.Adapt<GenTable>().ToUpdate(HttpContext);
 
             //将前端额外参数转成字符串存入Options中
-            genTable.Options = JsonConvert.SerializeObject(genTableDto.Params);
+            genTable.Options = genTableDto.Params.Adapt<Options>();
             DbResult<bool> result = GenTableService.UseTran(() =>
             {
                 int rows = GenTableService.UpdateGenTable(genTable);
diff --git a/ZR.Admin.WebApi/Hubs/MessageHub.cs b/ZR.Admin.WebApi/Hubs/MessageHub.cs
index 08d776b..caf1f91 100644
--- a/ZR.Admin.WebApi/Hubs/MessageHub.cs
+++ b/ZR.Admin.WebApi/Hubs/MessageHub.cs
@@ -38,12 +38,13 @@ namespace ZR.Admin.WebApi.Hubs
         public override Task OnConnectedAsync()
         {
             var name = Context.User.Identity.Name;
+            var ip = HttpContextExtension.GetClientUserIp(App.HttpContext);
             LoginUser loginUser = JwtUtil.GetLoginUser(App.HttpContext);
             var user = clientUsers.Any(u => u.ConnnectionId == Context.ConnectionId);
             //判断用户是否存在，否则添加集合
             if (!user && Context.User.Identity.IsAuthenticated)
             {
-                clientUsers.Add(new OnlineUsers(Context.ConnectionId, name, loginUser?.UserId));
+                clientUsers.Add(new OnlineUsers(Context.ConnectionId, name, loginUser?.UserId, ip));
                 Console.WriteLine($"{DateTime.Now}：{name},{Context.ConnectionId}连接服务端success，当前已连接{clientUsers.Count}个");
                 //Clients.All.SendAsync("welcome", $"欢迎您：{name},当前时间：{DateTime.Now}");
                 Clients.All.SendAsync(HubsConstant.MoreNotice, SendNotice());
diff --git a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs b/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
index c74882c..8c8f803 100644
--- a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
+++ b/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
@@ -16,13 +16,15 @@ namespace ZR.Admin.WebApi.Hubs
         public long? Userid { get; set; }
         public string Name { get; set; }
         public DateTime LoginTime { get; set; }
-        
-        public OnlineUsers(string clientid, string name, long? userid)
+        public string UserIP { get; set; }
+
+        public OnlineUsers(string clientid, string name, long? userid, string? userip)
         {
             ConnnectionId = clientid;
             Name = name;
             LoginTime = DateTime.Now;
             Userid = userid;
+            UserIP = userip;
         }
     }
 }
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt
index da572de..bfc1360 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/CurdForm.txt
@@ -3,7 +3,6 @@ $set(labelName = "")
 $set(labelDisabled = "")
 $set(columnName = column.CsharpFieldFl)
 $set(value = "item.dictValue")
-
 $if(column.ColumnComment != "")
 $set(labelName = column.ColumnComment)
 $else
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt
index 8531aaf..3c0d5d4 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/MySqlTemplate.txt
@@ -2,7 +2,7 @@
 
 -- 菜单
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 
-VALUES ('${genTable.functionName}', ${parentId}, 999, '${genTable.BusinessName}', '${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName}', 0, 0, 'C', '0', '0', '${replaceDto.PermissionPrefix}:list', '', 'system', sysdate());
+VALUES ('${genTable.functionName}', ${parentId}, 999, '${genTable.BusinessName}', '${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName}', 0, 0, 'C', '0', '0', '${replaceDto.PermissionPrefix}:list', 'icon1', 'system', sysdate());
 
 -- 按钮父菜单id
 SELECT @menuId := LAST_INSERT_ID();
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt
index fe01bb2..20e0718 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/SqlTemplate.txt
@@ -2,7 +2,7 @@
 
 -- ${genTable.functionName}菜单
 INSERT INTO sys_menu(menuName, parentId, orderNum, path, component, isFrame, isCache, menuType, visible, status, perms, icon, create_by, create_time) 
-VALUES ('${genTable.functionName}', ${parentId}, 999, '${genTable.BusinessName}', '${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName}', 0, 0, 'C', '0', '0', '${replaceDto.PermissionPrefix}:list', '', 'system', GETDATE());
+VALUES ('${genTable.functionName}', ${parentId}, 999, '${genTable.BusinessName}', '${tool.FirstLowerCase(genTable.ModuleName)}/${genTable.BusinessName}', 0, 0, 'C', '0', '0', '${replaceDto.PermissionPrefix}:list', 'icon1', 'system', GETDATE());
 
 -- 按钮父菜单id
 declare @menuId int = @@identity
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt
index 9c9236a..67de9fc 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplModel.txt
@@ -16,7 +16,7 @@ namespace ${options.ModelsNamespace}.Models
     {
 $foreach(item in genTable.Columns)
         /// <summary>
-        /// 描述 : ${item.ColumnComment}
+        /// 描述 :${item.ColumnComment} ${item.Remark}
         /// 空值 :$if(item.IsRequired == "True") false $else true $end 
         /// </summary>
 $if(replaceDto.ShowBtnExport)
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
index 927cb2b..a098f0b 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplService.txt
@@ -56,8 +56,8 @@ $end
 $if(null != genTable.SubTableName && "" != genTable.SubTableName)
                 .Includes(it => it.Sub.MappingField(z => z.${genTable.SubTableFkName}, () => it.${replaceDto.PKName}))
 $end
-$if(genTable.SortField != "" && genTable.SortField != null)
-                .OrderBy("${genTable.SortField} ${genTable.SortType}")
+$if(genTable.Options.SortField != "" && genTable.Options.SortField != null)
+                .OrderBy("${genTable.Options.SortField} ${genTable.Options.SortType}")
 $end
                 .Where(predicate.ToExpression())
                 .ToPage(parm);
@@ -88,7 +88,7 @@ $end
 $end
 
             var response = _${replaceDto.ModelTypeName}Repository.Queryable().Where(predicate.ToExpression())
-                .ToTree(it => it.Children, it => it.${genTable.TreeParentCode}, 0);
+                .ToTree(it => it.Children, it => it.${genTable.Options.TreeParentCode}, 0);
 
             return response;
         }
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
index 3748bb3..72cfae3 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplTreeVue.txt
@@ -38,7 +38,7 @@ $end
 
     <!-- 数据区域 -->
     <el-table v-if="refreshTable" :data="dataList" v-loading="loading" ref="table" border highlight-current-row @selection-change="handleSelectionChange"
-      :default-expand-all="isExpandAll" row-key="${tool.FirstLowerCase(genTable.TreeCode)}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
+      :default-expand-all="isExpandAll" row-key="${tool.FirstLowerCase(genTable.Options.TreeCode)}" :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
       <el-table-column type="selection" width="50" align="center"/>
 ${VueViewListContent}
       <el-table-column label="操作" align="center" width="140">
@@ -204,8 +204,8 @@ $end
         delete node.children;
       }
       return {
-        id: node.${tool.FirstLowerCase(genTable.TreeCode)},
-        label: node.${tool.FirstLowerCase(genTable.TreeName)},
+        id: node.${tool.FirstLowerCase(genTable.Options.TreeCode)},
+        label: node.${tool.FirstLowerCase(genTable.Options.TreeName)},
         children: node.children,
       };
     },
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
index f744b87..f4f5d5a 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/TplVue.txt
@@ -156,8 +156,7 @@ $end
 $foreach(column in genTable.Columns)
 $if(column.IsRequired && column.IsIncrement == false)
         ${column.CsharpFieldFl}: [
-          { required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end
-$if(column.CsharpType == "int" || column.CsharpType == "long"), type: "number"$end }
+          { required: true, message: "${column.ColumnComment}不能为空", trigger: $if(column.htmlType == "select")"change"$else"blur"$end }
         ],
 $end
 $end
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
index a973c4f..dc05b23 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/TreeVue.txt
@@ -88,7 +88,7 @@ $end
       highlight-current-row
       @selection-change="handleSelectionChange"
       :default-expand-all="isExpandAll"
-      row-key="${tool.FirstLowerCase(genTable.TreeCode)}"
+      row-key="${tool.FirstLowerCase(genTable.Options.TreeCode)}"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
     >
       <el-table-column type="selection" width="50" align="center"/>
@@ -278,7 +278,7 @@ $end
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="text" @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
+          <el-button text @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
           <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
         </div>
       </template>
diff --git a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
index 19af23e..4c4f917 100644
--- a/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
+++ b/ZR.Admin.WebApi/wwwroot/CodeGenTemplate/v3/Vue.txt
@@ -124,7 +124,7 @@ $elseif(column.HtmlType == "imageUpload")
         </template>
       </el-table-column>
 $elseif(column.HtmlType == "checkbox" || column.HtmlType == "select" || column.HtmlType == "radio")
-      <el-table-column prop="${columnName}" label="${labelName}" align="center">
+      <el-table-column prop="${columnName}" label="${labelName}" align="center"${column.sortStr}>
         <template #default="scope">
 $if(column.HtmlType == "checkbox")
           <dict-tag :options="$if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :value="scope.row.${columnName} ? scope.row.${columnName}.split(',') : []" />
@@ -134,11 +134,10 @@ $end
         </template>
       </el-table-column>
 $else
-      <el-table-column prop="${columnName}" label="${labelName}" align="center"${showToolTipHtml} />
+      <el-table-column prop="${columnName}" label="${labelName}" align="center"${showToolTipHtml}${column.sortStr} />
 $end
 $end
 $end
-
       <el-table-column label="操作" align="center" width="140">
         <template #default="scope">
 $if(replaceDto.ShowBtnEdit)
@@ -160,7 +159,6 @@ $end
         <el-row :gutter="20">
 $foreach(column in genTable.Columns)
 $set(labelName = "")
-$set(labelDisabled = "")
 $set(columnName = column.CsharpFieldFl)
 $set(value = "item.dictValue")
 $if(column.ColumnComment != "")
@@ -168,19 +166,12 @@ $set(labelName = column.ColumnComment)
 $else
 $set(labelName = column.CsharpFieldFl)
 $end
-$if(column.IsPk == true)
-$set(labelDisabled = ":disabled=true")
-$end
 $if(column.CsharpType == "int" || column.CsharpType == "long")
     $set(value = "parseInt(item.dictValue)")
 $end
 
-$if(column.IsInsert == false && column.IsEdit == false)
-          <el-col :lg="12" v-if="opertype == 2">
-            <el-form-item label="${labelName}">{{form.${columnName}}}</el-form-item>
-          </el-col>
-$elseif(column.IsPK || column.IsIncrement)
-          <el-col :lg="12">
+$if(column.IsPK || column.IsIncrement)
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
 $if(column.IsIncrement == false)
               <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" :disabled="title=='修改数据'"/>
@@ -191,15 +182,15 @@ $end
           </el-col>
 $else
 $if(column.HtmlType == "inputNumber")
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" ${labelDisabled}/>
+              <el-input-number v-model.number="form.${columnName}" controls-position="right" placeholder="请输入${labelName}" ${column.DisabledStr}/>
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "datetime")
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-date-picker v-model="form.${columnName}" type="datetime" placeholder="选择日期时间"></el-date-picker>
+              <el-date-picker v-model="form.${columnName}" type="datetime" placeholder="选择日期时间"${column.DisabledStr}></el-date-picker>
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "imageUpload")
@@ -215,9 +206,9 @@ $elseif(column.HtmlType == "fileUpload")
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "radio")
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-radio-group v-model="form.${columnName}">
+              <el-radio-group v-model="form.${columnName}"${column.DisabledStr}>
                 <el-radio v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="${value}">{{item.dictLabel}}</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -225,7 +216,7 @@ $elseif(column.HtmlType == "radio")
 $elseif(column.HtmlType == "textarea")
           <el-col :lg="24">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input type="textarea" v-model="form.${columnName}" placeholder="请输入${labelName}"/>
+              <el-input type="textarea" v-model="form.${columnName}" placeholder="请输入${labelName}"${column.DisabledStr}/>
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "editor")
@@ -235,9 +226,9 @@ $elseif(column.HtmlType == "editor")
             </el-form-item>
           </el-col>
 $elseif(column.HtmlType == "select")
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-select v-model="form.${columnName}" placeholder="请选择${labelName}">
+              <el-select v-model="form.${columnName}" placeholder="请选择${labelName}"${column.DisabledStr}>
                 <el-option v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictLabel" :value="${value}"></el-option>
               </el-select>
             </el-form-item>
@@ -245,15 +236,15 @@ $elseif(column.HtmlType == "select")
 $elseif(column.HtmlType == "checkbox")
           <el-col :lg="24">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-checkbox-group v-model="form.${columnName}Checked">
+              <el-checkbox-group v-model="form.${columnName}Checked"${column.DisabledStr}>
                 <el-checkbox v-for="item in $if(column.DictType != "") ${column.DictType} $else ${column.CsharpFieldFl}Options$end" :key="item.dictValue" :label="item.dictValue">{{item.dictLabel}}</el-checkbox>
               </el-checkbox-group>
             </el-form-item>
           </el-col>
 $else
-          <el-col :lg="12">
+          <el-col :lg="${options.ColNum}">
             <el-form-item label="${labelName}" prop="${columnName}">
-              <el-input v-model="form.${columnName}" placeholder="请输入${labelName}" ${labelDisabled}/>
+              <el-input v-model="form.${columnName}" placeholder="请输入${labelName}" ${column.DisabledStr}/>
             </el-form-item>
           </el-col>
 $end
@@ -262,10 +253,8 @@ $end
         </el-row>
       </el-form>
       <template #footer>
-        <div class="dialog-footer">
-          <el-button type="text" @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
-          <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
-        </div>
+        <el-button text @click="cancel">{{ ${t}t('btn.cancel') }}</el-button>
+        <el-button type="primary" @click="submitForm">{{ ${t}t('btn.submit') }}</el-button>
       </template>
     </el-dialog>
 
diff --git a/ZR.CodeGenerator/CodeGenerateTemplate.cs b/ZR.CodeGenerator/CodeGenerateTemplate.cs
index e027e23..2a551be 100644
--- a/ZR.CodeGenerator/CodeGenerateTemplate.cs
+++ b/ZR.CodeGenerator/CodeGenerateTemplate.cs
@@ -12,156 +12,156 @@ namespace ZR.CodeGenerator
     {
         #region vue 模板
 
-        /// <summary>
-        /// Vue 添加修改表单
-        /// </summary>
-        /// <param name="dbFieldInfo"></param>
-        /// <returns></returns>
-        public static string TplVueFormContent(GenTableColumn dbFieldInfo, GenTable genTable)
-        {
-            string columnName = dbFieldInfo.CsharpFieldFl;
-            string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
-            string labelDisabled = dbFieldInfo.IsPk ? ":disabled=\"true\"" : "";
-            StringBuilder sb = new();
-            string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
+        ///// <summary>
+        ///// Vue 添加修改表单
+        ///// </summary>
+        ///// <param name="dbFieldInfo"></param>
+        ///// <returns></returns>
+        //public static string TplVueFormContent(GenTableColumn dbFieldInfo, GenTable genTable)
+        //{
+        //    string columnName = dbFieldInfo.CsharpFieldFl;
+        //    string labelName = CodeGeneratorTool.GetLabelName(dbFieldInfo.ColumnComment, columnName);
+        //    string labelDisabled = dbFieldInfo.IsPk ? ":disabled=\"true\"" : "";
+        //    StringBuilder sb = new();
+        //    string value = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? "parseInt(item.dictValue)" : "item.dictValue";
 
-            if (GenConstants.inputDtoNoField.Any(f => f.Contains(dbFieldInfo.CsharpField, StringComparison.OrdinalIgnoreCase)))
-            {
-            }
-            else if (!dbFieldInfo.IsInsert && !dbFieldInfo.IsEdit)
-            {
-                sb.AppendLine("    <el-col :lg=\"12\" v-if=\"opertype == 2\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\">{{{{form.{columnName}}}}}</el-form-item>");
-                sb.AppendLine("    </el-col>");
-            }
-            else if (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable.TreeParentCode != null && dbFieldInfo.CsharpField.Equals(genTable.TreeParentCode))
-            {
-                //树
-                sb.AppendLine(@"    <el-col :lg=""24"">");
-                sb.AppendLine($@"      <el-form-item label=""父级id"" prop=""{columnName}"">");
-                sb.AppendLine($@"        <treeselect v-model=""form.{columnName}"" :options=""dataList"" :normalizer=""normalizer"" :show-count=""true"" placeholder=""选择上级菜单"" />");
-                sb.AppendLine(@"      </el-form-item>");
-                sb.AppendLine(@"    </el-col>");
-            }
-            //主键、非自增要插入，不能编辑
-            else if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
-            {
-                sb.AppendLine("    <el-col :lg=\"12\">");
-                sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                //主键非自增 显示input
-                if (!dbFieldInfo.IsIncrement)
-                {
-                    sb.AppendLine($"        <el-input-number v-model.number=\"form.{columnName}\" controls-position=\"right\" placeholder=\"请输入{labelName}\" :disabled=\"title=='修改数据'\"/>");
-                }
-                else if (dbFieldInfo.IsIncrement)  //只有是 自增 就显示label
-                {
-                    sb.AppendLine($"        <span v-html=\"form.{columnName}\"/>");
-                }
+        //    if (GenConstants.inputDtoNoField.Any(f => f.Contains(dbFieldInfo.CsharpField, StringComparison.OrdinalIgnoreCase)))
+        //    {
+        //    }
+        //    else if (!dbFieldInfo.IsInsert && !dbFieldInfo.IsEdit)
+        //    {
+        //        sb.AppendLine("    <el-col :lg=\"12\" v-if=\"opertype == 2\">");
+        //        sb.AppendLine($"      <el-form-item label=\"{labelName}\">{{{{form.{columnName}}}}}</el-form-item>");
+        //        sb.AppendLine("    </el-col>");
+        //    }
+        //    else if (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable.TreeParentCode != null && dbFieldInfo.CsharpField.Equals(genTable.TreeParentCode))
+        //    {
+        //        //树
+        //        sb.AppendLine(@"    <el-col :lg=""24"">");
+        //        sb.AppendLine($@"      <el-form-item label=""父级id"" prop=""{columnName}"">");
+        //        sb.AppendLine($@"        <treeselect v-model=""form.{columnName}"" :options=""dataList"" :normalizer=""normalizer"" :show-count=""true"" placeholder=""选择上级菜单"" />");
+        //        sb.AppendLine(@"      </el-form-item>");
+        //        sb.AppendLine(@"    </el-col>");
+        //    }
+        //    //主键、非自增要插入，不能编辑
+        //    else if (dbFieldInfo.IsPk || dbFieldInfo.IsIncrement)
+        //    {
+        //        sb.AppendLine("    <el-col :lg=\"12\">");
+        //        sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //        //主键非自增 显示input
+        //        if (!dbFieldInfo.IsIncrement)
+        //        {
+        //            sb.AppendLine($"        <el-input-number v-model.number=\"form.{columnName}\" controls-position=\"right\" placeholder=\"请输入{labelName}\" :disabled=\"title=='修改数据'\"/>");
+        //        }
+        //        else if (dbFieldInfo.IsIncrement)  //只有是 自增 就显示label
+        //        {
+        //            sb.AppendLine($"        <span v-html=\"form.{columnName}\"/>");
+        //        }
 
-                sb.AppendLine("      </el-form-item>");
-                sb.AppendLine("    </el-col>");
-            }
-            else
-            {
-                if (dbFieldInfo.HtmlType == GenConstants.HTML_INPUT_NUMBER)
-                {
-                    //数字框
-                    sb.AppendLine("    <el-col :lg=\"12\">");
-                    sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($"        <el-input-number v-model.number=\"form.{columnName}\" controls-position=\"right\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
-                    sb.AppendLine("      </el-form-item>");
-                    sb.AppendLine("    </el-col>");
-                }
-                else if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
-                {
-                    //时间
-                    sb.AppendLine("      <el-col :lg=\"12\">");
-                    sb.AppendLine($"        <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($"           <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\" placeholder=\"选择日期时间\"> </el-date-picker>");
-                    sb.AppendLine("         </el-form-item>");
-                    sb.AppendLine("     </el-col>");
-                }
-                else if (dbFieldInfo.HtmlType == GenConstants.HTML_IMAGE_UPLOAD)
-                {
-                    //图片
-                    sb.AppendLine("    <el-col :lg=\"24\">");
-                    sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($@"        <UploadImage v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
-                    sb.AppendLine("      </el-form-item>");
-                    sb.AppendLine("    </el-col>");
-                }
-                else if (dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD)
-                {
-                    //文件
-                    sb.AppendLine("    <el-col :lg=\"24\">");
-                    sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($@"        <UploadFile v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
-                    sb.AppendLine("      </el-form-item>");
-                    sb.AppendLine("    </el-col>");
-                }
-                else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
-                {
-                    //单选按钮
-                    sb.AppendLine("    <el-col :lg=\"12\">");
-                    sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($"        <el-radio-group v-model=\"form.{columnName}\">");
-                    sb.AppendLine($"          <el-radio v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"{value}\">{{{{item.dictLabel}}}}</el-radio>");
-                    sb.AppendLine("        </el-radio-group>");
-                    sb.AppendLine("      </el-form-item>");
-                    sb.AppendLine("    </el-col>");
-                }
-                else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA)
-                {
-                    //文本域
-                    sb.AppendLine("    <el-col :lg=\"24\">");
-                    sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($"        <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"请输入{labelName}\"/>");
-                    sb.AppendLine("      </el-form-item>");
-                    sb.AppendLine("    </el-col>");
-                }
-                else if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
-                {
-                    //编辑器
-                    sb.AppendLine("    <el-col :lg=\"24\">");
-                    sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($"        <editor v-model=\"form.{columnName}\" :min-height=\"200\" />");
-                    sb.AppendLine("      </el-form-item>");
-                    sb.AppendLine("    </el-col>");
-                }
-                else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
-                {
-                    //下拉框
-                    sb.AppendLine("    <el-col :lg=\"12\">");
-                    sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($"        <el-select v-model=\"form.{columnName}\" placeholder=\"请选择{labelName}\"> ");
-                    sb.AppendLine($"          <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"{value}\"></el-option>");
-                    sb.AppendLine("        </el-select>");
-                    sb.AppendLine("      </el-form-item>");
-                    sb.AppendLine("    </el-col>");
-                }
-                else if (dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
-                {
-                    //多选框
-                    sb.AppendLine("    <el-col :lg=\"24\">");
-                    sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($"        <el-checkbox-group v-model=\"form.{columnName}Checked\"> ");
-                    sb.AppendLine($"          <el-checkbox v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictValue\">{{{{item.dictLabel}}}}</el-checkbox>");
-                    sb.AppendLine("        </el-checkbox-group>");
-                    sb.AppendLine("      </el-form-item>");
-                    sb.AppendLine("    </el-col>");
-                }
-                else
-                {
-                    string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
-                    sb.AppendLine("    <el-col :lg=\"12\">");
-                    sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
-                    sb.AppendLine($"        <el-input v-model{inputNumTxt}=\"form.{columnName}\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
-                    sb.AppendLine("      </el-form-item>");
-                    sb.AppendLine("    </el-col>");
-                }
-            }
-            return sb.ToString();
-        }
+        //        sb.AppendLine("      </el-form-item>");
+        //        sb.AppendLine("    </el-col>");
+        //    }
+        //    else
+        //    {
+        //        if (dbFieldInfo.HtmlType == GenConstants.HTML_INPUT_NUMBER)
+        //        {
+        //            //数字框
+        //            sb.AppendLine("    <el-col :lg=\"12\">");
+        //            sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($"        <el-input-number v-model.number=\"form.{columnName}\" controls-position=\"right\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
+        //            sb.AppendLine("      </el-form-item>");
+        //            sb.AppendLine("    </el-col>");
+        //        }
+        //        else if (dbFieldInfo.HtmlType == GenConstants.HTML_DATETIME)
+        //        {
+        //            //时间
+        //            sb.AppendLine("      <el-col :lg=\"12\">");
+        //            sb.AppendLine($"        <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($"           <el-date-picker v-model=\"form.{columnName}\" format=\"yyyy-MM-dd HH:mm:ss\" value-format=\"yyyy-MM-dd HH:mm:ss\" type=\"datetime\" placeholder=\"选择日期时间\"> </el-date-picker>");
+        //            sb.AppendLine("         </el-form-item>");
+        //            sb.AppendLine("     </el-col>");
+        //        }
+        //        else if (dbFieldInfo.HtmlType == GenConstants.HTML_IMAGE_UPLOAD)
+        //        {
+        //            //图片
+        //            sb.AppendLine("    <el-col :lg=\"24\">");
+        //            sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($@"        <UploadImage v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
+        //            sb.AppendLine("      </el-form-item>");
+        //            sb.AppendLine("    </el-col>");
+        //        }
+        //        else if (dbFieldInfo.HtmlType == GenConstants.HTML_FILE_UPLOAD)
+        //        {
+        //            //文件
+        //            sb.AppendLine("    <el-col :lg=\"24\">");
+        //            sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($@"        <UploadFile v-model=""form.{columnName}"" column=""{columnName}"" @input=""handleUploadSuccess"" />");
+        //            sb.AppendLine("      </el-form-item>");
+        //            sb.AppendLine("    </el-col>");
+        //        }
+        //        else if (dbFieldInfo.HtmlType == GenConstants.HTML_RADIO)
+        //        {
+        //            //单选按钮
+        //            sb.AppendLine("    <el-col :lg=\"12\">");
+        //            sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($"        <el-radio-group v-model=\"form.{columnName}\">");
+        //            sb.AppendLine($"          <el-radio v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"{value}\">{{{{item.dictLabel}}}}</el-radio>");
+        //            sb.AppendLine("        </el-radio-group>");
+        //            sb.AppendLine("      </el-form-item>");
+        //            sb.AppendLine("    </el-col>");
+        //        }
+        //        else if (dbFieldInfo.HtmlType == GenConstants.HTML_TEXTAREA)
+        //        {
+        //            //文本域
+        //            sb.AppendLine("    <el-col :lg=\"24\">");
+        //            sb.AppendLine($"      <el-form-item label=\"{ labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($"        <el-input type=\"textarea\" v-model=\"form.{columnName}\" placeholder=\"请输入{labelName}\"/>");
+        //            sb.AppendLine("      </el-form-item>");
+        //            sb.AppendLine("    </el-col>");
+        //        }
+        //        else if (dbFieldInfo.HtmlType == GenConstants.HTML_EDITOR)
+        //        {
+        //            //编辑器
+        //            sb.AppendLine("    <el-col :lg=\"24\">");
+        //            sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($"        <editor v-model=\"form.{columnName}\" :min-height=\"200\" />");
+        //            sb.AppendLine("      </el-form-item>");
+        //            sb.AppendLine("    </el-col>");
+        //        }
+        //        else if (dbFieldInfo.HtmlType == GenConstants.HTML_SELECT)
+        //        {
+        //            //下拉框
+        //            sb.AppendLine("    <el-col :lg=\"12\">");
+        //            sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($"        <el-select v-model=\"form.{columnName}\" placeholder=\"请选择{labelName}\"> ");
+        //            sb.AppendLine($"          <el-option v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictLabel\" :value=\"{value}\"></el-option>");
+        //            sb.AppendLine("        </el-select>");
+        //            sb.AppendLine("      </el-form-item>");
+        //            sb.AppendLine("    </el-col>");
+        //        }
+        //        else if (dbFieldInfo.HtmlType == GenConstants.HTML_CHECKBOX)
+        //        {
+        //            //多选框
+        //            sb.AppendLine("    <el-col :lg=\"24\">");
+        //            sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($"        <el-checkbox-group v-model=\"form.{columnName}Checked\"> ");
+        //            sb.AppendLine($"          <el-checkbox v-for=\"item in {columnName}Options\" :key=\"item.dictValue\" :label=\"item.dictValue\">{{{{item.dictLabel}}}}</el-checkbox>");
+        //            sb.AppendLine("        </el-checkbox-group>");
+        //            sb.AppendLine("      </el-form-item>");
+        //            sb.AppendLine("    </el-col>");
+        //        }
+        //        else
+        //        {
+        //            string inputNumTxt = CodeGeneratorTool.IsNumber(dbFieldInfo.CsharpType) ? ".number" : "";
+        //            sb.AppendLine("    <el-col :lg=\"12\">");
+        //            sb.AppendLine($"      <el-form-item label=\"{labelName}\" prop=\"{columnName}\">");
+        //            sb.AppendLine($"        <el-input v-model{inputNumTxt}=\"form.{columnName}\" placeholder=\"请输入{labelName}\" {labelDisabled}/>");
+        //            sb.AppendLine("      </el-form-item>");
+        //            sb.AppendLine("    </el-col>");
+        //        }
+        //    }
+        //    return sb.ToString();
+        //}
 
         #endregion
 
diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs
index f7fa084..1198904 100644
--- a/ZR.CodeGenerator/CodeGeneratorTool.cs
+++ b/ZR.CodeGenerator/CodeGeneratorTool.cs
@@ -46,12 +46,12 @@ namespace ZR.CodeGenerator
             string PKType = "int";
             ReplaceDto replaceDto = new();
             replaceDto.ModelTypeName = dto.GenTable.ClassName;//表名对应C# 实体类名
-            replaceDto.PermissionPrefix = dto.GenTable.PermissionPrefix;
+            replaceDto.PermissionPrefix = dto.GenTable?.Options?.PermissionPrefix;
             replaceDto.Author = dto.GenTable.FunctionAuthor;
-            replaceDto.ShowBtnAdd = dto.GenTable.CheckedBtn.Any(f => f == 1);
-            replaceDto.ShowBtnEdit = dto.GenTable.CheckedBtn.Any(f => f == 2);
-            replaceDto.ShowBtnDelete = dto.GenTable.CheckedBtn.Any(f => f == 3);
-            replaceDto.ShowBtnExport = dto.GenTable.CheckedBtn.Any(f => f == 4);
+            replaceDto.ShowBtnAdd = dto.GenTable.Options.CheckedBtn.Any(f => f == 1);
+            replaceDto.ShowBtnEdit = dto.GenTable.Options.CheckedBtn.Any(f => f == 2);
+            replaceDto.ShowBtnDelete = dto.GenTable.Options.CheckedBtn.Any(f => f == 3);
+            replaceDto.ShowBtnExport = dto.GenTable.Options.CheckedBtn.Any(f => f == 4);
 
 
             //循环表字段信息
@@ -219,9 +219,10 @@ namespace ZR.CodeGenerator
             };
             fileName = Path.Combine("v3", fileName);
             var tpl = FileHelper.ReadJtTemplate(fileName);
-            tpl.Set("treeCode", generateDto.GenTable?.TreeCode?.ToString()?.FirstLowerCase());
-            tpl.Set("treeName", generateDto.GenTable.TreeName?.ToString()?.FirstLowerCase());
-            tpl.Set("treeParentCode", generateDto.GenTable.TreeParentCode?.ToString()?.FirstLowerCase());
+            tpl.Set("treeCode", generateDto.GenTable?.Options?.TreeCode?.FirstLowerCase());
+            tpl.Set("treeName", generateDto.GenTable?.Options?.TreeName?.FirstLowerCase());
+            tpl.Set("treeParentCode", generateDto.GenTable?.Options?.TreeParentCode?.FirstLowerCase());
+            tpl.Set("options", generateDto.GenTable?.Options);
 
             var result = tpl.Render();
             var fullPath = Path.Combine(generateDto.VueParentPath, "src", "views", generateDto.GenTable.ModuleName.FirstLowerCase(), $"{generateDto.GenTable.BusinessName.FirstUpperCase()}.vue");
@@ -273,7 +274,7 @@ namespace ZR.CodeGenerator
                     break;
             }
             var tpl = FileHelper.ReadJtTemplate($"{tempName}.txt");
-            tpl.Set("parentId", generateDto.GenTable.ParentMenuId ?? 0);
+            tpl.Set("parentId", generateDto.GenTable?.Options?.ParentMenuId ?? 0);
             var result = tpl.Render();
             string fullPath = Path.Combine(generateDto.GenCodePath, "sql", generateDto.GenTable.BusinessName + ".sql");
 
@@ -423,7 +424,14 @@ namespace ZR.CodeGenerator
                 TableComment = desc,
                 FunctionName = desc,
                 Create_by = userName,
+                Options = new Options()
+                {
+                    SortType = "asc",
+                    CheckedBtn = new int[] { 1, 2, 3 }
+                }
             };
+            genTable.Options.PermissionPrefix = $"{genTable.ModuleName.ToLower()}:{genTable.ClassName.ToLower()}";//权限
+
             return genTable;
         }
 
@@ -561,7 +569,7 @@ namespace ZR.CodeGenerator
         }
         public static bool CheckTree(GenTable genTable, string csharpField)
         {
-            return (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable.TreeParentCode != null && csharpField.Equals(genTable.TreeParentCode));
+            return (genTable.TplCategory.Equals("tree", StringComparison.OrdinalIgnoreCase) && genTable?.Options?.TreeParentCode != null && csharpField.Equals(genTable?.Options?.TreeParentCode));
         }
         #endregion
     }
diff --git a/ZR.Model/Dto/Article/ArticleCategoryDto.cs b/ZR.Model/System/Dto/ArticleCategoryDto.cs
similarity index 100%
rename from ZR.Model/Dto/Article/ArticleCategoryDto.cs
rename to ZR.Model/System/Dto/ArticleCategoryDto.cs
diff --git a/ZR.Model/System/Dto/GenTableDto.cs b/ZR.Model/System/Dto/GenTableDto.cs
index 24fb31a..ba03241 100644
--- a/ZR.Model/System/Dto/GenTableDto.cs
+++ b/ZR.Model/System/Dto/GenTableDto.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using ZR.Model.System.Generate;
 
 namespace ZR.Model.System.Dto
@@ -21,7 +19,7 @@ namespace ZR.Model.System.Dto
         public string FunctionAuthor { get; set; }
         public string GenType { get; set; }
         public string GenPath { get; set; }
-        public string PermissionPrefix { get; set; }
+        //public string PermissionPrefix { get; set; }
         public string Remark { get; set; }
         /// <summary>
         /// 额外参数
@@ -34,19 +32,19 @@ namespace ZR.Model.System.Dto
     /// 额外参数
     /// ****注意里面参数统一首字母小写*****
     /// </summary>
-    public class Options
+    public class Params
     {
-        public string treeCode { get; set; }
-        public string treeName { get; set; }
-        public string treeParentCode { get; set; }
-        public int? parentMenuId { get; set; }
-        public string sortField { get; set; }
-        public string sortType { get; set; }
+        public string TreeCode { get; set; }
+        public string TreeName { get; set; }
+        public string TreeParentCode { get; set; }
+        public int? ParentMenuId { get; set; }
+        public string SortField { get; set; }
+        public string SortType { get; set; }
         /// <summary>
         /// 额外参数字符串
         /// </summary>
-        public string checkedBtn { get; set; }
-        public string permissionPrefix { get; set; }
+        public string CheckedBtn { get; set; }
+        public string PermissionPrefix { get; set; }
     }
     public class GenTableColumnDto
     {
@@ -59,6 +57,7 @@ namespace ZR.Model.System.Dto
         public bool IsEdit { get; set; }
         public bool IsList { get; set; }
         public bool IsQuery { get; set; }
+        public bool IsSort { get; set; }
         public bool IsRequired { get; set; }
         /// <summary>
         /// 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）
@@ -73,6 +72,10 @@ namespace ZR.Model.System.Dto
         /// 字典类型
         /// </summary>
         public string DictType { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
     }
 
 }
diff --git a/ZR.Model/System/Generate/GenTable.cs b/ZR.Model/System/Generate/GenTable.cs
index a668623..482ff3e 100644
--- a/ZR.Model/System/Generate/GenTable.cs
+++ b/ZR.Model/System/Generate/GenTable.cs
@@ -72,38 +72,14 @@ namespace ZR.Model.System.Generate
         /// <summary>
         /// 其他生成选项
         /// </summary>
-        public string Options { get; set; }
-
+        [SqlSugar.SugarColumn(IsJson = true)]
+        public Options Options { get; set; }
+        
         #region 表额外字段
         /** 表列信息 */
         [SqlSugar.SugarColumn(IsIgnore = true)]
         public List<GenTableColumn> Columns { get; set; }
 
-        //以下 Options扩展字段
-        [SqlSugar.SugarColumn(IsIgnore = true)]
-        public object ParentMenuId { get; set; }
-        [SqlSugar.SugarColumn(IsIgnore = true)]
-        public object SortType { get; set; } = "asc";
-
-        [SqlSugar.SugarColumn(IsIgnore = true)]
-        public object SortField { get; set; } = string.Empty;
-
-        [SqlSugar.SugarColumn(IsIgnore = true)]
-        public object TreeCode { get; set; } = string.Empty;
-
-        [SqlSugar.SugarColumn(IsIgnore = true)]
-        public object TreeName { get; set; } = string.Empty;
-
-        [SqlSugar.SugarColumn(IsIgnore = true)]
-        public object TreeParentCode { get; set; }
-        [SqlSugar.SugarColumn(IsIgnore = true)]
-        public string PermissionPrefix { get; set; }
-        /// <summary>
-        /// 生成的按钮功能
-        /// </summary>
-        [SqlSugar.SugarColumn(IsIgnore = true)]
-        public int[] CheckedBtn { get; set; } = new int[] { 1, 2, 3 };
-
         /// <summary>
         /// 字表信息
         /// </summary>
@@ -111,4 +87,23 @@ namespace ZR.Model.System.Generate
         public GenTable SubTable { get; set; }
         #endregion
     }
+
+    public class Options 
+    {
+        public long ParentMenuId { get; set; } = 0;
+        public string SortType { get; set; } = "asc";
+        public string SortField { get; set; } = string.Empty;
+        public string TreeCode { get; set; } = string.Empty;
+        public string TreeName { get; set; } = string.Empty;
+        public string TreeParentCode { get; set; } = string.Empty;
+        public string PermissionPrefix { get; set; }= string.Empty;
+        /// <summary>
+        /// 额外参数字符串
+        /// </summary>
+        public int[] CheckedBtn { get; set; } = new int[] { 1, 2, 3 };
+        /// <summary>
+        /// 列大小 12,24
+        /// </summary>
+        public int ColNum { get; set; } = 12;
+    }
 }
diff --git a/ZR.Model/System/Generate/GenTableColumn.cs b/ZR.Model/System/Generate/GenTableColumn.cs
index 588e45f..72efcbd 100644
--- a/ZR.Model/System/Generate/GenTableColumn.cs
+++ b/ZR.Model/System/Generate/GenTableColumn.cs
@@ -71,6 +71,10 @@ namespace ZR.Model.System.Generate
         /// </summary>
         public bool IsQuery { get; set; }
         /// <summary>
+        /// 是否排序（1是）
+        /// </summary>
+        public bool IsSort { get; set; }
+        /// <summary>
         /// 显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）
         /// </summary>
         public string HtmlType { get; set; }
@@ -95,15 +99,33 @@ namespace ZR.Model.System.Generate
             }
         }
         /// <summary>
+        /// 前端排序字符串
+        /// </summary>
+        [SugarColumn(IsIgnore = true)]
+        public string SortStr
+        {
+            get
+            {
+                return IsSort ? " sortable" : "";
+            }
+        }
+        /// <summary>
         /// C# 字段名 首字母小写，用于前端
         /// </summary>
         [SugarColumn(IsIgnore = true)]
         public string CsharpFieldFl { get; set; }
         /// <summary>
-        /// 字典集合
+        /// 前端 只读字段
         /// </summary>
-        //[SqlSugar.SugarColumn(IsIgnore = true)]
-        //public List<SysDictData> DictDatas { get; set; }
+        [SugarColumn(IsIgnore = true)]
+        public string DisabledStr
+        {
+            get
+            {
+                return (((!IsInsert && !IsEdit) || IsPk) && !IsRequired) ? " :disabled=\"true\"" : "";
+            }
+        }
+
         #endregion
     }
 }
diff --git a/ZR.Repository/System/GenTableRepository.cs b/ZR.Repository/System/GenTableRepository.cs
index 234992a..018d3d6 100644
--- a/ZR.Repository/System/GenTableRepository.cs
+++ b/ZR.Repository/System/GenTableRepository.cs
@@ -81,7 +81,9 @@ namespace ZR.Repository.System
                     it.Sort,
                     it.Update_time,
                     it.DictType,
-                    it.Update_by
+                    it.Update_by,
+                    it.Remark,
+                    it.IsSort
                 })
                 .ExecuteCommand();
         }
diff --git a/ZR.Service/System/GenTableService.cs b/ZR.Service/System/GenTableService.cs
index b6d2051..f416b4b 100644
--- a/ZR.Service/System/GenTableService.cs
+++ b/ZR.Service/System/GenTableService.cs
@@ -56,14 +56,9 @@ namespace ZR.Service.System
         public GenTable GetGenTableInfo(long tableId)
         {
             var info = GenTableRepository.GetId(tableId);
-            SetTableFromOptions(info);
             if (info != null && !info.SubTableName.IsEmpty())
             {
                 info.SubTable = GenTableRepository.Queryable().Where(f => f.SubTableName == info.TableName).First();
-                if (info?.SubTable != null)
-                {
-                    SetTableFromOptions(info?.SubTable);
-                }
             }
             return info;
         }
@@ -84,31 +79,31 @@ namespace ZR.Service.System
         private void SetTableFromOptions(GenTable genTable)
         {
             //附加参数，key，value格式
-            if (!string.IsNullOrEmpty(genTable?.Options))
-            {
-                Dictionary<string, object> options = JsonConvert.DeserializeObject<Dictionary<string, object>>(genTable.Options);
-                if (options == null) return;
+            //if (!string.IsNullOrEmpty(genTable?.Options))
+            //{
+            //    Dictionary<string, object> options = JsonConvert.DeserializeObject<Dictionary<string, object>>(genTable.Options);
+            //    if (options == null) return;
 
-                genTable.ParentMenuId = options.GetValueOrDefault("parentMenuId") ?? null;
+            //    genTable.ParentMenuId = options.GetValueOrDefault("parentMenuId") ?? null;
 
-                genTable.SortType = options.GetValueOrDefault("sortType") ?? "asc";
-                genTable.SortField = options.GetValueOrDefault("sortField") ?? "";
+            //    genTable.SortType = options.GetValueOrDefault("sortType") ?? "asc";
+            //    genTable.SortField = options.GetValueOrDefault("sortField") ?? "";
 
-                genTable.TreeParentCode = options.GetValueOrDefault("treeParentCode") ?? "";
-                genTable.TreeName = options.GetValueOrDefault("treeName") ?? "";
-                genTable.TreeCode = options.GetValueOrDefault("treeCode") ?? "";
+            //    genTable.TreeParentCode = options.GetValueOrDefault("treeParentCode") ?? "";
+            //    genTable.TreeName = options.GetValueOrDefault("treeName") ?? "";
+            //    genTable.TreeCode = options.GetValueOrDefault("treeCode") ?? "";
 
-                var checkdBtn = options.GetValueOrDefault("checkedBtn") ?? "";
-                genTable.CheckedBtn = Tools.SpitIntArrary(checkdBtn.ToString());
+            //    var checkdBtn = options.GetValueOrDefault("checkedBtn") ?? "";
+            //    genTable.CheckedBtn = Tools.SpitIntArrary(checkdBtn.ToString());
 
-                var permPrefix = options.GetValueOrDefault("permissionPrefix", "");
+            //    var permPrefix = options.GetValueOrDefault("permissionPrefix", "");
 
-                genTable.PermissionPrefix = permPrefix?.ToString();
-            }
-            if (genTable.PermissionPrefix.IsEmpty())
-            {
-                genTable.PermissionPrefix = $"{genTable.ModuleName.ToLower()}:{genTable.ClassName.ToLower()}";//权限
-            }
+            //    genTable.PermissionPrefix = permPrefix?.ToString();
+            //}
+            //if (genTable?.Options?.PermissionPrefix.IsEmpty())
+            //{
+            //    genTable?.Options?.PermissionPrefix = $"{genTable.ModuleName.ToLower()}:{genTable.ClassName.ToLower()}";//权限
+            //}
         }
 
         /// <summary>
diff --git a/ZR.Vue/src/views/tool/gen/editTable.vue b/ZR.Vue/src/views/tool/gen/editTable.vue
index accfacc..da29d09 100644
--- a/ZR.Vue/src/views/tool/gen/editTable.vue
+++ b/ZR.Vue/src/views/tool/gen/editTable.vue
@@ -9,9 +9,9 @@
       </el-tab-pane>
       <el-tab-pane label="字段信息" name="cloum">
         <el-table ref="dragTable" v-loading="loading" :data="columns" row-key="columnId" min-height="150px" :max-height="tableHeight">
-          <el-table-column label="序号" type="index" class-name="allowDrag" />
-          <el-table-column label="字段列名" prop="columnName" :show-overflow-tooltip="true" />
-          <el-table-column label="字段描述">
+          <el-table-column label="序号" type="index" class-name="allowDrag" fixed />
+          <el-table-column label="字段列名" prop="columnName" :show-overflow-tooltip="true" fixed />
+          <el-table-column label="字段描述" fixed>
             <template slot-scope="scope">
               <el-input v-model="scope.row.columnComment" :ref="scope.row.columnId" @keydown.native="nextFocus(scope.row, scope.$index, $event)">
               </el-input>
@@ -76,7 +76,7 @@
               <el-checkbox v-model="scope.row.isRequired"></el-checkbox>
             </template>
           </el-table-column>
-          <el-table-column label="表单显示类型">
+          <el-table-column label="表单显示类型" width="120">
             <template slot-scope="scope">
               <el-select v-model="scope.row.htmlType">
                 <el-option label="文本框" value="input" />
@@ -93,7 +93,7 @@
               </el-select>
             </template>
           </el-table-column>
-          <el-table-column label="字典类型">
+          <el-table-column label="字典类型" min-width="100">
             <template slot-scope="scope">
               <el-select
                 v-model="scope.row.dictType"
@@ -109,6 +109,11 @@
               </el-select>
             </template>
           </el-table-column>
+          <el-table-column label="备注" align="center" width="200">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.remark"> </el-input>
+            </template>
+          </el-table-column>
         </el-table>
       </el-tab-pane>
     </el-tabs>
@@ -166,7 +171,7 @@ export default {
         getGenTable(tableId).then((res) => {
           this.loading = false
           this.columns = res.data.info.columns
-          this.info = res.data.info
+          this.info = { ...res.data.info, ...res.data.info.options }
           this.tables = res.data.tables // 子表
         })
         /** 查询字典下拉列表 */
@@ -196,7 +201,7 @@ export default {
             parentMenuId: genTable.parentMenuId,
             sortField: genTable.sortField,
             sortType: genTable.sortType,
-            checkedBtn: genTable.checkedBtn.toString(),
+            checkedBtn: genTable.checkedBtn,
             permissionPrefix: genTable.permissionPrefix,
           }
           console.log('genForm', genTable)