增加信眾牌位範本及疏文

web/App_Code/Entity/Style.cs

@@ -6,88 +6,88 @@ using System.Web;
 /// <summary>
 /// Style 的摘要描述
 /// </summary>
-public class TabletStyle
+//public class TabletStyle
-{
+//{
-    public TabletStyle()
+//    public TabletStyle()
-    {
+//    {
-        //
+//        //
-        // TODO: 在這裡新增建構函式邏輯
+//        // TODO: 在這裡新增建構函式邏輯
-        //
+//        //
-    }
+//    }
 
-    public string StyleID { get; set; }
+//    public string StyleID { get; set; }
-    public string Name { get; set; }
+//    public string Name { get; set; }
-    public string Descr { get; set; }
+//    public string Descr { get; set; }
-    public string PaperSize {  get; set; }
+//    public string PaperSize {  get; set; }
-    public string BackendImg    { get; set; }
+//    public string BackendImg    { get; set; }
-    public string PrintSize { get; set; }
+//    public string PrintSize { get; set; }
-    public string PrintMode { get; set; }
+//    public string PrintMode { get; set; }
-    public string Orientation { get; set; }
+//    public string Orientation { get; set; }
-    public string PrintPageCount { get; set; }
+//    public string PrintPageCount { get; set; }
-    public string RosterLimit { get; set; }
+//    public string RosterLimit { get; set; }
-    public string CUser { get; set; }
+//    public string CUser { get; set; }
-    public string CDate { get; set; }
+//    public string CDate { get; set; }
-    public string CTime { get; set; }
+//    public string CTime { get; set; }
-    public string UUser {  get; set; }
+//    public string UUser {  get; set; }
-    public string UDate { get; set; }
+//    public string UDate { get; set; }
-    public string UTime { get; set; }
+//    public string UTime { get; set; }
-}
+//}
 
-public class TabletStyleDetail
+//public class TabletStyleDetail
-{
+//{
-    public TabletStyleDetail() { }
+//    public TabletStyleDetail() { }
-    public string StyleID { get; set; }
+//    public string StyleID { get; set; }
-    public string Name { get; set; }
+//    public string Name { get; set; }
-    public string Descr { get; set; }
+//    public string Descr { get; set; }
-    public string ElementID { get; set; }
+//    public string ElementID { get; set; }
-    public string StartX { get; set; }
+//    public string StartX { get; set; }
-    public string StartY { get; set; }
+//    public string StartY { get; set; }
-    public string FontSize { get; set; }
+//    public string FontSize { get; set; }
-    public string FontFamily { get; set; }
+//    public string FontFamily { get; set; }
-    public string TwoOffset { get; set; }
+//    public string TwoOffset { get; set; }
-    public string ThreeOffset { get; set; }
+//    public string ThreeOffset { get; set; }
-    public string FourOffset { get; set; }
+//    public string FourOffset { get; set; }
-    public string IsActive { get; set; }
+//    public string IsActive { get; set; }
-    public string Width { get; set; }
+//    public string Width { get; set; }
-    public string Height { get; set; }
+//    public string Height { get; set; }
-    public string TextWidth { get; set; }
+//    public string TextWidth { get; set; }
-    public string TextHeight { get; set; }
+//    public string TextHeight { get; set; }
-    public string TextSpan { get; set; }
+//    public string TextSpan { get; set; }
-    public string BreakLen { get; set; }
+//    public string BreakLen { get; set; }
-    public string CUser { get; set; }
+//    public string CUser { get; set; }
-    public string CDate { get; set; }
+//    public string CDate { get; set; }
-    public string CTime { get; set; }
+//    public string CTime { get; set; }
-    public string UUser { get; set; }
+//    public string UUser { get; set; }
-    public string UDate { get; set; }
+//    public string UDate { get; set; }
-    public string UTime { get; set; }
+//    public string UTime { get; set; }
-}
+//}
 
-public class TabletElement
+//public class TabletElement
-{
+//{
-    public TabletElement() { }
+//    public TabletElement() { }
-    public string ElementID { get; set; }
+//    public string ElementID { get; set; }
-    public string Name { get; set; }
+//    public string Name { get; set; }
-    public string ElementType { get; set; }
+//    public string ElementType { get; set; }
-    public string SampleContent { get; set; }
+//    public string SampleContent { get; set; }
-    public string CUser { get; set; }
+//    public string CUser { get; set; }
-    public string CDate { get; set; }
+//    public string CDate { get; set; }
-    public string CTime { get; set; }
+//    public string CTime { get; set; }
-    public string UUser { get; set; }
+//    public string UUser { get; set; }
-    public string UDate { get; set; }
+//    public string UDate { get; set; }
-    public string UTime { get; set; }
+//    public string UTime { get; set; }
-}
+//}
 
-public class TabletPaperSize
+//public class TabletPaperSize
-{
+//{
-    public TabletPaperSize() { }
+//    public TabletPaperSize() { }
-    public string PaperID { get; set; }
+//    public string PaperID { get; set; }
-    public string PaperName { get; set; }
+//    public string PaperName { get; set; }
-    public string Width { get; set; }
+//    public string Width { get; set; }
-    public string Height { get; set; }
+//    public string Height { get; set; }
-    public string CUser { get; set; }
+//    public string CUser { get; set; }
-    public string CDate { get; set; }
+//    public string CDate { get; set; }
-    public string CTime { get; set; }
+//    public string CTime { get; set; }
-    public string UUser { get; set; }
+//    public string UUser { get; set; }
-    public string UDate { get; set; }
+//    public string UDate { get; set; }
-    public string UTime { get; set; }
+//    public string UTime { get; set; }
-}
+//}

web/App_Code/Model/Model.Context.cs

@@ -100,6 +100,7 @@ namespace Model
         public virtual DbSet<receipt_style> receipt_style { get; set; }
         public virtual DbSet<receipt_style_d> receipt_style_d { get; set; }
         public virtual DbSet<pre_order> pre_order { get; set; }
+        public virtual DbSet<followers_tablet_template> followers_tablet_template { get; set; }
         public virtual DbSet<hr_arrange> hr_arrange { get; set; }
         public virtual DbSet<hr_company> hr_company { get; set; }
         public virtual DbSet<hr_employee> hr_employee { get; set; }
@@ -114,6 +115,10 @@ namespace Model
         public virtual DbSet<hr_section> hr_section { get; set; }
         public virtual DbSet<activity_shuwen> activity_shuwen { get; set; }
         public virtual DbSet<shuwen_temp> shuwen_temp { get; set; }
+        public virtual DbSet<TabletElement> TabletElement { get; set; }
+        public virtual DbSet<TabletPaperSize> TabletPaperSize { get; set; }
+        public virtual DbSet<TabletStyle> TabletStyle { get; set; }
+        public virtual DbSet<TabletStyleDetail> TabletStyleDetail { get; set; }
     
         public virtual int pager_eztrust(Nullable<int> startRowIndex, Nullable<int> pageSize, string tableName, string columnName, string sqlWhere, string orderBy, ObjectParameter rowCount)
         {

web/App_Code/Model/Model.cs

@@ -430,6 +430,8 @@ namespace Model
         public string shuwen_type { get; set; }
         public string contents { get; set; }
         public Nullable<System.DateTime> reg_time { get; set; }
+        public string paper_size { get; set; }
+        public string direction { get; set; }
     }
 }
 namespace Model
@@ -1040,6 +1042,21 @@ namespace Model
     using System;
     using System.Collections.Generic;
     
+    public partial class followers_tablet_template
+    {
+        public int num { get; set; }
+        public Nullable<int> follower_num { get; set; }
+        public string name { get; set; }
+        public string style_id { get; set; }
+        public string tablet { get; set; }
+        public string shuwen { get; set; }
+    }
+}
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    
     public partial class GuaDanOrder
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]
@@ -2249,6 +2266,102 @@ namespace Model
     using System;
     using System.Collections.Generic;
     
+    public partial class TabletElement
+    {
+        public string ElementID { get; set; }
+        public string Name { get; set; }
+        public string ElementType { get; set; }
+        public string CUser { get; set; }
+        public string CDate { get; set; }
+        public string CTime { get; set; }
+        public string UUser { get; set; }
+        public string UDate { get; set; }
+        public string UTime { get; set; }
+        public string SampleContent { get; set; }
+    }
+}
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class TabletPaperSize
+    {
+        public string PaperID { get; set; }
+        public string PaperName { get; set; }
+        public string Width { get; set; }
+        public string Height { get; set; }
+        public string CUser { get; set; }
+        public string CDate { get; set; }
+        public string CTime { get; set; }
+        public string UUser { get; set; }
+        public string UDate { get; set; }
+        public string UTime { get; set; }
+    }
+}
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class TabletStyle
+    {
+        public string StyleID { get; set; }
+        public string Name { get; set; }
+        public string Descr { get; set; }
+        public string PaperSize { get; set; }
+        public string BackendImg { get; set; }
+        public string PrintSize { get; set; }
+        public string PrintMode { get; set; }
+        public string Orientation { get; set; }
+        public string PrintPageCount { get; set; }
+        public string CUser { get; set; }
+        public string CDate { get; set; }
+        public string CTime { get; set; }
+        public string UUser { get; set; }
+        public string UDate { get; set; }
+        public string UTime { get; set; }
+        public string RosterLimit { get; set; }
+    }
+}
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    
+    public partial class TabletStyleDetail
+    {
+        public string StyleID { get; set; }
+        public string Name { get; set; }
+        public string Descr { get; set; }
+        public string ElementID { get; set; }
+        public string StartX { get; set; }
+        public string StartY { get; set; }
+        public string FontSize { get; set; }
+        public string BreakLen { get; set; }
+        public string FontFamily { get; set; }
+        public string TwoOffset { get; set; }
+        public string ThreeOffset { get; set; }
+        public string FourOffset { get; set; }
+        public string IsActive { get; set; }
+        public string CUser { get; set; }
+        public string CDate { get; set; }
+        public string CTime { get; set; }
+        public string UUser { get; set; }
+        public string UDate { get; set; }
+        public string UTime { get; set; }
+        public string Width { get; set; }
+        public string Height { get; set; }
+        public string TextWidth { get; set; }
+        public string TextHeight { get; set; }
+        public string TextSpan { get; set; }
+    }
+}
+namespace Model
+{
+    using System;
+    using System.Collections.Generic;
+    
     public partial class transfer_register
     {
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2214:DoNotCallOverridableMethodsInConstructors")]

web/App_Code/Model/Model.edmx

@@ -91,10 +91,10 @@
           <Property Name="customize_data" Type="nvarchar(max)" />
           <Property Name="reg_time" Type="datetime" />
           <Property Name="is_reconcile" Type="nvarchar" MaxLength="1" />
+          <Property Name="sort_order" Type="int" />
           <Property Name="pageSize" Type="varchar" MaxLength="50" />
           <Property Name="printSize" Type="varchar" MaxLength="50" />
           <Property Name="defaultStyle" Type="varchar" MaxLength="50" />
-          <Property Name="sort_order" Type="int" />
         </EntityType>
         <EntityType Name="actItem_files">
           <Key>
@@ -208,6 +208,8 @@
           <Property Name="shuwen_type" Type="varchar" MaxLength="8" Nullable="false" />
           <Property Name="contents" Type="nvarchar(max)" />
           <Property Name="reg_time" Type="datetime" />
+          <Property Name="paper_size" Type="varchar" MaxLength="10" />
+          <Property Name="direction" Type="varchar" MaxLength="10" />
         </EntityType>
         <EntityType Name="activity_spares">
           <Key>
@@ -357,7 +359,7 @@
           <Property Name="start_date" Type="date" />
           <Property Name="end_date" Type="date" />
           <Property Name="receipt_title" Type="nvarchar(max)" />
-          <Property Name="receipt_address" Type="nvarchar" MaxLength="200" />
+          <Property Name="receipt_address" Type="nvarchar" MaxLength="200" Nullable="false" />
         </EntityType>
         <EntityType Name="bed_kind">
           <Key>
@@ -430,7 +432,7 @@
           <Property Name="smtp_def" Type="nvarchar" MaxLength="1" />
           <Property Name="use_sender" Type="nvarchar" MaxLength="1" />
           <Property Name="bed_order_no" Type="nvarchar" MaxLength="20" />
-          <Property Name="last_auto_order_no" Type="varchar" MaxLength="20" />
+          <Property Name="last_auto_order_no" Type="nvarchar" MaxLength="20" />
         </EntityType>
         <EntityType Name="country">
           <Key>
@@ -511,7 +513,7 @@
           <Property Name="country" Type="nvarchar" MaxLength="5" />
           <Property Name="appellation_id" Type="int" />
           <Property Name="follower_hash" Type="nvarchar" MaxLength="100" />
-          <Property Name="search_keywords" Type="varchar(max)" />
+          <Property Name="search_keywords" Type="nvarchar(max)" />
         </EntityType>
         <EntityType Name="followers_tablet">
           <Key>
@@ -522,6 +524,17 @@
           <Property Name="type" Type="nvarchar" MaxLength="100" />
           <Property Name="title" Type="nvarchar(max)" />
         </EntityType>
+        <EntityType Name="followers_tablet_template">
+          <Key>
+            <PropertyRef Name="num" />
+          </Key>
+          <Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
+          <Property Name="follower_num" Type="int" />
+          <Property Name="name" Type="nvarchar" MaxLength="50" />
+          <Property Name="style_id" Type="varchar" MaxLength="20" />
+          <Property Name="tablet" Type="nvarchar(max)" />
+          <Property Name="shuwen" Type="nvarchar(max)" />
+        </EntityType>
         <EntityType Name="GuaDanOrder">
           <Key>
             <PropertyRef Name="Uuid" />
@@ -845,8 +858,8 @@
           </Key>
           <Property Name="num" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
           <Property Name="kind" Type="nvarchar" MaxLength="100" />
-          <Property Name="starttime" Type="time" Precision="7" />
+          <Property Name="starttime" Type="time" Precision="0" />
-          <Property Name="offtime" Type="time" Precision="7" />
+          <Property Name="offtime" Type="time" Precision="0" />
           <Property Name="resttime" Type="int" />
           <Property Name="root" Type="int" />
           <Property Name="range" Type="int" />
@@ -1280,6 +1293,87 @@
           <Property Name="range" Type="int" />
           <Property Name="demo" Type="nvarchar(max)" />
         </EntityType>
+        <EntityType Name="TabletElement">
+          <Key>
+            <PropertyRef Name="ElementID" />
+          </Key>
+          <Property Name="ElementID" Type="varchar" MaxLength="20" Nullable="false" />
+          <Property Name="Name" Type="nvarchar" MaxLength="50" Nullable="false" />
+          <Property Name="ElementType" Type="varchar" MaxLength="30" Nullable="false" />
+          <Property Name="CUser" Type="varchar" MaxLength="20" />
+          <Property Name="CDate" Type="varchar" MaxLength="10" />
+          <Property Name="CTime" Type="varchar" MaxLength="6" />
+          <Property Name="UUser" Type="varchar" MaxLength="20" />
+          <Property Name="UDate" Type="varchar" MaxLength="10" />
+          <Property Name="UTime" Type="varchar" MaxLength="6" />
+          <Property Name="SampleContent" Type="nvarchar" MaxLength="200" />
+        </EntityType>
+        <EntityType Name="TabletPaperSize">
+          <Key>
+            <PropertyRef Name="PaperID" />
+          </Key>
+          <Property Name="PaperID" Type="varchar" MaxLength="50" Nullable="false" />
+          <Property Name="PaperName" Type="nvarchar" MaxLength="50" />
+          <Property Name="Width" Type="varchar" MaxLength="10" />
+          <Property Name="Height" Type="varchar" MaxLength="10" />
+          <Property Name="CUser" Type="varchar" MaxLength="20" />
+          <Property Name="CDate" Type="varchar" MaxLength="10" />
+          <Property Name="CTime" Type="varchar" MaxLength="6" />
+          <Property Name="UUser" Type="varchar" MaxLength="20" />
+          <Property Name="UDate" Type="varchar" MaxLength="10" />
+          <Property Name="UTime" Type="varchar" MaxLength="6" />
+        </EntityType>
+        <EntityType Name="TabletStyle">
+          <Key>
+            <PropertyRef Name="StyleID" />
+          </Key>
+          <Property Name="StyleID" Type="varchar" MaxLength="20" Nullable="false" />
+          <Property Name="Name" Type="nvarchar" MaxLength="50" />
+          <Property Name="Descr" Type="nvarchar" MaxLength="255" />
+          <Property Name="PaperSize" Type="varchar" MaxLength="20" />
+          <Property Name="BackendImg" Type="varchar" MaxLength="255" />
+          <Property Name="PrintSize" Type="varchar" MaxLength="20" />
+          <Property Name="PrintMode" Type="varchar" MaxLength="10" />
+          <Property Name="Orientation" Type="varchar" MaxLength="10" />
+          <Property Name="PrintPageCount" Type="varchar" MaxLength="5" />
+          <Property Name="CUser" Type="varchar" MaxLength="20" />
+          <Property Name="CDate" Type="varchar" MaxLength="10" />
+          <Property Name="CTime" Type="varchar" MaxLength="6" />
+          <Property Name="UUser" Type="varchar" MaxLength="20" />
+          <Property Name="UDate" Type="varchar" MaxLength="10" />
+          <Property Name="UTime" Type="varchar" MaxLength="6" />
+          <Property Name="RosterLimit" Type="varchar" MaxLength="10" />
+        </EntityType>
+        <EntityType Name="TabletStyleDetail">
+          <Key>
+            <PropertyRef Name="StyleID" />
+            <PropertyRef Name="ElementID" />
+          </Key>
+          <Property Name="StyleID" Type="varchar" MaxLength="20" Nullable="false" />
+          <Property Name="Name" Type="nvarchar" MaxLength="50" />
+          <Property Name="Descr" Type="nvarchar" MaxLength="255" />
+          <Property Name="ElementID" Type="varchar" MaxLength="50" Nullable="false" />
+          <Property Name="StartX" Type="varchar" MaxLength="10" />
+          <Property Name="StartY" Type="varchar" MaxLength="10" />
+          <Property Name="FontSize" Type="varchar" MaxLength="5" />
+          <Property Name="BreakLen" Type="varchar" MaxLength="5" />
+          <Property Name="FontFamily" Type="varchar" MaxLength="50" />
+          <Property Name="TwoOffset" Type="varchar" MaxLength="10" />
+          <Property Name="ThreeOffset" Type="varchar" MaxLength="10" />
+          <Property Name="FourOffset" Type="varchar" MaxLength="10" />
+          <Property Name="IsActive" Type="varchar" MaxLength="10" />
+          <Property Name="CUser" Type="varchar" MaxLength="20" />
+          <Property Name="CDate" Type="varchar" MaxLength="10" />
+          <Property Name="CTime" Type="varchar" MaxLength="6" />
+          <Property Name="UUser" Type="varchar" MaxLength="20" />
+          <Property Name="UDate" Type="varchar" MaxLength="10" />
+          <Property Name="UTime" Type="varchar" MaxLength="6" />
+          <Property Name="Width" Type="varchar" MaxLength="10" />
+          <Property Name="Height" Type="varchar" MaxLength="10" />
+          <Property Name="TextWidth" Type="varchar" MaxLength="10" />
+          <Property Name="TextHeight" Type="varchar" MaxLength="10" />
+          <Property Name="TextSpan" Type="varchar" MaxLength="10" />
+        </EntityType>
         <EntityType Name="transfer_register">
           <Key>
             <PropertyRef Name="id" />
@@ -1450,6 +1544,18 @@
             </Dependent>
           </ReferentialConstraint>
         </Association>
+        <Association Name="FK_activity_activity_category_kind">
+          <End Role="activity_category_kind" Type="Self.activity_category_kind" Multiplicity="0..1" />
+          <End Role="activity" Type="Self.activity" Multiplicity="*" />
+          <ReferentialConstraint>
+            <Principal Role="activity_category_kind">
+              <PropertyRef Name="num" />
+            </Principal>
+            <Dependent Role="activity">
+              <PropertyRef Name="category_kind" />
+            </Dependent>
+          </ReferentialConstraint>
+        </Association>
         <Association Name="FK_activity_activity_kind">
           <End Role="activity_kind" Type="Self.activity_kind" Multiplicity="0..1" />
           <End Role="activity" Type="Self.activity" Multiplicity="*" />
@@ -1839,7 +1945,9 @@
           </ReferentialConstraint>
         </Association>
         <Association Name="FK_member_admin">
-          <End Role="admin" Type="Self.admin" Multiplicity="0..1" />
+          <End Role="admin" Type="Self.admin" Multiplicity="0..1">
+            <OnDelete Action="Cascade" />
+          </End>
           <End Role="member" Type="Self.member" Multiplicity="*" />
           <ReferentialConstraint>
             <Principal Role="admin">
@@ -2480,6 +2588,7 @@
           <EntitySet Name="files" EntityType="Self.files" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="followers" EntityType="Self.followers" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="followers_tablet" EntityType="Self.followers_tablet" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="followers_tablet_template" EntityType="Self.followers_tablet_template" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="GuaDanOrder" EntityType="Self.GuaDanOrder" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="GuaDanOrderGuest" EntityType="Self.GuaDanOrderGuest" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="GuadanTimeSetting" EntityType="Self.GuadanTimeSetting" Schema="dbo" store:Type="Tables" />
@@ -2530,6 +2639,10 @@
           <EntitySet Name="stock_reason" EntityType="Self.stock_reason" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="supplier" EntityType="Self.supplier" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="supplier_kind" EntityType="Self.supplier_kind" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="TabletElement" EntityType="Self.TabletElement" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="TabletPaperSize" EntityType="Self.TabletPaperSize" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="TabletStyle" EntityType="Self.TabletStyle" Schema="dbo" store:Type="Tables" />
+          <EntitySet Name="TabletStyleDetail" EntityType="Self.TabletStyleDetail" Schema="dbo" store:Type="Tables" />
           <EntitySet Name="transfer_register" EntityType="Self.transfer_register" Schema="dbo" store:Type="Tables" />
           <AssociationSet Name="FK__Ancestral__Regis__1A9EF37A" Association="Self.FK__Ancestral__Regis__1A9EF37A">
             <End Role="AncestralTabletRegistrant" EntitySet="AncestralTabletRegistrant" />
@@ -2575,6 +2688,10 @@
             <End Role="actItem" EntitySet="actItem" />
             <End Role="actItem_files" EntitySet="actItem_files" />
           </AssociationSet>
+          <AssociationSet Name="FK_activity_activity_category_kind" Association="Self.FK_activity_activity_category_kind">
+            <End Role="activity_category_kind" EntitySet="activity_category_kind" />
+            <End Role="activity" EntitySet="activity" />
+          </AssociationSet>
           <AssociationSet Name="FK_activity_activity_kind" Association="Self.FK_activity_activity_kind">
             <End Role="activity_kind" EntitySet="activity_kind" />
             <End Role="activity" EntitySet="activity" />
@@ -3282,7 +3399,7 @@
           <Property Name="smtp_def" Type="String" MaxLength="1" FixedLength="false" Unicode="true" />
           <Property Name="use_sender" Type="String" MaxLength="1" FixedLength="false" Unicode="true" />
           <Property Name="bed_order_no" Type="String" MaxLength="20" FixedLength="false" Unicode="true" />
-          <Property Name="last_auto_order_no" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="last_auto_order_no" Type="String" MaxLength="20" FixedLength="false" Unicode="true" />
         </EntityType>
         <EntityType Name="country">
           <Key>
@@ -3359,7 +3476,7 @@
           <NavigationProperty Name="transfer_register" Relationship="Model.FK_transfer_register_followers" FromRole="follower" ToRole="transfer_register" />
           <NavigationProperty Name="transfer_register1" Relationship="Model.FK_transfer_register_followers_match" FromRole="follower" ToRole="transfer_register" />
           <NavigationProperty Name="GuaDanOrder" Relationship="Model.FK_GuaDanOrder_Followers" FromRole="follower" ToRole="GuaDanOrder" />
-          <Property Name="search_keywords" Type="String" MaxLength="Max" FixedLength="false" Unicode="false" />
+          <Property Name="search_keywords" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <NavigationProperty Name="GuaDanOrderGuest" Relationship="Model.FK_GuaDanOrderGuest_FOLLOWERS" FromRole="follower" ToRole="GuaDanOrderGuest" />
           <NavigationProperty Name="auto_enroll" Relationship="Model.FK_auto_enroll_followers" FromRole="follower" ToRole="auto_enroll" />
         </EntityType>
@@ -3450,8 +3567,8 @@
           </Key>
           <Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
           <Property Name="kind" Type="String" MaxLength="100" FixedLength="false" Unicode="true" />
-          <Property Name="starttime" Type="Time" Precision="7" />
+          <Property Name="starttime" Type="Time" Precision="0" />
-          <Property Name="offtime" Type="Time" Precision="7" />
+          <Property Name="offtime" Type="Time" Precision="0" />
           <Property Name="resttime" Type="Int32" />
           <Property Name="root" Type="Int32" />
           <Property Name="range" Type="Int32" />
@@ -4954,6 +5071,7 @@
           <EntitySet Name="receipt_style" EntityType="Model.receipt_style" />
           <EntitySet Name="receipt_style_d" EntityType="Model.receipt_style_d" />
           <EntitySet Name="pre_order" EntityType="Model.pre_order" />
+          <EntitySet Name="followers_tablet_template" EntityType="Model.followers_tablet_template" />
           <EntitySet Name="hr_arrange" EntityType="Model.hr_arrange" />
           <EntitySet Name="hr_company" EntityType="Model.hr_company" />
           <EntitySet Name="hr_employee" EntityType="Model.hr_employee" />
@@ -4968,6 +5086,10 @@
           <EntitySet Name="hr_section" EntityType="Model.hr_section" />
           <EntitySet Name="activity_shuwen" EntityType="Model.activity_shuwen" />
           <EntitySet Name="shuwen_temp" EntityType="Model.shuwen_temp" />
+          <EntitySet Name="TabletElement" EntityType="Model.TabletElement" />
+          <EntitySet Name="TabletPaperSize" EntityType="Model.TabletPaperSize" />
+          <EntitySet Name="TabletStyle" EntityType="Model.TabletStyle" />
+          <EntitySet Name="TabletStyleDetail" EntityType="Model.TabletStyleDetail" />
           </EntityContainer>
         <ComplexType Name="sp_helpdiagramdefinition_Result">
           <Property Type="Int32" Name="version" Nullable="true" />
@@ -5694,7 +5816,7 @@
           <Property Name="start_date" Type="DateTime" Precision="0" />
           <Property Name="end_date" Type="DateTime" Precision="0" />
           <Property Name="receipt_title" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
-          <Property Name="receipt_address" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
+          <Property Name="receipt_address" Type="String" MaxLength="200" FixedLength="false" Unicode="true" Nullable="false" />
           <NavigationProperty Name="followers" Relationship="Model.FK_auto_enroll_followers" FromRole="auto_enroll" ToRole="follower" />
           <NavigationProperty Name="pro_order" Relationship="Model.FK_pro_order_auto_enroll" FromRole="auto_enroll" ToRole="pro_order" />
         </EntityType>
@@ -5803,6 +5925,17 @@
           <Property Name="reg_time" Type="DateTime" Precision="3" />
           <Property Name="receipt_num" Type="Int32" />
         </EntityType>
+        <EntityType Name="followers_tablet_template">
+          <Key>
+            <PropertyRef Name="num" />
+          </Key>
+          <Property Name="num" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
+          <Property Name="follower_num" Type="Int32" />
+          <Property Name="name" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="style_id" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="tablet" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+          <Property Name="shuwen" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
+        </EntityType>
         <EntityType Name="hr_arrange">
           <Key>
             <PropertyRef Name="company_id" />
@@ -6023,6 +6156,8 @@
           <Property Name="shuwen_type" Type="String" Nullable="false" MaxLength="8" FixedLength="false" Unicode="false" />
           <Property Name="contents" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="reg_time" Type="DateTime" Precision="3" />
+          <Property Name="paper_size" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="direction" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
         </EntityType>
         <EntityType Name="shuwen_temp">
           <Key>
@@ -6034,6 +6169,87 @@
           <Property Name="contents" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
           <Property Name="reg_time" Type="DateTime" Precision="3" />
         </EntityType>
+        <EntityType Name="TabletElement">
+          <Key>
+            <PropertyRef Name="ElementID" />
+          </Key>
+          <Property Name="ElementID" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="Name" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="ElementType" Type="String" Nullable="false" MaxLength="30" FixedLength="false" Unicode="false" />
+          <Property Name="CUser" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="CDate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="CTime" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+          <Property Name="UUser" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="UDate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="UTime" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+          <Property Name="SampleContent" Type="String" MaxLength="200" FixedLength="false" Unicode="true" />
+        </EntityType>
+        <EntityType Name="TabletPaperSize">
+          <Key>
+            <PropertyRef Name="PaperID" />
+          </Key>
+          <Property Name="PaperID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="PaperName" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="Width" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="Height" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="CUser" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="CDate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="CTime" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+          <Property Name="UUser" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="UDate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="UTime" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+        </EntityType>
+        <EntityType Name="TabletStyle">
+          <Key>
+            <PropertyRef Name="StyleID" />
+          </Key>
+          <Property Name="StyleID" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="Name" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="Descr" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+          <Property Name="PaperSize" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="BackendImg" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
+          <Property Name="PrintSize" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="PrintMode" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="Orientation" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="PrintPageCount" Type="String" MaxLength="5" FixedLength="false" Unicode="false" />
+          <Property Name="CUser" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="CDate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="CTime" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+          <Property Name="UUser" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="UDate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="UTime" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+          <Property Name="RosterLimit" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+        </EntityType>
+        <EntityType Name="TabletStyleDetail">
+          <Key>
+            <PropertyRef Name="StyleID" />
+            <PropertyRef Name="ElementID" />
+          </Key>
+          <Property Name="StyleID" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="Name" Type="String" MaxLength="50" FixedLength="false" Unicode="true" />
+          <Property Name="Descr" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
+          <Property Name="ElementID" Type="String" Nullable="false" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="StartX" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="StartY" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="FontSize" Type="String" MaxLength="5" FixedLength="false" Unicode="false" />
+          <Property Name="BreakLen" Type="String" MaxLength="5" FixedLength="false" Unicode="false" />
+          <Property Name="FontFamily" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
+          <Property Name="TwoOffset" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="ThreeOffset" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="FourOffset" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="IsActive" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="CUser" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="CDate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="CTime" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+          <Property Name="UUser" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
+          <Property Name="UDate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="UTime" Type="String" MaxLength="6" FixedLength="false" Unicode="false" />
+          <Property Name="Width" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="Height" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="TextWidth" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="TextHeight" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+          <Property Name="TextSpan" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
+        </EntityType>
         </Schema>
     </edmx:ConceptualModels>
     <!-- C-S mapping content -->
@@ -7189,6 +7405,18 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="followers_tablet_template">
+            <EntityTypeMapping TypeName="Model.followers_tablet_template">
+              <MappingFragment StoreEntitySet="followers_tablet_template">
+                <ScalarProperty Name="shuwen" ColumnName="shuwen" />
+                <ScalarProperty Name="tablet" ColumnName="tablet" />
+                <ScalarProperty Name="style_id" ColumnName="style_id" />
+                <ScalarProperty Name="name" ColumnName="name" />
+                <ScalarProperty Name="follower_num" ColumnName="follower_num" />
+                <ScalarProperty Name="num" ColumnName="num" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           <EntitySetMapping Name="hr_arrange">
             <EntityTypeMapping TypeName="Model.hr_arrange">
               <MappingFragment StoreEntitySet="hr_arrange">
@@ -7397,6 +7625,8 @@
           <EntitySetMapping Name="activity_shuwen">
             <EntityTypeMapping TypeName="Model.activity_shuwen">
               <MappingFragment StoreEntitySet="activity_shuwen">
+                <ScalarProperty Name="direction" ColumnName="direction" />
+                <ScalarProperty Name="paper_size" ColumnName="paper_size" />
                 <ScalarProperty Name="reg_time" ColumnName="reg_time" />
                 <ScalarProperty Name="contents" ColumnName="contents" />
                 <ScalarProperty Name="shuwen_type" ColumnName="shuwen_type" />
@@ -7416,6 +7646,90 @@
               </MappingFragment>
             </EntityTypeMapping>
           </EntitySetMapping>
+          <EntitySetMapping Name="TabletElement">
+            <EntityTypeMapping TypeName="Model.TabletElement">
+              <MappingFragment StoreEntitySet="TabletElement">
+                <ScalarProperty Name="SampleContent" ColumnName="SampleContent" />
+                <ScalarProperty Name="UTime" ColumnName="UTime" />
+                <ScalarProperty Name="UDate" ColumnName="UDate" />
+                <ScalarProperty Name="UUser" ColumnName="UUser" />
+                <ScalarProperty Name="CTime" ColumnName="CTime" />
+                <ScalarProperty Name="CDate" ColumnName="CDate" />
+                <ScalarProperty Name="CUser" ColumnName="CUser" />
+                <ScalarProperty Name="ElementType" ColumnName="ElementType" />
+                <ScalarProperty Name="Name" ColumnName="Name" />
+                <ScalarProperty Name="ElementID" ColumnName="ElementID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="TabletPaperSize">
+            <EntityTypeMapping TypeName="Model.TabletPaperSize">
+              <MappingFragment StoreEntitySet="TabletPaperSize">
+                <ScalarProperty Name="UTime" ColumnName="UTime" />
+                <ScalarProperty Name="UDate" ColumnName="UDate" />
+                <ScalarProperty Name="UUser" ColumnName="UUser" />
+                <ScalarProperty Name="CTime" ColumnName="CTime" />
+                <ScalarProperty Name="CDate" ColumnName="CDate" />
+                <ScalarProperty Name="CUser" ColumnName="CUser" />
+                <ScalarProperty Name="Height" ColumnName="Height" />
+                <ScalarProperty Name="Width" ColumnName="Width" />
+                <ScalarProperty Name="PaperName" ColumnName="PaperName" />
+                <ScalarProperty Name="PaperID" ColumnName="PaperID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="TabletStyle">
+            <EntityTypeMapping TypeName="Model.TabletStyle">
+              <MappingFragment StoreEntitySet="TabletStyle">
+                <ScalarProperty Name="RosterLimit" ColumnName="RosterLimit" />
+                <ScalarProperty Name="UTime" ColumnName="UTime" />
+                <ScalarProperty Name="UDate" ColumnName="UDate" />
+                <ScalarProperty Name="UUser" ColumnName="UUser" />
+                <ScalarProperty Name="CTime" ColumnName="CTime" />
+                <ScalarProperty Name="CDate" ColumnName="CDate" />
+                <ScalarProperty Name="CUser" ColumnName="CUser" />
+                <ScalarProperty Name="PrintPageCount" ColumnName="PrintPageCount" />
+                <ScalarProperty Name="Orientation" ColumnName="Orientation" />
+                <ScalarProperty Name="PrintMode" ColumnName="PrintMode" />
+                <ScalarProperty Name="PrintSize" ColumnName="PrintSize" />
+                <ScalarProperty Name="BackendImg" ColumnName="BackendImg" />
+                <ScalarProperty Name="PaperSize" ColumnName="PaperSize" />
+                <ScalarProperty Name="Descr" ColumnName="Descr" />
+                <ScalarProperty Name="Name" ColumnName="Name" />
+                <ScalarProperty Name="StyleID" ColumnName="StyleID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
+          <EntitySetMapping Name="TabletStyleDetail">
+            <EntityTypeMapping TypeName="Model.TabletStyleDetail">
+              <MappingFragment StoreEntitySet="TabletStyleDetail">
+                <ScalarProperty Name="TextSpan" ColumnName="TextSpan" />
+                <ScalarProperty Name="TextHeight" ColumnName="TextHeight" />
+                <ScalarProperty Name="TextWidth" ColumnName="TextWidth" />
+                <ScalarProperty Name="Height" ColumnName="Height" />
+                <ScalarProperty Name="Width" ColumnName="Width" />
+                <ScalarProperty Name="UTime" ColumnName="UTime" />
+                <ScalarProperty Name="UDate" ColumnName="UDate" />
+                <ScalarProperty Name="UUser" ColumnName="UUser" />
+                <ScalarProperty Name="CTime" ColumnName="CTime" />
+                <ScalarProperty Name="CDate" ColumnName="CDate" />
+                <ScalarProperty Name="CUser" ColumnName="CUser" />
+                <ScalarProperty Name="IsActive" ColumnName="IsActive" />
+                <ScalarProperty Name="FourOffset" ColumnName="FourOffset" />
+                <ScalarProperty Name="ThreeOffset" ColumnName="ThreeOffset" />
+                <ScalarProperty Name="TwoOffset" ColumnName="TwoOffset" />
+                <ScalarProperty Name="FontFamily" ColumnName="FontFamily" />
+                <ScalarProperty Name="BreakLen" ColumnName="BreakLen" />
+                <ScalarProperty Name="FontSize" ColumnName="FontSize" />
+                <ScalarProperty Name="StartY" ColumnName="StartY" />
+                <ScalarProperty Name="StartX" ColumnName="StartX" />
+                <ScalarProperty Name="ElementID" ColumnName="ElementID" />
+                <ScalarProperty Name="Descr" ColumnName="Descr" />
+                <ScalarProperty Name="Name" ColumnName="Name" />
+                <ScalarProperty Name="StyleID" ColumnName="StyleID" />
+              </MappingFragment>
+            </EntityTypeMapping>
+          </EntitySetMapping>
           </EntityContainerMapping>
       </Mapping>
     </edmx:Mappings>

web/App_Code/Model/Model.edmx.diagram

@@ -170,6 +170,7 @@
         <EntityTypeShape EntityType="Model.receipt_style" Width="1.5" PointX="19.375" PointY="25.75" />
         <EntityTypeShape EntityType="Model.receipt_style_d" Width="1.5" PointX="26.375" PointY="0.75" />
         <EntityTypeShape EntityType="Model.pre_order" Width="1.5" PointX="0.75" PointY="26.75" />
+        <EntityTypeShape EntityType="Model.followers_tablet_template" Width="1.5" PointX="30.375" PointY="30.75" />
         <EntityTypeShape EntityType="Model.hr_arrange" Width="1.5" PointX="0.75" PointY="5.75" />
         <EntityTypeShape EntityType="Model.hr_company" Width="1.5" PointX="25.75" PointY="26.75" />
         <EntityTypeShape EntityType="Model.hr_employee" Width="1.5" PointX="27.75" PointY="4.75" />
@@ -183,7 +184,11 @@
         <EntityTypeShape EntityType="Model.hr_org" Width="1.5" PointX="30.75" PointY="0.75" />
         <EntityTypeShape EntityType="Model.hr_section" Width="1.5" PointX="0.75" PointY="30.75" />
         <EntityTypeShape EntityType="Model.activity_shuwen" Width="1.5" PointX="10.375" PointY="30.75" />
-        <EntityTypeShape EntityType="Model.shuwen_temp" Width="1.5" PointX="28.375" PointY="30.75" />
+        <EntityTypeShape EntityType="Model.shuwen_temp" Width="1.5" PointX="23.375" PointY="31.75" />
+        <EntityTypeShape EntityType="Model.TabletElement" Width="1.5" PointX="25.375" PointY="31.75" />
+        <EntityTypeShape EntityType="Model.TabletPaperSize" Width="1.5" PointX="27.375" PointY="31.75" />
+        <EntityTypeShape EntityType="Model.TabletStyle" Width="1.5" PointX="32.375" PointY="4.75" />
+        <EntityTypeShape EntityType="Model.TabletStyleDetail" Width="1.5" PointX="32.375" PointY="22.75" />
         </Diagram>
     </edmx:Diagrams>
   </edmx:Designer>

web/App_Code/api/designerController.cs

@@ -3,6 +3,7 @@ using MINOM.COM.Utility;
 using Model;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using PagedList;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -329,4 +330,40 @@ public class designerController : ApiController
         object[] obj = new StyleDataAccess().DelTabletStyle(StyleID);
         return Ok(new { result = obj[0].ToString(), message = obj[1].ToString() });
     }
+
+    [HttpPost]
+    [Route("api/tablet/GetTabletStyleList")]
+    public IHttpActionResult GetTabletStyleList([FromBody] dynamic data)
+    {
+        var qry = _db.TabletStyle.AsQueryable();
+        //var count = qry.Count(); //pageSize = count;//一次取回??
+        //var qryList = (pageSize > 0) ? qry.ToPagedList(page, pageSize).ToList() : qry.ToList();
+        qry = qry.Where(x=>x.StyleID!= "000001");
+        var ret = new
+        {
+            list = qry.Select(x => new
+            {
+                x.StyleID,
+                x.BackendImg,
+                x.Name,
+                x.RosterLimit,
+                x.Descr,
+                x.PrintMode,
+                x.PrintSize,
+                x.PaperSize,
+                details = _db.TabletStyleDetail.Where(y => y.StyleID == x.StyleID).Select(y => new
+                {
+                    y.StyleID,
+                    y.ElementID, y.Name,y.Descr,y.FontFamily,y.FontSize,y.Height,y.Width,
+                    y.TextHeight,y.TextSpan,y.StartX,y.StartY,y.IsActive
+                }).ToList()
+            }),
+            papers = _db.TabletPaperSize.Select(z => new { z.PaperID, z.PaperName, z.Width, z.Height }).ToList(),
+            elements = _db.TabletElement.Select(w => new {w.Name,w.ElementID,w.SampleContent}).ToList(),
+            //count = count
+        };
+
+        if (ret.list == null) throw new HttpResponseException(HttpStatusCode.NotFound);
+        return Ok(ret);
+    }
 }

web/App_Code/api/orderController.cs

@@ -1219,7 +1219,7 @@ public class orderController : ApiController
                         ? item.from_id : null;
                     order.f_num_tablet = item.f_num_tablet;
                     order.from_id_tablet = item.from_id_tablet;
-                    order.print_id = item.GenerateSequentialId();
+                    order.print_id =(!string.IsNullOrEmpty(order.print_id)? order.print_id: item.GenerateSequentialId());
                     order.address = item.address;
                     order.start_date = item.start_date.HasValue 
                         ? item.start_date : null;

web/App_Code/api/shuwensController.cs

@@ -16,6 +16,31 @@ public class shuwensController: BaseApiController
         // TODO: 在這裡新增建構函式邏輯
         //
     }
+    [HttpPost]
+    [Route("api/shuwens/GetActShuwen")]
+    public IHttpActionResult GetActShuwen([FromBody] Model.activity_shuwen temp)
+    {
+        var qry = _db.activity_shuwen.AsQueryable();
+        if (temp.act_num > 0)
+        {
+            qry = qry.Where(x => x.act_num == temp.act_num);
+        }
+        if (!string.IsNullOrEmpty(temp.shuwen_type))
+        {
+            qry = qry.Where(x => x.shuwen_type == temp.shuwen_type);
+        }
+        return Ok(new
+        {
+            result = "Y",
+            data = qry.Select(x => new
+            {
+                x.act_num,
+                x.shuwen_type,
+                x.shuwen_num,
+                x.contents
+            }).FirstOrDefault()
+        });
+    }
 
     [HttpPost]
     [Route("api/shuwens/GetShuwenTemplate")]

web/admin/activity/reg.aspx

@@ -1363,7 +1363,7 @@
                       <div class="tab-pane fade" id="sec2-page5" role="tabpanel" aria-labelledby="sec2-tab5" v-if="this_id!=''">
                          <v-card class="mx-auto" outlined >
                            <keep-alive>
-                               <component :is="currentView">
+                               <component :is="currentView" :num="this_id">
                                </component>
                             </keep-alive>  
                          </v-card>

web/admin/activity/shuwen02.vue

@@ -10,9 +10,18 @@
       <div id="control-panel">
         <!-- panel-inner 用於固定內容寬度，避免收合時文字因為寬度變小而折行 -->
           <div class="panel-inner">
+              <div class="control-group">
+                  <label>疏文類型</label>
+                  <select v-model="shuwenType" @change="changeShuwenType">
+                      <option value="">請選擇</option>
+                      <option value="01">消災</option>
+                      <option value="02">超薦</option>
+                  </select>
+              </div>
               <div class="control-group">
                   <label>疏文樣板</label>
                   <select v-model="defaultTemplate" @change="changeTemplate">
+                      <option value="">請選擇</option>
                       <option v-for="item in shuwenList" :key="item.num" :value="item.num">{{ item.name }}</option>
                   </select>
               </div>
@@ -73,13 +82,14 @@
     </div>
 
     <!-- 預覽區塊 -->
-    <div id="preview-container" @click.prevent="hideFloatingMenu">
+    <div id="preview-container" @click="hideFloatingMenu">
       <div id="paper-preview" :style="paperStyle">
         <div
           id="editor"
           contenteditable="true"
           ref="editorRef"
-          @contextmenu.prevent="rightClickLineTrack"
+          @contextmenu="rightClickLineTrack"
+             @keydown.enter.prevent="newLine"
         >
           <div style="font-size: 28px; font-weight: bold; align-items: center; margin-left: 25px;">中元普渡祈福文疏</div>
           <div></div>
@@ -170,8 +180,11 @@
 <script>
 module.exports = {
   name: 'Shuwen02',
-  
+    props: {
-  data() {
+        num: { type: String }
+    },
+    data() {
+
     return {
       isPanelCollapsed: false, // 控制面板收合狀態
       paperSize: 'A4',
@@ -194,7 +207,8 @@ module.exports = {
         alignItems: 'flex-start'
         },
       shuwenList: [],
-      defaultTemplate: {}
+        defaultTemplate: {},
+      shuwenType:""
     };
   },
 
@@ -211,7 +225,24 @@ module.exports = {
     this.startY = 0;
   },
 
-  methods: {
+    methods: {
+        changeShuwenType() {
+            console.log("changeShuwenType:", this.shuwenType)
+            //去資料庫抓回他的消災或超薦的總疏文
+            axios.post(HTTP_HOST + 'api/shuwens/GetActShuwen', { act_num: Number(this.num), shuwen_type: this.shuwenType })
+                .then(response => {
+                    console.log(response)
+                    if (response && response.data && response.data.data) {
+                        let shuwenContent = response.data.data.contents
+                        document.getElementById("editor").innerHTML = `${shuwenContent}`;
+                    }
+
+                })
+                .catch(error => console.log(error))
+        },
+        newLine() {
+            document.execCommand('insertParagraph',false);
+        },
     updateLayout() {
       const sizes = {
         'A4': { w: 210, h: 297 },
@@ -232,7 +263,11 @@ module.exports = {
           this.initData();
     },
       changeTemplate() {
-         // console.log("changeTemplate:", this.defaultTemplate)
+          // console.log("changeTemplate:", this.defaultTemplate)
+          if (this.defaultTemplate === "") {
+              this.clearContent();
+              return
+          }
           let temp = this.shuwenList.find((x) => x.num === this.defaultTemplate);
           if (temp) {
               document.getElementById("editor").innerHTML = temp.contents;
@@ -322,7 +357,8 @@ module.exports = {
       this.isMenuVisible = false;
       if (this.currentTargetLine) {
         this.currentTargetLine.classList.remove('selected-line');
-      }
+        }
+        console.log(this.num, this.shuwenType, this.defaultTemplate);
       const editor = this.$refs.editorRef;
       if (editor) {
         console.log(editor.innerHTML);
@@ -367,9 +403,7 @@ module.exports = {
       document.removeEventListener('mouseup', this.stopDrag);
     },
     initData() {
-        axios
+        axios.post(HTTP_HOST + 'api/shuwens/ListShuwenTemplate')
-           
-            .post(HTTP_HOST + 'api/shuwens/ListShuwenTemplate')
             .then(response => {
                 console.log(response)
                 this.shuwenList = response.data.data
@@ -379,7 +413,7 @@ module.exports = {
       },
       clearContent() {
           document.getElementById("editor").innerHTML = `
-          <div style="font-size: 28px; font-weight: bold; align-items: flex-start; margin-left: 5px; letter-spacing: 16px;" class="">
+          <div class="selected-line">
           &nbsp; &nbsp;</div>
           `;
       },
@@ -607,7 +641,8 @@ module.exports = {
 
   mounted() {
     this.updateLayout();
-    this.bindEvents();
+      this.bindEvents();
+      document.execCommand("defaultParagraphSeparator",false,'div');
   },
 
   beforeDestroy() {
@@ -625,7 +660,7 @@ module.exports = {
 };
 </script>
 
-<style scoped>
+<style>
 /* 基礎排版與重設 */
 .print-preview-app {
   font-family: "Microsoft JhengHei", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;

web/admin/follower/reg.aspx

@@ -2,6 +2,7 @@
 
 <%@ Register Src="~/admin/_uc/alert.ascx" TagPrefix="uc1" TagName="alert" %>
 <asp:Content ID="Content1" ContentPlaceHolderID="page_header" runat="Server">
+     <script src="/js/httpVueLoader.js"></script>
 </asp:Content>
 <asp:Content ID="Content4" ContentPlaceHolderID="footer_script" runat="Server">
     <script>
@@ -72,11 +73,11 @@
                         $('#L1').text(data.cDate)
                         $('#L2').text(data.sign)
                     } else {
-                        console.log(data.msg);
+                        //console.log(data.msg);
                     }
                 });
             }
-            console.log(_date);
+           // console.log(_date);
         }
         function checkNumber(btn) {
             $('#errormsg').hide();
@@ -98,7 +99,7 @@
                 if (data.isOk) {
 
                 } else {
-                    console.log(data.msg);
+                    //console.log(data.msg);
                     $('#errormsg').text(data.msg);
                     $('#errormsg').show();
                 }
@@ -159,7 +160,7 @@
                                 ],
                                 selected: {},
                                 select(item, index, t) {
-                                    console.log("select search1", t);
+                                    //console.log("select search1", t);
                                 }
                             },
                             search2: {
@@ -215,7 +216,7 @@
                                 ],
                                 selected: {},
                                 select(item, index, t) {
-                                    console.log("select search3", t);
+                                    //console.log("select search3", t);
                                 }
                             },
                             search4: {
@@ -231,7 +232,7 @@
                                 ],
                                 selected: {},
                                 select(item, index, t) {
-                                    console.log("select search4", t);
+                                    //console.log("select search4", t);
                                     //edit item
                                     item.appellation_id_selected.text = t.title //=====?
                                     item.appellation_id_selected.val = t.num //=====?
@@ -255,7 +256,7 @@
                                 ],
                                 selected: {},
                                 select(item, index, t) {
-                                    console.log("select search5", t);
+                                    //console.log("select search5", t);
 
                                 }
                             },
@@ -547,7 +548,8 @@
                         { text: '酉時 (17:00~19:00)', value: '酉時' },
                         { text: '戌時 (19:00~21:00)', value: '戌時' },
                         { text: '亥時 (21:00~23:00)', value: '亥時' }
-                    ]
+                    ],
+                    currentView: 'shuwen-component',
                 }
             },
             mounted() {
@@ -566,7 +568,7 @@
                     handler() {
                         //console.log("watch1", this.search_dialog, this.search_dialog.page);
                         this.search_get()
-                        console.log("watch2", this.search_dialog, this.search_dialog.page);
+                        //console.log("watch2", this.search_dialog, this.search_dialog.page);
                     },
                     deep: true,
                 },
@@ -602,6 +604,9 @@
                     color: 'error'
                 }
             },
+            components: {
+                'shuwen-component': httpVueLoader('./tablet_template.vue'),
+            },
             methods: {
                 initAutoEnroll() {
                     if (this.follower_id != '') {
@@ -743,7 +748,7 @@
                             this.confirm_dialog.pendingDeleteItem = null; // 清空暫存
                         })
                         .catch(error => {
-                            console.log("刪除失敗", error);
+                            //console.log("刪除失敗", error);
                             this.snackbar.text = "刪除失敗：" + error;
                             this.snackbar.show = true;
                         })
@@ -915,13 +920,13 @@
                             }
                         })
                         .catch(error => {
-                            console.log("刪除訂單失敗", error);
+                            //console.log("刪除訂單失敗", error);
                             this.snackbar.text = "刪除訂單失敗：" + error;
                             this.snackbar.show = true;
                         })
                 },
                 search_show(curr) {
-                    console.log("btn_click:", curr, curr.api_url);
+                    //console.log("btn_click:", curr, curr.api_url);
                     this.search_dialog.current = curr;
                     this.search_clear()
                     //this.search_get()//清除完自動會重抓, 故取消
@@ -961,14 +966,14 @@
                     }
                     // }
 
-                    console.log("search_get", api_url, search, params, this.options);
+                    //console.log("search_get", api_url, search, params, this.options);
                     this.search_dialog.loading = true
                     axios.post(api_url, search, { params: params })
                         .then(response => {
                             this.search_dialog.list = response.data.list
                             this.search_dialog.count = response.data.count
                             this.search_dialog.loading = false
-                            console.log(this.search_dialog.list)
+                            //console.log(this.search_dialog.list)
                         })
                         .catch(error => {
                             console.log(error)
@@ -1079,7 +1084,7 @@
                                 axios
                                     .post(HTTP_HOST + 'api/follower/familyDelete', pro_order_detail)
                                     .then(response => {
-                                        console.log("del", item);
+                                       // console.log("del", item);
                                         this.desserts.splice(index, 1)
                                         this.desserts_count = this.desserts_count - 1;
                                     })
@@ -1354,7 +1359,7 @@
                                 axios
                                     .delete(HTTP_HOST + 'api/follower/tabletDelete/' + item.num)
                                     .then(response => {
-                                        console.log("del", item);
+                                        //console.log("del", item);
                                         this.tabletTable.desserts.splice(index, 1)
                                         this.tabletTable.desserts_count = this.tabletTable.desserts_count - 1;
                                     })
@@ -1388,7 +1393,7 @@
                     })
                 },
                 getFamilyMembers() {
-                    console.log("getFamilyMembers", this.follower_id);
+                   // console.log("getFamilyMembers", this.follower_id);
                     if (this.follower_id) {
                         this.family.loading = true;
                         // 假設您有一個 API 端點來獲取特定 follower 的 family members
@@ -1400,7 +1405,7 @@
                                     birthdate: member.birthdate ? member.birthdate.split('T')[0] : null
                                 }));
                                 this.family.members_count = response.data.length;
-                                console.log("family.members", this.family.members);
+                                //console.log("family.members", this.family.members);
                             })
                             .catch(error => {
                                 console.error("Error fetching family members:", error);
@@ -1435,7 +1440,7 @@
                     //this.editedItem = $.extend(true, {}, this.defaultItem);
                 },
                 fam_save(item) {
-                    console.log("fam_save 1:", this.family.edItem);
+                    //console.log("fam_save 1:", this.family.edItem);
                     
                     // 驗證必填欄位 - 只有姓名必填
                     if (!this.family.edItem.fam_name || this.family.edItem.fam_name.trim() === '') {
@@ -1458,7 +1463,7 @@
 
                     savePromise
                         .then(response => {
-                            console.log("fam_save 2: Server response", response);
+                            //console.log("fam_save 2: Server response", response);
 
                             //const updatedMember = fam_item;
                             const updatedMember = { ...fam_item, num: response.data.num };
@@ -1766,6 +1771,9 @@
                         <button class="nav-link" id="sec2-tab5" data-bs-toggle="tab" data-bs-target="#sec2-page5"
                             type="button" role="tab" aria-controls="profile" aria-selected="false">
                             全年報名 </button>
+                        <button class="nav-link" id="sec2-tab6" data-bs-toggle="tab" data-bs-target="#sec2-page6"
+                        type="button" role="tab" aria-controls="profile" aria-selected="false">
+                            牌位範本 </button>
                     </div>
                 </nav>
             </div>
@@ -2488,6 +2496,14 @@
                         </v-card>
 
                     </div>
+                    <div class="tab-pane fade" id="sec2-page6" role="tabpanel" aria-labelledby="sec2-tab6" >
+                         <v-card class="mx-auto" outlined v-if="follower_id!=''">
+                              <keep-alive>
+                                  <component :is="currentView" >
+                                  </component>
+                               </keep-alive>  
+                         </v-card>
+                    </div>
                 </div>
                 
             </asp:Panel>

web/admin/order/reg.aspx

@@ -1894,7 +1894,7 @@
                             const data = typeof f_num_tablet === 'string' 
                                 ? JSON.parse(f_num_tablet) 
                                 : f_num_tablet;
-    
+                            console.log("data:",data);
                             // 格式化函數
                             const formatItems = (items) => {
                                 if (!items || !Array.isArray(items)) return '';
@@ -1907,7 +1907,9 @@
     
                             return {
                                 mid: formatItems(data.mid_items),
-                                left: formatItems(data.left_items)
+                                left: formatItems(data.left_items),
+                                mid_left: formatItems(data.mid_left),
+                                mid_right: formatItems(data.mid_right)
                             };
                         } catch (e) {
                             console.error('Error in getTabletText:', e);
@@ -2172,6 +2174,14 @@
                                         <span class="badge rounded-pill bg-secondary">陽上</span>
                                         <span v-html="getTabletText(item.f_num_tablet).left"></span>
                                     </div>
+                                    <div v-if="getTabletText(item.f_num_tablet).mid_left">
+                                        <span class="badge rounded-pill bg-secondary">左正名</span>
+                                        <span v-html="getTabletText(item.f_num_tablet).mid_left"></span>
+                                    </div>
+                                    <div v-if="getTabletText(item.f_num_tablet).mid_right">
+                                        <span class="badge rounded-pill bg-secondary">右正名</span>
+                                        <span v-html="getTabletText(item.f_num_tablet).mid_right"></span>
+                                    </div>
                                     <div class="d-none">
                                         {{item.f_num_tablet}}
                                     </div>

web/admin/pivot/query.aspx

@@ -102,14 +102,14 @@
                         <v-icon left>mdi-currency-usd</v-icon>
                         收入統計
                     </v-tab>
-                    <v-tab :disabled="!hasData">
+                <%--    <v-tab :disabled="!hasData">
                         <v-icon left>mdi-chart-line</v-icon>
                         趨勢分析
                     </v-tab>
                     <v-tab :disabled="!hasData">
                         <v-icon left>mdi-compare</v-icon>
                         對比分析
-                    </v-tab>
+                    </v-tab>--%>
                 </v-tabs>
 
                 <!-- 頁籤內容 -->

web/admin/print/tablet_edit/editorNewOne.html

@@ -187,7 +187,7 @@
     </div>
     <script type="text/javascript">
         const designer = {
-            zoomScale:1,
+            zoomScale:0.5,
             code: {
                 style: []
             },
@@ -1498,223 +1498,158 @@
                 return txt;
             },
             renderNameList(names, d, newFontSize, style, colWidth) {
-                let self = this;
+                let h = parseFloat(d.height);
-                let h = Number(d.height);
+                let w = parseFloat(d.width);
-                let w = Number(d.width);
+                let th = parseFloat(d.textHeight) || h;
-                let th = Number(d.textHeight) || h;
+                let v_gap = parseFloat(d.textSpan) || 0;
-                let gap = 5; // 對應 span 的 margin-left
+                let h_gap = 5;
 
-                let s = Number(d.fontSize);
+                let shrinkLimit = 6;
-                let sizes = [];
+                if (h < 500) {
-
+                    shrinkLimit = 8;
-                // 1. 模擬排版：找出能讓全體塞入的最佳字體組合
+                } else if (h < 300) {
-                while (s >= 12) {
+                    shrinkLimit = 12;
-                    let short_s_px = s * 1.333;
-                    let hasShort = names.some(n => (n.length * short_s_px) <= th);
-
-                    let long_s = hasShort? Math.floor(s * 0.75):s; // 長字體最多縮小 25%
-                    if (long_s < 12) long_s = 12;
-                    let long_s_px = long_s * 1.333;
-
-                    let currentColHeight = 0;
-                    let totalWidth = 0;
-                    let tempSizes = [];
-                    let anyWrapped = false;
-                    for (let i = 0; i < names.length; i++) {
-                        let name = names[i];
-                        let l = name.length;
-                        //let isMulti = (l * short_s_px) > th;
-                        let isShort = (l * short_s_px) <= th;
-                        let size = isShort ? s : long_s;//isMulti ? long_s : s;
-                        let size_px = size * 1.333; //isMulti ? long_s_px : short_s_px;
-
-                        let isMulti = !isShort && (l * size_px >= h);
-                        if (isMulti) anyWrapped = true;
-
-                        tempSizes.push({ name: name, size: size, isMulti: isMulti, isShort: isShort });
-
-                        if (isMulti) {
-                            // 多行長名
-                            let charsPerCol = Math.floor(h / size_px);
-                            if (charsPerCol < 1) charsPerCol = 1;
-                            let lines = Math.ceil(l / charsPerCol);
-                            let nameW = lines * (size_px * 1.1); // 1.1倍行距
-
-                            if (currentColHeight > 0) currentColHeight = 0;
-                            totalWidth += nameW + gap;
-                        } else {
-                            if (isShort) {
-                                // 單行短名
-                                if (currentColHeight > 0 && (currentColHeight + th + gap) <= h) {
-                                    currentColHeight += th + gap;
-                                } else {
-                                    currentColHeight = th;
-                                    totalWidth += short_s_px + gap;
-                                }
-                            } else {
-                                currentColHeight = 0;
-                                totalWidth += size_px + gap;
-                            }
-                        }
-                    }
-
-                    if (totalWidth > 0) totalWidth -= gap;
-
-                    // 總寬度未爆框，確定最佳組合
-                    if (totalWidth <= w) {
-                        if (hasShort) {
-                            sizes = tempSizes;
-                            break;
-                        } else {
-                            if (!anyWrapped || s === 12) {
-                                sizes = tempSizes;
-                                break;
-                            }
-                        }
-                      
-                    }
-                    s -= 1;
                 }
 
-                // 處理極端情況
+                let long_s = parseFloat(d.fontSize);
-                if (sizes.length === 0) {
+                let short_s = parseFloat(d.fontSize);
-                    sizes = names.map(name => {
+
-                        return { name: name, size: 12, isMulti: (name.length * 12 * 1.333) > th };
+                if (names.length == 1 && names[0].includes("暨無始劫以來累世冤親債主")) {
-                    });
+                    names = names[0].split("暨");
+                    names[0] = names[0] + "暨";
                 }
-                let $namelist = $(`<div class='nameList'></div>`).css({
+
-                    "writing-mode": "vertical-rl",
+                // 1. 固定的長短名判斷
-                    display: "flex",
+                let items = names.map(name => {
-                    "flex-direction": "row",
+                    let l = name.length;
-                    "flex-wrap": "wrap",
+                    let isShort = (names.length > 1) && ((l * 40) <= (th + (v_gap / 2)));
-                    "align-content": "center",
+                    return { name: name, l: l, isShort: isShort, isMulti: false, size: 0 };
-                    "align-items": "center", // 確保元素靠上對齊
-                    margin: "auto",
-                    width: `${d.width}px`,
-                    height: `${d.height}px`,
-                    border: "0px solid #ccc",
-                    padding: "1px",
-                    "column-gap": `${d.textSpan}px`,
-                    "font-family": d.fontFamily
                 });
 
-                sizes.forEach(item => {
+                // 🌟 剔除「幽靈扣血」區間：直接從真實極限起跑
-                    let th = Number(d.textHeight) || Number(d.height)
+                //let max_short_effective = shrinkLimit;
-                    //let minH = item.isMulti ? `${d.height}px` : `${d.textHeight}px`;
+                //let min_long_limit = parseFloat(d.fontSize);
-                    let minH = item.isShort ? `${th}px` : `${d.height}px`
-                        ;
-                    let alignStyle = item.isMulti ? "start" : "justify";
 
-                    let $span= $(`<span style="font-size: ${item.size}pt;">${item.name}</span>`).css({
+                //items.forEach(item => {
-                        display: "block",
+                //    if (item.isShort) {
-                        "min-height": minH, // 強制多行長名撐滿高度，避免其他名字墊底
+                //        let max_s_for_th = Math.floor(th / (item.l * 1.333));
-                        "max-height": `${d.height}px`,
+                //        if (max_s_for_th > max_short_effective) max_short_effective = max_s_for_th;
-                        width: "auto",
+                //    } else {
-                        "line-height": "1.1",
+                //        let max_s_for_h = Math.floor((h - 10) / (item.l * 1.333));
-                        "text-align": alignStyle,
+                //        if (max_s_for_h < min_long_limit) min_long_limit = max_s_for_h;
-                        "text-align-last": alignStyle,
+                //    }
-                        "margin-left": "5px",
-                        "text-justify": "inter-character",
-                        "word-break": "break-all"
-                    });
-                    $namelist.append($span);
-                })
-                //let $namelist = $(`<div class='nameList'></div>`).css({
-                //    "writing-mode": "vertical rl",
-                //    display: "flex",
-                //    "flex-direction": "row",
-                //    "flex-wrap": "wrap",
-                //    margin: "auto",
-                //    width: `${d.width}px`,
-                //    height: `${d.height}px`,
-                //    border: "0px solid #ccc",
-                //    padding: "1px",
-                //    "font-family": style.fontFamily,
-                //    //"letter-spacing": "0.1em",
-                //    "column-gap": `${d.textSpan}px`,
-                //    //"row-gap": "1px",
-                //    "align-items": "center",
-                //    "justify-content": "start",
                 //});
 
-                //mid.forEach(z => {
+                //if (short_s > max_short_effective) short_s = max_short_effective;
-                //    //let info = self.getTextInfo(z, newFontSize);
+                //if (long_s > min_long_limit) long_s = min_long_limit;
-                //    //let spanWidth = mid.length > 1 ? newFontSize : d.width
-                //    //let height = d.textHeight;
-                //    //if (info.width >= d.textHeight) {
-                //    //    height = d.height;
-                //    //}
-                //    //let $span = $(`<span class="nameSpan">${z}</span>`).css({
-                //    //    display: "block",
-                //    //    "min-height": `${height}px`,
-                //    //    "max-height": `${d.height}px`,
-                //    //    "max-width": `${rowWidth}px`,
-                //    //    //width: `${newFontSize}px`,
-                //    //    "text-align": "justify",
-                //    //    "text-align-last": "justify",
-                //    //    //"margin-bottom": "20px",
-                //    //    "margin-left": "5px",
-                //    //    "text-justify": "inter-character",
-                //    //    "white-space": "pre-line",
-                //    //    //"justify-content":"center"
-                //    //});
-                //    // 為「這個名字」獨立計算出專屬的最完美字體大小
-                //    let indSize = this.calcIndividualFontSize(z, d, colWidth);
-                //    // 2. 判斷是否發生了折行 (名字長度 * 單字像素高度 > 分配到的最大高度)
-                //    let s_px = indSize * 1.333;
-                //    let isMultiLine = (z.length * s_px) > Number(d.textHeight);
 
-                //    // 3. 根據是否折行動態決定對齊方式
+                let sizes = [];
-                //    // 單行：分散對齊 (justify) / 多行：置中對齊 (center) 或是改為 靠上對齊 (start)
+                let shrink_turn = 'long';
-                //    let alignStyle = isMultiLine ? "start" : "justify";
-                //    let $span = $(`<span style="font-size: ${indSize}pt;">${z}</span>`).css({
-                //        display: "block",
-                //        "min-height": `${d.textHeight}px`,
-                //        "max-height": `${d.height}px`,
-                //        width: "auto",
-                //        "line-height": "1.1",
-                //        "text-align": alignStyle,             // ★ 動態套用對齊方式
-                //        "text-align-last": alignStyle,        // ★ 動態套用最後一行對齊方式
-                //        "margin-left": "5px",
-                //        "text-justify": "inter-character",
-                //        "word-break": "break-all"
-                //    });
-                //    $namelist.append($span);
-                //});
-                return $namelist;
-            },
-            renderLiveList(names, el) {
-                let h = Number(el.height);
-                let w = Number(el.width);
-                let th = Number(el.textHeight) || h;
 
-                // 1. 單純計算總共有幾行 (列)
+                while (true) {
-                let namesPerCol = Math.floor(h / th);
+                    let totalWidth = 0;
-                if (namesPerCol < 1) namesPerCol = 1;
+                    let current_col_h = 0;
+                    let current_col_w = 0;
+                    let cols_width = [];
+                    let any_wrapped = false;
 
-                let cols = Math.ceil(names.length / namesPerCol); // 總行數
+                    for (let i = 0; i < items.length; i++) {
+                        let item = items[i];
+                        let s = item.isShort ? short_s : long_s;
 
-                // 2. 根據行數，縮小字體直到總寬度放得下
+                        if (item.isShort) {
-                let s = Number(el.fontSize);
+                            let max_s_for_th = Math.floor(th / (item.l * 1.333));
-                while (s >= 4) {
+                            if (s > max_s_for_th) s = max_s_for_th;
-                    let s_px = s * (4 / 3); // pt 轉 px
+                        }
-                    let lh = 1.1;           // 行高
-                    let gap = 0;            // 對應 span 的 margin-left
 
-                    // 總寬度 = 總行數 * (單行像素寬度 + 間距)
+                        item.size = s;
-                    let totalWidth = cols * (s_px * lh + gap);
+                        let size_px = s * 1.333;
 
-                    // 放得下就停止縮小
+                        if (item.isShort) {
-                    if (totalWidth <= w) {
+                            let item_h = Math.max(th, item.l * size_px);
+                            if (current_col_h === 0) {
+                                current_col_h = item_h;
+                                current_col_w = size_px;
+                            } else if ((current_col_h + v_gap + item_h) <= h) {
+                                current_col_h += (v_gap + item_h);
+                                if (size_px > current_col_w) current_col_w = size_px;
+                            } else {
+                                cols_width.push(current_col_w);
+                                current_col_h = item_h;
+                                current_col_w = size_px;
+                            }
+                        } else {
+                            if (current_col_h > 0) {
+                                cols_width.push(current_col_w);
+                                current_col_h = 0;
+                                current_col_w = 0;
+                            }
+
+                            let item_w = size_px;
+                            if ((item.l * size_px) > (h - 10)) {
+                                item.isMulti = true;
+                                any_wrapped = true;
+                                let chars_per_col = Math.floor((h - 10) / size_px);
+                                if (chars_per_col < 1) chars_per_col = 1;
+                                let item_cols = Math.ceil(item.l / chars_per_col);
+                                item_w = item_cols * (size_px * 1.1);
+                            } else {
+                                item.isMulti = false;
+                            }
+
+                            cols_width.push(item_w);
+                        }
+                    }
+
+                    if (current_col_h > 0) cols_width.push(current_col_w);
+
+                    totalWidth = cols_width.reduce((a, b) => a + b, 0) + (cols_width.length > 1 ? (cols_width.length - 1) * h_gap : 0);
+
+                    if (totalWidth <= w && (!any_wrapped || long_s === shrinkLimit)) {
+                        sizes = items.map(x => {
+                            let final_s = x.size;
+                            if (x.isShort) {
+                                let max_s_for_th = Math.floor(th / (x.l * 1.333));
+                                if (final_s > max_s_for_th) final_s = max_s_for_th;
+                            }
+                            return { name: x.name, size: final_s, isMulti: x.isMulti, isShort: x.isShort };
+                        });
                         break;
                     }
-                    s -= 1;
+
+                    if (any_wrapped && long_s > shrinkLimit) {
+                        long_s--;
+                    } else {
+                        let hasLong = items.some(x => !x.isShort);
+                        let hasShort = items.some(x => x.isShort);
+
+                        if (hasLong && hasShort) {
+                            if (shrink_turn === 'long') {
+                                if (long_s > shrinkLimit) { long_s--; shrink_turn = 'short'; }
+                                else if (short_s > shrinkLimit) { short_s--; shrink_turn = 'long'; }
+                                else break;
+                            } else {
+                                if (short_s > shrinkLimit) { short_s--; shrink_turn = 'long'; }
+                                else if (long_s > shrinkLimit) { long_s--; shrink_turn = 'short'; }
+                                else break;
+                            }
+                        } else if (hasLong) {
+                            if (long_s > shrinkLimit) long_s--;
+                            else break;
+                        } else {
+                            if (short_s > shrinkLimit) short_s--;
+                            else break;
+                        }
+                    }
                 }
 
-                if (s < 4) s = 4;
+                if (sizes.length === 0) {
+                    sizes = names.map(name => {
+                        return { name: name, size: shrinkLimit, isMulti: false, isShort: true };
+                    });
+                }
 
-                // 3. 建立外層 Flexbox 容器
+                let $namelist = $(`<div class='nameList'></div>`).css({
-                let $namelist = $(`<div class='liveList'></div>`).css({
                     "writing-mode": "vertical-rl",
                     display: "flex",
                     "flex-direction": "row",
@@ -1724,66 +1659,139 @@
                     margin: "auto",
                     width: `${w}px`,
                     height: `${h}px`,
-                    border: "0px solid #ccc",
+                    border: "0px solid transparent",
-                    padding: "0px",
+                    padding: "1px",
+                    "column-gap": `${v_gap}px`,
+                    "font-family": d.fontFamily
+                });
+
+                sizes.forEach(item => {
+                    let minH = item.isShort ? `${th}px` : `${h}px`;
+                    let alignStyle = item.isMulti || (!item.isMulti && !item.isShort) ? "start" : "justify";
+
+                    let $span = $(`<span style="font-size: ${item.size}pt;">${item.name}</span>`).css({
+                        display: "block",
+                        "min-height": minH,
+                        "max-height": `${h}px`,
+                        width: "auto",
+                        "line-height": "1.1",
+                        "text-align": alignStyle,
+                        "text-align-last": alignStyle,
+                        "margin-left": "5px",
+                        "text-justify": "inter-character",
+                        "word-break": "break-all"
+                    });
+                    $namelist.append($span);
+                });
+
+                return $namelist;
+            },
+
+            renderLiveList(names, el) {
+                let h = parseFloat(el.height);
+                let w = parseFloat(el.width);
+                let th = parseFloat(el.textHeight) || h;
+
+                let v_gap = parseFloat(el.textSpan) || 0;
+                let h_gap = 5;
+
+                let shrinkLimit = 4;
+                if (h < 300) {
+                    shrinkLimit = 8;
+                } else if (h < 500) {
+                    shrinkLimit = 6;
+                }
+
+                let s = parseFloat(el.fontSize);
+
+                while (s >= shrinkLimit) {
+                    let size_px = s * 1.333;
+                    let current_col_h = 0;
+                    let current_col_w = 0;
+                    let cols_width = [];
+                    let any_wrapped = false;
+
+                    for (let i = 0; i < names.length; i++) {
+                        let l = names[i].length;
+                        let item_h = Math.max(th, l * size_px);
+
+                        if (item_h > (h - 5)) {
+                            any_wrapped = true;
+                            if (current_col_h > 0) {
+                                cols_width.push(current_col_w);
+                                current_col_h = 0;
+                                current_col_w = 0;
+                            }
+                            let chars_per_col = Math.floor((h - 5) / size_px);
+                            if (chars_per_col < 1) chars_per_col = 1;
+                            let item_cols = Math.ceil(l / chars_per_col);
+                            cols_width.push(item_cols * (size_px * 1.1));
+                        } else {
+                            if (current_col_h === 0) {
+                                current_col_h = item_h;
+                                current_col_w = size_px;
+                            } else if (current_col_h + v_gap + item_h <= h) {
+                                current_col_h += v_gap + item_h;
+                                if (size_px > current_col_w) current_col_w = size_px;
+                            } else {
+                                cols_width.push(current_col_w);
+                                current_col_h = item_h;
+                                current_col_w = size_px;
+                            }
+                        }
+                    }
+
+                    if (current_col_h > 0) cols_width.push(current_col_w);
+
+                    let totalWidth = cols_width.reduce((a, b) => a + b, 0) + (cols_width.length > 1 ? (cols_width.length - 1) * h_gap : 0);
+
+                    if (totalWidth <= w && (!any_wrapped || s === shrinkLimit)) {
+                        break;
+                    }
+                    s -= 1;
+                }
+
+                if (s < shrinkLimit) s = shrinkLimit;
+
+                let $namelist = $(`<div class='liveList'></div>`).css({
+                    "writing-mode": "vertical-rl",
+                    "display": "flex",
+                    "flex-flow": "wrap",
+                    "align-content": "center",
+                    "align-items": "center",
+                    "margin": "auto",
+                    "width": `${w}px`,
+                    "height": `${h}px`,
+                    "border": "0px solid transparent",
+                    "padding": "0px",
                     "font-family": el.fontFamily,
-                    "column-gap": `${el.textSpan}px`,
+                    "column-gap": `${v_gap}px`
                 });
 
                 let self = this;
                 names.forEach(name => {
                     $namelist.append(self.renderLiveSpan(name, el, s));
                 });
-                //let $namelist = $(`<div class='liveList'></div>`).css({
+
-                //    "writing-mode": "vertical rl",
-                //    display: "flex",
-                //    "flex-direction": "row",
-                //    "flex-wrap": "wrap",
-                //    margin: "auto",
-                //    width: `${el.width}px`,
-                //    height: `${el.height}px`,
-                //    border: "0px solid #ccc",
-                //    padding: "1px",
-                //    "font-family": el.fontFamily,
-                //    //"letter-spacing": "0.1em",
-                //    "column-gap": `${el.textSpan}px`,
-                //    //"row-gap": "1px",
-                //    "align-items": "center",
-                //});
-                //let self = this;
-                //names.forEach(n => {
-                //    $namelist.append(self.renderLiveSpan(n, el,rowWidth))
-                //})
                 return $namelist;
             },
+
             renderLiveSpan(name, el, fontSize) {
-                let th = Number(el.textHeight) || Number(el.height);
+                let h = parseFloat(el.height);
+                let th = parseFloat(el.textHeight) || h;
 
                 return $(`<span style="font-size: ${fontSize}pt;">${name}</span>`).css({
-                    display: "block",
+                    "display": "block",
-                    "min-height": `${th}px`, // ★ 固定分配高度，交給 Flexbox 自動排版
+                    "min-height": `${th}px`,
-                    "max-height": `${el.height}px`,
+                    "max-height": `${h}px`,
-                    width: `${fontSize * 1.33}`,
+                    "width": "auto",
-                    //"line-height": "1.1",
+                    "text-align": "justify",
-                    "text-align": "justify", // 統一分散對齊
                     "text-align-last": "justify",
-                    //"margin-left": "5px",
+                    "margin-left": "0px",
                     "text-justify": "inter-character",
                     "word-break": "break-all",
                     "white-space": "pre-line"
                 });
-                //return $(`<span class="liveSpan">${name}</span>`).css({
-                //    display: "block",
-                //    "min-height": `${el.textHeight}px`,
-                //    "max-height": `${el.height}px`,
-                //    width: `${colWidth}px`,
-                //    height: `${el.textHeight}px`,
-                //    "text-align": "justify",
-                //    "text-align-last": "justify",
-                //    //"margin-bottom": "10px",
-                //    "text-justify": "inter-character",
-                //    "white-space": "pre-line"
-                //});
             },
             // 品字佈局邏輯：一上二下
             renderRoster(names, el) {