{"Message":"新增客户管理\r\n优化项目页面","MessageType":2,"Modules":[{"State":1,"Type":7,"Name":"Table/客户表"},{"State":1,"Type":7,"Name":"Table/客户部门表"},{"State":1,"Type":1,"Name":"PCPage/任务列表"},{"State":1,"Type":1,"Name":"PCPage/项目列表"},{"State":1,"Type":9,"Name":"Theme"},{"State":1,"Type":12,"Name":"CustomLibrary"},{"State":1,"Type":1,"Name":"PCPage/客户管理"},{"State":1,"Type":1,"Name":"PCPage/客户信息子页面"},{"State":3,"Type":1,"Name":"PCPage/客户详情"},{"State":3,"Type":1,"Name":"PCPage/客户基本信息"},{"State":3,"Type":1,"Name":"PCPage/客户部门管理"}],"Version":"v1"}

.collaboration

@@ -49,29 +49,11 @@
   },
   {
     "ModuleName": "Table/客户表",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T20:10:41.138514+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\客户\\客户表.json"
-    ]
   },
   {
     "ModuleName": "Table/客户部门表",
-    "State": 1,
+    "ModuleType": 7
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T20:16:03.6820595+08:00",
-    "ModuleType": 7,
-    "ToRemoveFiles": [
-      "Tables\\客户\\客户部门表.json"
-    ]
   },
   {
     "ModuleName": "Tables/工时",
@@ -484,17 +466,7 @@
   },
   {
     "ModuleName": "PCPage/任务列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T21:20:09.1340335+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.json",
-      "Pages\\项目\\项目首页\\项目首页-容器页面\\任务列表.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目工时",
@@ -530,21 +502,7 @@
   },
   {
     "ModuleName": "PCPage/项目列表",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T21:09:41.005111+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\项目\\项目列表.json",
-      "Pages\\项目\\项目列表.rd",
-      "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.json",
-      "Pages\\8ee6eff0b74d43ef8e54cd3ef782f76.rd",
-      "Pages\\b90932e038f94707b54e571ff7cd84d.json",
-      "Pages\\b90932e038f94707b54e571ff7cd84d.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/项目审批",
@@ -644,20 +602,7 @@
   },
   {
     "ModuleName": "Theme",
-    "State": 1,
+    "ModuleType": 9
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T20:20:02.046323+08:00",
-    "ModuleType": 9,
-    "ToRemoveFiles": [
-      "Theme\\CellTypeStyles",
-      "Theme\\ListViewStyles",
-      "Theme\\StyleDefaultNames",
-      "Theme\\ThemeConfig",
-      "Reports\\DefaultTheme.rdlx-theme"
-    ]
   },
   {
     "ModuleName": "image/内置图片",
@@ -829,19 +774,7 @@
   },
   {
     "ModuleName": "CustomLibrary",
-    "State": 1,
+    "ModuleType": 12
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T20:31:33.3718566+08:00",
-    "ModuleType": 12,
-    "ToRemoveFiles": [
-      "CustomLibraries.json",
-      "UserFile\\BaseCss.css",
-      "UserFile\\CustomFormula.js",
-      "UserFile\\echart.js"
-    ]
   },
   {
     "ModuleName": "MapJsonFile",
@@ -1176,60 +1109,22 @@
   },
   {
     "ModuleName": "PCPage/客户管理",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T20:17:20.1849876+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\客户\\客户管理.json",
-      "Pages\\客户\\客户管理.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/客户信息子页面",
-    "State": 1,
+    "ModuleType": 1
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T20:16:03.6821887+08:00",
-    "ModuleType": 1,
-    "ToRemoveFiles": [
-      "Pages\\客户\\客户信息子页面.json",
-      "Pages\\客户\\客户信息子页面.rd"
-    ]
   },
   {
     "ModuleName": "PCPage/客户详情",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T20:18:06.0933496+08:00",
     "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/客户基本信息",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T20:19:29.3428416+08:00",
     "ModuleType": 1
   },
   {
     "ModuleName": "PCPage/客户部门管理",
-    "State": 3,
-    "LockedBy": {
-      "UserName": "SHAMUSPC\\NINGMEI",
-      "Email": "phoben@qq.com"
-    },
-    "LockDateTime": "2024-03-27T20:23:09.060754+08:00",
     "ModuleType": 1
   }
 ]

Pages/8ee6eff0b74d43ef8e54cd3ef782f76.json

@@ -22,9 +22,14 @@
   },
   "Cols": {
     "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 5.0
+        }
+      },
       "1": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 142.0,
+          "DesignLengthInPixel": 131.0,
           "Mode": 2,
           "MinLength": {
             "Unit": 1
@@ -33,9 +38,15 @@
             "Value": 1.0
           }
         }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 5.0
+        }
       }
     },
-    "Count": 3
+    "Count": 3,
+    "DefaultSize": 5.0
   },
   "Values": {
     "1,1": "#分组名称"
@@ -75,4 +86,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//ocmrPAJr/ydylqWNLkvzAxkXeC66CO23xdSQLLbW0PzVEzDpCygHbs9/gIK+xQ1fHtsfp/Mf43u845RD2dX5hzhVuNXx3mfavWInSVOwqubXDCWWlbtuKriXeJ8hjw84GE+G94VRKoksm5LL+5c22FmwTjPTybGE3i7Tn21PEZNuQ8YsZCCwLyT2u9KqUMcx9ef3MvN13lkUtWh0pfJPGOYLidAh1te8NlxlnbjxEYrW5Gj02ZI/e07IrxgqDtnaC2rAkA9WIVFSpjTaWg2ROLh4gnvrHjp02buHfEP5pz2bKauKkD+h5NlP1oGIrLapgfpGV/kE/EC70syvpVCtC/RznYAnJJXAC66PE151uNHBQH1S0N7hFgSRBsTAhchxgPeMAA7La7O/DcZMs59exMTPVLGCyQNbTthLiIOklhET51emwEuB4sCLecKJcrAw4xxtMt3gki49VUkNKB0g2qsM0GI6k+T3LnD3feQM2NEhSJSN5Omkp70q90lhv2WdnT4gefqBcXWddyYPApEDJxwDRPtten3yIY+S9tyb6vA3xY5CR/fRkxGrkdB+I1oWriC41rMMFctsO+fk/xwd0U/Gf0bLHCZTo96ztdGy6eoUAwdvICbp/pCBVTf8iG+EjNug6fSh8qpUWfTdF2Od1+LUQlHJHBDB7H8ubw/qU1g7bnZyMaM6nG118FRj3m3UuE0JxHVJXiUdWsNzHcYKrZ0voZyttUEl+ORxT5ylLDzBAMnZj9nCFjS6jLny7QrJsy8Nmp5jM2cjSQceweOynhuVk5Ld85wKt6andzsBjCwN4UceqcjcIHFsvqvL5yX8sUm8pi/AXSFO7/sl5zvxwpOcCOw8DU6RUBo2f+3FnIsV0yW2ETAMZlFxj/rhK3pS7prwdD4dVQyen6yHtc/zZQ==|920
+}//Elqgx9ZcZcsgFFScqNtKHQLoMoxyrjEQJsUZIOSR+DqwhjsXE7gDS2hxzZapxa9aP038n70/hDOMRborlBc7m1RVcCVjBke0FnwQBkB1LZYM01IpbzQN+dcRnoJ5FYHdeAzlbyalKPj7HUIB8i6ktuMU0V6kKlNxinH1RB0Ul5DHrgA+c5J34qztwaENW7ctD9WigTmfzRXht4rALzLVmbO14yvnIICbesG7cJ7s4Jmig80rEl0xFrd8uqmRgdJ35OyjpCsA2VfwCNCiVRZHcbebKofTPtNiHBPxhk0iC1N0cz2FwSP7/si2eIh/hqWKu114vb9EvJrHKr3T3u5NU0QEKrbqVZmj+DQt2WIBNoI6s+FcxAssaNN26DTgC9neG7DS7iHtbyrf3+6tE+diI64SoSu2KpRkw2apr7f3V/FLD2IH4J7+n4kHx6IeV06c3+xf87oZrcONAPx/Vz7JhmkvoEx4VZVy9XzT9qxezR9v2C9rLb1SkihEp7POHCtpTaf2SM8PgGfDWpJE5NcTY/jhxK7FVcyFjJf4JzNqIVc1trh5otLbdxCDoNWi1Ma2SZgRFbv9N3OxiKxJDNGKfXnctzqrNJ9+pTTYfSmSQ6ZMGmqsAxxpfWSmGnaTj2oDn/TW9s+/q+QUKNr7dOZ0Rj8pfsuV1g6ABCCQEXYk2F0Ost/xSXm6H8MJRaJvREKbTJplBxhsJsEBdXaEMh1lpJK4gp+SMrTEw7Fw9WneceG+RXxwVjKHvWHpWvgghdGgMl7xDDlTb0/6nIuxJPAL8K0x87RvbEf7BaUStru+XNp9lObrrOkC8qC3mUilgxWnbDMItXEmMGfQbxXtF0Rkvn1+juyWAWO0W5fo67YZyP+cdhcRBjzO0qVXoq53MPlI2EX7UCwrtzLBP1k1BwYYgw==|920

Pages/客户/客户信息子页面.json

@@ -1,6 +1,11 @@
 {
   "Rows": {
     "RowColumnAttachedInfos": {
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 29.0
+        }
+      },
       "3": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 24.0
@@ -71,13 +76,54 @@
           "DesignLengthInPixel": 35.0
         }
       },
-      "1": {
+      "24": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 29.0
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "25": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "27": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "28": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "29": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "30": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 224.0,
+          "Mode": 2,
+          "MinLength": {
+            "Value": 200.0,
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          }
+        }
+      },
+      "31": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
         }
       }
     },
-    "Count": 24
+    "InLogicalVisibleIndexes": [
+      32
+    ],
+    "Count": 33
   },
   "Cols": {
     "RowColumnAttachedInfos": {
@@ -149,44 +195,53 @@
   },
   "Values": {
     "1,1": "客户概览",
-    "3,1": "客户税号",
+    "3,1": "客户ID",
-    "6,1": "客户名称",
+    "6,1": "客户税号",
-    "9,1": "客户地址",
+    "9,1": "客户名称",
-    "12,1": "邮箱地址",
+    "12,1": "客户地址",
-    "15,1": "部门经理",
+    "15,1": "邮箱地址",
     "18,1": "部门经理",
-    "21,1": "部门数量"
+    "21,1": "部门经理",
+    "24,1": "项目数量",
+    "27,1": "部门数量"
   },
   "AttachInfos": {
     "4,1": {
+      "BindingInfo": {
+        "TableName": "客户表",
+        "ColumnName": "ID",
+        "GUID": "4c223f15-4643-4c70-a855-deae6880f4ea"
+      }
+    },
+    "7,1": {
       "BindingInfo": {
         "TableName": "客户表",
         "ColumnName": "客户税号",
         "GUID": "ded11e2f-eac6-4a81-bf8e-a2d117980606"
       }
     },
-    "7,1": {
+    "10,1": {
       "BindingInfo": {
         "TableName": "客户表",
         "ColumnName": "客户名称",
         "GUID": "4a948862-ff61-4a40-a74c-95d2be310176"
       }
     },
-    "10,1": {
+    "13,1": {
       "BindingInfo": {
         "TableName": "客户表",
         "ColumnName": "地址",
         "GUID": "d12e0064-1c52-42a4-adde-2a7065b04f61"
       }
     },
-    "13,1": {
+    "16,1": {
       "BindingInfo": {
         "TableName": "客户表",
         "ColumnName": "邮箱",
         "GUID": "bd0148ae-300c-487d-b8f0-5ea5cb098c89"
       }
     },
-    "16,1": {
+    "19,1": {
       "BindingInfo": {
         "TableName": "客户表",
         "ColumnName": "客户经理",
@@ -197,7 +252,7 @@
         }
       }
     },
-    "19,1": {
+    "22,1": {
       "BindingInfo": {
         "TableName": "客户表",
         "ColumnName": "客户经理",
@@ -208,12 +263,86 @@
         }
       }
     },
-    "22,1": {
+    "25,1": {
+      "BindingInfo": {
+        "TableName": "客户表",
+        "ColumnName": "项目数量",
+        "GUID": "c545ea45-9ad1-46b7-ac28-a853aef97d21"
+      }
+    },
+    "28,1": {
       "BindingInfo": {
         "TableName": "客户表",
         "ColumnName": "部门数量",
         "GUID": "bb975579-01e1-4cea-a537-6faabbfaee3c"
       }
+    },
+    "30,1": {
+      "CellType": {
+        "$type": "ElementUI.TableCellType, ElementUI",
+        "ElTableName": "EL表格1",
+        "bindingOptions": {
+          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+          "TableName": "客户部门表",
+          "BindingInfos": [
+            {
+              "BindingInfo": {
+                "TableName": "客户部门表",
+                "ColumnName": "部门名称",
+                "GUID": "77fd6b8e-a09b-43f6-acf1-b2db0f48f665"
+              },
+              "ColumnName": "部门名称"
+            },
+            {
+              "BindingInfo": {
+                "TableName": "客户部门表",
+                "ColumnName": "联系人",
+                "GUID": "531e17e8-0952-492a-856f-8ab0010a4e3f"
+              },
+              "ColumnName": "联系人"
+            },
+            {
+              "BindingInfo": {
+                "TableName": "客户部门表",
+                "ColumnName": "对接人",
+                "GUID": "e0708051-8133-4270-be1b-404a423c3ab9"
+              },
+              "ColumnName": "对接人"
+            }
+          ],
+          "SqlCondition": {
+            "$type": "ForguncyDataAccess.GeneralCESqlCondition, ForguncyDataAccess",
+            "ColumnBindingInfo": {
+              "TableName": "客户部门表",
+              "ColumnName": "客户ID",
+              "GUID": "29c8a1fd-9323-43c6-95c0-81355d15f204"
+            },
+            "Value": {
+              "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+              "SerializeProperty": "=客户信息子页面!B5"
+            }
+          },
+          "CustomColumns": []
+        },
+        "columns": [],
+        "actionButtons": [
+          {
+            "$type": "ElementUI.ActionButton, ElementUI",
+            "type": "button",
+            "Name": "编辑",
+            "shape": "default"
+          },
+          {
+            "$type": "ElementUI.ActionButton, ElementUI",
+            "type": "button",
+            "Name": "删除",
+            "styleType": "Accent 5",
+            "shape": "default"
+          }
+        ],
+        "sumText": "合计",
+        "size": "default"
+      }
     }
   },
   "StyleDatas": {
@@ -223,216 +352,290 @@
         "Foreground": 0
       },
       {
-        "Foreground": 1
+        "FontFamily": 1,
-      },
-      {
-        "FontFamily": 2,
-        "FontSize": 13.333333333333332,
-        "Foreground": 1
-      },
-      {
-        "FontSize": 14.666666666666666
-      },
-      {
-        "FontFamily": 2,
         "FontSize": 13.333333333333332
       },
       {
-        "FontFamily": 2,
+        "FontFamily": 1,
         "FontSize": 13.333333333333332,
-        "Foreground": 1,
+        "Foreground": 2
-        "Formatter": 3
       },
       {
-        "FontFamily": 2,
+        "FontFamily": 1,
         "FontSize": 14.666666666666666
+      },
+      {
+        "Foreground": 2
+      },
+      {
+        "FontSize": 14.666666666666666
+      },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332,
+        "Foreground": 2,
+        "Formatter": 3
       }
     ],
     "Types": {
       "Strs": [
         "black",
-        "Text 1 50",
         "Body",
+        "Text 1 50",
         "[AUTO]General"
       ]
     },
     "CellStyles": {
       "1,1": 0,
-      "3,1": 1,
+      "3,0": 1,
+      "3,1": 2,
+      "3,2": 1,
+      "3,3": 1,
+      "3,4": 1,
+      "3,5": 1,
+      "3,6": 1,
+      "3,7": 1,
+      "3,8": 1,
       "3,9": 2,
+      "3,10": 1,
+      "4,0": 1,
       "4,1": 3,
-      "5,0": 4,
+      "4,10": 1,
-      "5,1": 4,
+      "6,1": 4,
-      "5,2": 4,
+      "6,9": 2,
-      "5,3": 4,
+      "7,1": 5,
-      "5,4": 4,
+      "8,0": 1,
-      "5,5": 4,
+      "8,1": 1,
-      "5,6": 4,
+      "8,2": 1,
-      "5,7": 4,
+      "8,3": 1,
-      "5,8": 4,
+      "8,4": 1,
-      "5,9": 4,
+      "8,5": 1,
-      "5,10": 4,
+      "8,6": 1,
-      "6,0": 4,
+      "8,7": 1,
-      "6,1": 5,
+      "8,8": 1,
-      "6,2": 4,
+      "8,9": 1,
-      "6,3": 4,
+      "8,10": 1,
-      "6,4": 4,
+      "9,0": 1,
-      "6,5": 4,
+      "9,1": 6,
-      "6,6": 4,
+      "9,2": 1,
-      "6,7": 4,
+      "9,3": 1,
-      "6,8": 4,
+      "9,4": 1,
-      "6,9": 5,
+      "9,5": 1,
-      "6,10": 4,
+      "9,6": 1,
-      "7,0": 4,
+      "9,7": 1,
-      "7,1": 6,
+      "9,8": 1,
-      "7,10": 4,
+      "9,9": 6,
-      "8,0": 4,
+      "9,10": 1,
-      "8,1": 4,
+      "10,0": 1,
-      "8,2": 4,
+      "10,1": 3,
-      "8,3": 4,
+      "10,10": 1,
-      "8,4": 4,
+      "11,0": 1,
-      "8,5": 4,
+      "11,1": 1,
-      "8,6": 4,
+      "11,2": 1,
-      "8,7": 4,
+      "11,3": 1,
-      "8,8": 4,
+      "11,4": 1,
-      "8,9": 4,
+      "11,5": 1,
-      "8,10": 4,
+      "11,6": 1,
-      "9,0": 4,
+      "11,7": 1,
-      "9,1": 2,
+      "11,8": 1,
-      "9,2": 4,
+      "11,9": 1,
-      "9,3": 4,
+      "11,10": 1,
-      "9,4": 4,
+      "12,0": 1,
-      "9,5": 4,
+      "12,1": 2,
-      "9,6": 4,
+      "12,2": 1,
-      "9,7": 4,
+      "12,3": 1,
-      "9,8": 4,
+      "12,4": 1,
-      "9,9": 5,
+      "12,5": 1,
-      "9,10": 4,
+      "12,6": 1,
-      "10,0": 4,
+      "12,7": 1,
-      "10,1": 6,
+      "12,8": 1,
-      "10,10": 4,
+      "12,9": 6,
-      "11,0": 4,
+      "12,10": 1,
-      "11,1": 4,
+      "13,0": 1,
-      "11,2": 4,
+      "13,1": 3,
-      "11,3": 4,
+      "13,10": 1,
-      "11,4": 4,
+      "14,0": 1,
-      "11,5": 4,
+      "14,1": 1,
-      "11,6": 4,
+      "14,2": 1,
-      "11,7": 4,
+      "14,3": 1,
-      "11,8": 4,
+      "14,4": 1,
-      "11,9": 4,
+      "14,5": 1,
-      "11,10": 4,
+      "14,6": 1,
-      "12,0": 4,
+      "14,7": 1,
-      "12,1": 5,
+      "14,8": 1,
-      "12,2": 4,
+      "14,9": 1,
-      "12,3": 4,
+      "14,10": 1,
-      "12,4": 4,
+      "15,0": 1,
-      "12,5": 4,
+      "15,1": 6,
-      "12,6": 4,
+      "15,2": 1,
-      "12,7": 4,
+      "15,3": 1,
-      "12,8": 4,
+      "15,4": 1,
-      "12,9": 5,
+      "15,5": 1,
-      "12,10": 4,
+      "15,6": 1,
-      "13,0": 4,
+      "15,7": 1,
-      "13,1": 6,
+      "15,8": 1,
-      "13,10": 4,
+      "15,9": 6,
-      "14,0": 4,
+      "15,10": 1,
-      "14,1": 4,
+      "16,0": 1,
-      "14,2": 4,
+      "16,1": 3,
-      "14,3": 4,
+      "16,10": 1,
-      "14,4": 4,
+      "17,0": 1,
-      "14,5": 4,
+      "17,1": 1,
-      "14,6": 4,
+      "17,2": 1,
-      "14,7": 4,
+      "17,3": 1,
-      "14,8": 4,
+      "17,4": 1,
-      "14,9": 4,
+      "17,5": 1,
-      "14,10": 4,
+      "17,6": 1,
-      "15,0": 4,
+      "17,7": 1,
-      "15,1": 5,
+      "17,8": 1,
-      "15,2": 4,
+      "17,9": 1,
-      "15,3": 4,
+      "17,10": 1,
-      "15,4": 4,
+      "18,0": 1,
-      "15,5": 4,
+      "18,1": 6,
-      "15,6": 4,
+      "18,2": 1,
-      "15,7": 4,
+      "18,3": 1,
-      "15,8": 4,
+      "18,4": 1,
-      "15,9": 5,
+      "18,5": 1,
-      "15,10": 4,
+      "18,6": 1,
-      "16,0": 4,
+      "18,7": 1,
-      "16,1": 6,
+      "18,8": 1,
-      "16,10": 4,
+      "18,9": 6,
-      "17,0": 4,
+      "18,10": 1,
-      "17,1": 4,
+      "19,0": 1,
-      "17,2": 4,
+      "19,1": 3,
-      "17,3": 4,
+      "19,10": 1,
-      "17,4": 4,
+      "20,0": 1,
-      "17,5": 4,
+      "20,1": 1,
-      "17,6": 4,
+      "20,2": 1,
-      "17,7": 4,
+      "20,3": 1,
-      "17,8": 4,
+      "20,4": 1,
-      "17,9": 4,
+      "20,5": 1,
-      "17,10": 4,
+      "20,6": 1,
-      "18,0": 4,
+      "20,7": 1,
-      "18,1": 5,
+      "20,8": 1,
-      "18,2": 4,
+      "20,9": 1,
-      "18,3": 4,
+      "20,10": 1,
-      "18,4": 4,
+      "21,0": 1,
-      "18,5": 4,
+      "21,1": 6,
-      "18,6": 4,
+      "21,2": 1,
-      "18,7": 4,
+      "21,3": 1,
-      "18,8": 4,
+      "21,4": 1,
-      "18,9": 5,
+      "21,5": 1,
-      "18,10": 4,
+      "21,6": 1,
-      "19,0": 4,
+      "21,7": 1,
-      "19,1": 6,
+      "21,8": 1,
-      "19,2": 4,
+      "21,9": 6,
-      "19,3": 4,
+      "21,10": 1,
-      "19,4": 4,
+      "22,0": 1,
-      "19,5": 4,
+      "22,1": 3,
-      "19,6": 4,
+      "22,2": 1,
-      "19,7": 4,
+      "22,3": 1,
-      "19,8": 4,
+      "22,4": 1,
-      "19,9": 4,
+      "22,5": 1,
-      "19,10": 4,
+      "22,6": 1,
-      "20,0": 4,
+      "22,7": 1,
-      "20,1": 4,
+      "22,8": 1,
-      "20,2": 4,
+      "22,9": 1,
-      "20,3": 4,
+      "22,10": 1,
-      "20,4": 4,
+      "23,0": 1,
-      "20,5": 4,
+      "23,1": 1,
-      "20,6": 4,
+      "23,2": 1,
-      "20,7": 4,
+      "23,3": 1,
-      "20,8": 4,
+      "23,4": 1,
-      "20,9": 4,
+      "23,5": 1,
-      "20,10": 4,
+      "23,6": 1,
-      "21,0": 4,
+      "23,7": 1,
-      "21,1": 5,
+      "23,8": 1,
-      "21,2": 4,
+      "23,9": 1,
-      "21,3": 4,
+      "23,10": 1,
-      "21,4": 4,
+      "24,0": 1,
-      "21,5": 4,
+      "24,1": 6,
-      "21,6": 4,
+      "24,2": 1,
-      "21,7": 4,
+      "24,3": 1,
-      "21,8": 4,
+      "24,4": 1,
-      "21,9": 5,
+      "24,5": 1,
-      "21,10": 4,
+      "24,6": 1,
-      "22,0": 4,
+      "24,7": 1,
-      "22,1": 6,
+      "24,8": 1,
-      "22,10": 4
+      "24,9": 6,
+      "24,10": 1,
+      "25,0": 1,
+      "25,1": 3,
+      "25,2": 1,
+      "25,3": 1,
+      "25,4": 1,
+      "25,5": 1,
+      "25,6": 1,
+      "25,7": 1,
+      "25,8": 1,
+      "25,9": 1,
+      "25,10": 1,
+      "26,0": 1,
+      "26,10": 1,
+      "27,0": 1,
+      "27,1": 6,
+      "27,2": 1,
+      "27,3": 1,
+      "27,4": 1,
+      "27,5": 1,
+      "27,6": 1,
+      "27,7": 1,
+      "27,8": 1,
+      "27,9": 6,
+      "27,10": 1,
+      "28,0": 1,
+      "28,1": 3,
+      "28,2": 1,
+      "28,3": 1,
+      "28,4": 1,
+      "28,5": 1,
+      "28,6": 1,
+      "28,7": 1,
+      "28,8": 1,
+      "28,9": 1,
+      "28,10": 1,
+      "29,0": 1,
+      "29,1": 3,
+      "29,2": 3,
+      "29,3": 3,
+      "29,4": 3,
+      "29,5": 3,
+      "29,6": 3,
+      "29,7": 3,
+      "29,8": 3,
+      "29,9": 3,
+      "29,10": 1,
+      "30,0": 1,
+      "30,1": 3,
+      "30,10": 1,
+      "31,0": 1,
+      "31,1": 3,
+      "31,2": 3,
+      "31,3": 3,
+      "31,4": 3,
+      "31,5": 3,
+      "31,6": 3,
+      "31,7": 3,
+      "31,8": 3,
+      "31,9": 3,
+      "31,10": 1
     },
     "SheetStyle": {
-      "FontFamily": 2,
+      "FontFamily": 1,
       "FontSize": 13.333333333333332
     }
   },
   "Spans": [
-    "10,1,1,9",
     "13,1,1,9",
     "16,1,1,9",
     "19,1,1,9",
+    "10,1,1,9",
     "7,1,1,9",
+    "30,1,1,9",
+    "4,1,1,9",
     "22,1,1,9",
-    "4,1,1,9"
+    "28,1,1,9",
+    "25,1,1,9"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -469,4 +672,4 @@
       "Size": "3,18"
     }
   ]
-}//5iW0hpSb9ul/Dh19JhnNsY8VvY1BPgvBENxZglWQPKbEdayOfHd3o5ZGe2ItcNBkMXj0Dw4ycpyYXNMeRE0pUQsbR5V5iK2E3b4n2sGwsO+zsemycP5YuVCLm/Oi2vvFuj4N7E/Ki4/raMBtAP38cIeGjRfKyTAQc52qnAokrmc8OUHfT1F+VxjW7UhUax4RH3y1XEH+yfXDODQUTTWZ7nnKsaemIBZbVuDPgKgT4H3902KX8ozKj+FcB4l9RumApkP8zilJT+Dt8Nxf8P0X4oDITest2y52uosb7j8UmGa1a/dxFvDzMuogL69UFC+z717mdlBSlogfqWIX8fIdnfgyvboMg9j6OssgpLwYrmj74xWtNjms6AtsT/GmPQo8RVfwU2uLydgjXEx3eC9IJX0S35raFKelN6OnmrKM77K/9qcR7cAlhfdA/CvUGTwZ59A7s0lldbRoUQfxlyKg6mLDA62UcnwZJp/gucCqhx8Cn1Tabrh7Jz9dIuC3APTMtFDb/dvy/SaHmMic8elSWJXtI93yKseemC/eK5+nuwYtIlhE2xZNEAD1bbUbn+mEG/lVQuNdSu2tBv8V1Wl0wgcd6S/dgw5EFNfX7vxOkXDDah3nFEFkhEjrLyCXBSdv5hl31BtDwcLu+u2F7g3w3wAgJU5EoRDnHMDUfygXMF8krpEBzy93Bw8srhLHZlWVKL56gphyFWc1p5gx69mRj7FAT/TIZPVcAjOJO3iIQpP7X8wb/rz8co24dxi6qsD/r3/gzO9Un6FssXybR8udcIAfWIWIA8rh3b1e77O9qNpp1lHjCx9woxuLOYCUmch8X+2+FtI+BbVrrUtR3iy2EofDJLiqzVLUwwup08tZIR/sYxpiQ5osFujG61lpz3hhueEb7PnEuEvd8vibDO7zfA==|920
+}//mf3PSvTzaMqOD0giIyjOWnwsIwsOrd128NLRySC4NVr0ylSb/pKkVMinKK5gaO7uSmITvEinitbmCkzw14ILiIRMqcWaHOXkp9WyEGiBSrpsKQ2qi/llxGaVsx0qXor0QgOjZd6qRyuQ9xDwykdgbfEhQfpZ5tm/4InAyNyjO/vApTaWJRvbYY06TInYXZu4PtP92gssNf/O8kV7Acujm28WNLsYogJNOPbHnCfsS6DCQyrnMm6Dlql4P2Vwi+D97dMbWSrME6QnvsqO1sX7SIg93qrlc1zRIgeFQmDmkyXfyjJzmKzFtj6L6fwjHc+Ii86WIabS0L0A3nFPH2uVZudyvLS6Fa2JfGYJyIbpIjV4zID8UXWJDJOd/wyKK22/CrY/XEY088uFsTlANNUDLo4h/pNwgbZYYouNrvC3lhwBYU/3Pzh41H1GOXIAUWRHsIcizTlcM2qk1vzKpWWl7MfoeJZmfYlGQRDl2pchrTAUYLdJRuUR8NsoIKL2g2AqglDGBv9f3VN7UZtNCbhReFz87q2bXjyFkc+9YaZO8PjnXZg28/+wT25QOz6K9ZDyXkTscfuveLSwp4aZ7lUweklA+IME5VkCLB2ob4n5J+kLOGeSZxbqz0nJXMxvdkWhmJVfscCegddg0nYpsGLnNl4xYCwBDQT5cZka0Pt21jwWNd5pLJIO9IzvVVW7ZGyz0/dhhlhg7h+jmldyszmiA7d2sXqOQX3CGLCvlcZqcj+c7ds74/M3YOraWL2xZQCBRs4+3WtARmMfPGbk1hGCBl4v3pIBYqFLXVbh5stI0nQYh6ZobpFl/zR9BXwD5rLIj6iJWqFty4G+2q9ZTdGdFmuJqadMe5zP5bzkJPS9X84vKwYpflgDAUyTQzH7leLdxicboUI4Rd+7xZ6X1yPt8Q==|920

Pages/客户/客户信息子页面.rd

@@ -1,5 +1,5 @@
 {
   "PageType": 0,
   "ColumnCount": 11,
-  "RowCount": 24
+  "RowCount": 33
 }

Pages/客户/客户基本信息.json

@@ -0,0 +1,632 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "13": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "14": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "15": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      }
+    },
+    "Count": 16,
+    "DefaultSize": 24.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 2,
+          "MinLength": {
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          }
+        }
+      },
+      "13": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "14": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "15": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "16": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "17": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "18": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "20": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "21": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "22": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "23": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "24": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "25": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      }
+    },
+    "Count": 26,
+    "DefaultSize": 32.0
+  },
+  "Values": {
+    "1,1": "客户名称",
+    "4,1": "客户税号",
+    "7,1": "地址",
+    "10,1": "邮箱",
+    "13,1": "客户经理"
+  },
+  "AttachInfos": {
+    "2,1": {
+      "BindingInfo": {
+        "TableName": "客户表",
+        "ColumnName": "客户名称",
+        "GUID": "b80ab0ba-7b84-4306-8999-cc9ddf40f79b"
+      },
+      "CellType": {
+        "$type": "ElementUI.InputCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 4,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "type": "text",
+        "resize": "none"
+      }
+    },
+    "5,1": {
+      "BindingInfo": {
+        "TableName": "客户表",
+        "ColumnName": "客户税号",
+        "GUID": "61cc0102-948e-4c25-87ce-04248dd66bc0"
+      },
+      "CellType": {
+        "$type": "ElementUI.InputCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 4,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "type": "text",
+        "resize": "none"
+      }
+    },
+    "8,1": {
+      "BindingInfo": {
+        "TableName": "客户表",
+        "ColumnName": "邮箱",
+        "GUID": "854cbf5a-5e7f-433b-8d9c-854d208812e4"
+      },
+      "CellType": {
+        "$type": "ElementUI.InputCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 4,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "type": "text",
+        "resize": "none"
+      }
+    },
+    "11,1": {
+      "BindingInfo": {
+        "TableName": "客户表",
+        "ColumnName": "地址",
+        "GUID": "1d7f8e08-293b-43b8-b0d5-563a12cb095a"
+      },
+      "CellType": {
+        "$type": "ElementUI.InputCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 4,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "type": "text",
+        "resize": "none"
+      }
+    },
+    "14,1": {
+      "BindingInfo": {
+        "TableName": "客户表",
+        "ColumnName": "客户名称",
+        "GUID": "6ac7651f-018d-4bb3-b681-36dfde2b94db"
+      },
+      "CellType": {
+        "$type": "ElementUI.SelectCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "useBinding": true,
+        "options": [
+          {
+            "value": "黄金糕",
+            "label": "黄金糕"
+          },
+          {
+            "value": "双皮奶",
+            "label": "双皮奶"
+          },
+          {
+            "value": "蚵仔煎",
+            "label": "蚵仔煎"
+          },
+          {
+            "value": "龙须面",
+            "label": "龙须面"
+          },
+          {
+            "value": "北京烤鸭",
+            "label": "北京烤鸭"
+          }
+        ],
+        "bindingOptions": {
+          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+          "TableName": "用户信息视图",
+          "BindingInfos": [
+            {
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "用户名",
+                "GUID": "b35fd569-ada8-479d-85c0-1ceb3cd0de33"
+              },
+              "ColumnName": "value"
+            },
+            {
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "全名",
+                "GUID": "4002b014-c20e-4e4e-bef5-e87386e9005c"
+              },
+              "ColumnName": "label"
+            }
+          ],
+          "CustomColumns": []
+        },
+        "placeholder": "请选择",
+        "noDataText": "无数据",
+        "filterInServerOptions": {
+          "matchMethod": "contains",
+          "loadingText": "加载中"
+        },
+        "noMatchText": "无匹配数据"
+      }
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontSize": 13.333333333333332,
+        "Foreground": 0
+      },
+      {
+        "FontSize": 13.333333333333332
+      },
+      {
+        "FontFamily": 1
+      },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332,
+        "Foreground": 0
+      },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Text 1 0",
+        "Body"
+      ]
+    },
+    "CellStyles": {
+      "1,1": 0,
+      "2,1": 1,
+      "4,0": 2,
+      "4,1": 3,
+      "4,2": 2,
+      "4,3": 2,
+      "4,4": 2,
+      "4,5": 2,
+      "4,6": 2,
+      "4,7": 2,
+      "4,8": 2,
+      "4,9": 2,
+      "4,10": 2,
+      "4,11": 2,
+      "4,12": 2,
+      "4,13": 2,
+      "4,14": 2,
+      "4,15": 2,
+      "4,16": 2,
+      "4,17": 2,
+      "4,18": 2,
+      "4,19": 2,
+      "4,20": 2,
+      "4,21": 2,
+      "4,22": 2,
+      "4,23": 2,
+      "4,24": 2,
+      "4,25": 2,
+      "5,0": 2,
+      "5,1": 4,
+      "5,25": 2,
+      "7,0": 2,
+      "7,1": 3,
+      "7,2": 2,
+      "7,3": 2,
+      "7,4": 2,
+      "7,5": 2,
+      "7,6": 2,
+      "7,7": 2,
+      "7,8": 2,
+      "7,9": 2,
+      "7,10": 2,
+      "7,11": 2,
+      "7,12": 2,
+      "7,13": 2,
+      "7,14": 2,
+      "7,15": 2,
+      "7,16": 2,
+      "7,17": 2,
+      "7,18": 2,
+      "7,19": 2,
+      "7,20": 2,
+      "7,21": 2,
+      "7,22": 2,
+      "7,23": 2,
+      "7,24": 2,
+      "7,25": 2,
+      "8,0": 2,
+      "8,1": 4,
+      "8,25": 2,
+      "10,0": 2,
+      "10,1": 3,
+      "10,2": 2,
+      "10,3": 2,
+      "10,4": 2,
+      "10,5": 2,
+      "10,6": 2,
+      "10,7": 2,
+      "10,8": 2,
+      "10,9": 2,
+      "10,10": 2,
+      "10,11": 2,
+      "10,12": 2,
+      "10,13": 2,
+      "10,14": 2,
+      "10,15": 2,
+      "10,16": 2,
+      "10,17": 2,
+      "10,18": 2,
+      "10,19": 2,
+      "10,20": 2,
+      "10,21": 2,
+      "10,22": 2,
+      "10,23": 2,
+      "10,24": 2,
+      "10,25": 2,
+      "11,0": 2,
+      "11,1": 4,
+      "11,25": 2,
+      "13,0": 2,
+      "13,1": 3,
+      "13,2": 2,
+      "13,3": 2,
+      "13,4": 2,
+      "13,5": 2,
+      "13,6": 2,
+      "13,7": 2,
+      "13,8": 2,
+      "13,9": 2,
+      "13,10": 2,
+      "13,11": 2,
+      "13,12": 2,
+      "13,13": 2,
+      "13,14": 2,
+      "13,15": 2,
+      "13,16": 2,
+      "13,17": 2,
+      "13,18": 2,
+      "13,19": 2,
+      "13,20": 2,
+      "13,21": 2,
+      "13,22": 2,
+      "13,23": 2,
+      "13,24": 2,
+      "13,25": 2,
+      "14,0": 2,
+      "14,1": 4,
+      "14,25": 2
+    },
+    "SheetStyle": {
+      "FontFamily": 1
+    }
+  },
+  "Spans": [
+    "2,1,1,24",
+    "5,1,1,24",
+    "11,1,1,24",
+    "8,1,1,24",
+    "14,1,1,24"
+  ],
+  "PageInfo": {
+    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+    "PermissionData": {
+      "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+      "permissionResource": {
+        "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+      },
+      "permissionBindings": [
+        {
+          "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+          "roleNames": [
+            "FGC_LoginUser"
+          ]
+        }
+      ]
+    },
+    "RowBreakLines": [],
+    "RepeatRangeSettings": []
+  },
+  "PrintInfo": {
+    "PaperSize": {},
+    "Margin": {}
+  }
+}//Zmj1QYqMZgA+M+3AF4I0o/UcUKUaQ2zdqNO2e2FEfZJI3KrnGWtzqPqMqy74LbVA8Pd3nflmNVfSFJmL6s1k9grEObAVHRaVGeXMRdXgkhRlILzx1b7k/gQI1Q2eBo2Izr3AiOA3VQlV1KaKjz2320EsbQ1ocXq/0XEIkG/h16uIWyJ3TTBDVOUhAmnGOmA0orBbOgq8Z+B3rc+NmTaYIjVSiEokMF/oztee7S7P3YomkZUGMq8ixQ9JZwd+iY2OWE2Y0zNOoxfYePuJIe6f/UjxSA4GkpxsfkQBgSnFjCIUVHbziIJ8/BcJWWVAh2CZvRoQvBJX5CfTkniJ7sjvFnsmD1yRV+p4M3nmUZ4qKEoAfw9Uy+MyTpb1wSSGhrAbF3HDrbX60Q/j20WxcKlj5abZdjY+1rCM5Duz1QygNJOIz+2svPIJgPH55fmXExy90ZHfVZI4i1w98OPBvutKm4n+fjSdaXiBl07bJFmqPZl9aqzxzowRu8uM1lx/fGheMrIcX0CtlblkRk3dNM2bUn/3xStx2YDfogpBaXd8eUh7IWEl2IuCdChkwKXawC9gAN9V0R1+6XIMdpI2sZlxtj0o/lTUiPikmK2wydIBnbsu1OckW3KBBX80SjRcdxCnHm+tOFe8gz4Zs0ciAHASQ06/El7wPkA7VbXAAFRdmYHHqJ4G2lr0IpZNUWJIS4pwBrgDF8u2KMf7T+FSXnS6mGD1km9YnroR2626nb/WYSdLAkbf7tpWwYZo3Oq394xGgyns1wND+KSs/1MtpjlaoJO5QXtkFxUG8aphktRkwUnR1r8/jF9nZx8dnj44H9R+aJFcF4cxHuxz3lxIX0+uYS36JBYurQXno8pnFsPl4pS5v3I2uw+rzADjBFRcsinCraTjEqofVaxoGz6cVd8/Dg==|920

Pages/客户/客户基本信息.rd

@@ -0,0 +1,5 @@
+{
+  "PageType": 0,
+  "ColumnCount": 26,
+  "RowCount": 16
+}

Pages/客户/客户管理.rd

@@ -1,11 +1,15 @@
 {
   "PageType": 0,
-  "ColumnCount": 43,
+  "ColumnCount": 42,
-  "RowCount": 24,
+  "RowCount": 30,
   "CustomNames": [
     {
       "Name": "客户统计信息子页面",
-      "Formula": "客户管理!$AH$2"
+      "Formula": "客户管理!$AF$2"
+    },
+    {
+      "Name": "显示搜索栏",
+      "Formula": "客户管理!$B$30"
     }
   ]
 }

Pages/客户/客户详情.json

@@ -0,0 +1,333 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 513.0,
+          "Mode": 1
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 37.0
+        }
+      }
+    },
+    "InLogicalVisibleIndexes": [
+      5
+    ],
+    "Count": 6,
+    "DefaultSize": 32.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "13": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "15": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "16": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "17": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "18": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "20": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "21": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "22": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "23": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "24": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "25": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "26": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "27": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "28": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "29": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      },
+      "30": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 20.0
+        }
+      }
+    },
+    "Count": 31,
+    "DefaultSize": 32.0
+  },
+  "Values": {
+    "3,22": "取消",
+    "3,27": "保存"
+  },
+  "AttachInfos": {
+    "1,1": {
+      "CellType": {
+        "$type": "Forguncy.TabControlCellType, ServerDesignerCommon",
+        "TemplateKey": "样式1",
+        "Tabs": [
+          "客户基本信息",
+          "客户部门管理"
+        ]
+      }
+    },
+    "3,22": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+            "ClosePopupResult": 1
+          }
+        ],
+        "Text": "取消",
+        "TemplateKey": "_RS_Information3"
+      }
+    },
+    "3,27": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.ConditionCommand, ServerDesignerCommon",
+            "ConditionAndCommandPairList": [
+              {
+                "Condition": {
+                  "$type": "Forguncy.Model.IfCondition, ServerDesignerCommon",
+                  "param": {
+                    "$type": "Forguncy.Model.IfConditionTableDataParam, ServerDesignerCommon",
+                    "tableData": {
+                      "TableName": "客户表",
+                      "ColumnName": "ID",
+                      "GUID": "7606d1ef-64af-4fbf-8a80-479acdd0963b"
+                    }
+                  },
+                  "value": "%Null%"
+                },
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                    "TableName": "客户表",
+                    "UpdateType": "add",
+                    "ShowConfirm": false
+                  }
+                ],
+                "ID": "0ca57176-06ed-451e-bdee-8b57423777e8"
+              },
+              {
+                "CommandList": [
+                  {
+                    "$type": "Forguncy.Model.UpdateDataTableCommand, ServerDesignerCommon",
+                    "TableName": "客户表",
+                    "ShowConfirm": false
+                  }
+                ],
+                "ID": "66326e78-a5c0-4050-a6f4-548690ce7f80"
+              }
+            ]
+          },
+          {
+            "$type": "Notiflix_Forguncy.Notify_Command, Notiflix_Forguncy",
+            "Message": "保存成功"
+          },
+          {
+            "$type": "Forguncy.Model.ClosePopupCommand, ServerDesignerCommon",
+            "ReloadData": true
+          }
+        ],
+        "Text": "保存",
+        "TemplateKey": "_RS_Main1"
+      }
+    },
+    "5,1": {
+      "BindingInfo": {
+        "TableName": "客户表",
+        "ColumnName": "ID",
+        "GUID": "cf04df09-5042-4d4a-8ca6-deed8c50d6f7"
+      }
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontSize": 14.666666666666666
+      },
+      {
+        "FontFamily": 0,
+        "Formatter": 1
+      },
+      {
+        "FontFamily": 0
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Body",
+        "[AUTO]General"
+      ]
+    },
+    "CellStyles": {
+      "1,1": 0,
+      "3,22": 1,
+      "3,23": 2,
+      "3,24": 2
+    },
+    "SheetStyle": {
+      "FontFamily": 0
+    }
+  },
+  "Spans": [
+    "1,1,1,29",
+    "3,27,1,3",
+    "3,22,1,3",
+    "5,1,1,3"
+  ],
+  "PageInfo": {
+    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+    "PermissionData": {
+      "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+      "permissionResource": {
+        "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+      },
+      "permissionBindings": [
+        {
+          "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+          "roleNames": [
+            "FGC_LoginUser"
+          ]
+        }
+      ]
+    },
+    "RowBreakLines": [],
+    "RepeatRangeSettings": []
+  },
+  "PrintInfo": {
+    "PaperSize": {},
+    "Margin": {}
+  },
+  "CustomNames": [
+    {
+      "Name": "客户ID",
+      "Formula": "客户详情!$B$6"
+    }
+  ]
+}//qD6BSrdM6RG7q31+YZtV2k9S3jFEfujrFWJuVFpZPvmFZSZOSGF7P30DYT24wroxTIu5pzgnJQmbswZ5ebhYz1ZU230uYi9se3ANYTfjuFNRggrmzoTZ8qDIOJ8vtQrlZgFq3IhgClw59Kui1vN3ZD8o7FS+el5qnFSdgesBCGOTXEE0nKsuAdAT1t2k6uJFd2A30sBu3HJntzB4k8DhiTMoGSh1Yz6EXVB3wlwdvLPGQKcMg7PKEpQG8QTLEYNUuFEG4tLYY5DAPC2HkxKYcdi8sOmM+L/Dk8m7C85Xzh6kohC7pPE5kLHrOcwxjCqJuybI1vmWtUNIopfWoK9jZVeTNkA/r9/vGnocfvwRuP01R4wKmeR/ef2QD6Z4Wr/+13bldH/vXbskMqnEOmpn/oKi5M270vE7nrLrCP46HvJnppqlNplzPWmtgHMhd7rJ6jtIjBZiHXja37axqiKGNRpoZmVwDBkF9RiiuDE4hRB4/GU5n/DLUsy4WeDE5vuhni3bLg8RPhCM0ci1GMm3ZoAssP5+fTDsPRIZ07JHw8V/ZJ6nS3VP+eXK8Ig0W9E6B2/u2m08daVwIEbFlpfSEqdRKA8X2gBVNJpS71BXPdArW/DYJxFxNno9wQ1JTRsVQeQ7/QaiiBXfyCsKxTD3ZIRc9yDmnzgGSddsgRoBfoWKW/Ugu6hmKTmmooNa1YeXBUmi+1ZO3LuiMGuzEm3bng8mPF1fPz7QYJgX7OaZfRoBRqbWjyyBzaenv80yG+e2WEL8kEEh86Wp7QhhcL5LXTMWwFah4UGLNEeAW+3DkZCSr2hpIPI4WpeuKpxxLg0bCYuJQArwpaaUvf+U+MLY46eX2uBAGolH+VcuesM/icvNO+U7Aokee3ttAyH0WgMf7ljq8BdrZq4+9YFBsEP87w==|920

Pages/客户/客户详情.rd

@@ -0,0 +1,11 @@
+{
+  "PageType": 0,
+  "ColumnCount": 31,
+  "RowCount": 6,
+  "CustomNames": [
+    {
+      "Name": "客户ID",
+      "Formula": "客户详情!$B$6"
+    }
+  ]
+}

Pages/客户/客户部门管理.json

@@ -0,0 +1,580 @@
+{
+  "Rows": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 40.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 40.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "4": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      },
+      "13": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "14": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "15": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 24.0
+        }
+      }
+    },
+    "Count": 16,
+    "DefaultSize": 24.0
+  },
+  "Cols": {
+    "RowColumnAttachedInfos": {
+      "0": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "2": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "3": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "6": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "8": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "9": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "13": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0,
+          "Mode": 2,
+          "MinLength": {
+            "Unit": 1
+          },
+          "MaxLength": {
+            "Value": 1.0
+          }
+        }
+      },
+      "14": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "15": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "16": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "17": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "18": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "19": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "20": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "21": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "22": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "23": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "24": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "25": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 32.0
+        }
+      },
+      "26": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 15.0
+        }
+      }
+    },
+    "Count": 27,
+    "DefaultSize": 32.0
+  },
+  "Values": {
+    "1,23": "操作",
+    "2,23": "删除"
+  },
+  "AttachInfos": {
+    "1,1": {
+      "ListViewInfo": {
+        "Name": "表格1",
+        "TableName": "客户部门表",
+        "RowIndex": 1,
+        "ColumnIndex": 1,
+        "RowCount": 14,
+        "ColumnCount": 25,
+        "DetailListViewInfo": {
+          "ColumnOfDetailTable": "客户ID",
+          "MasterTable": "客户表",
+          "ColumnOfMasterTable": "ID",
+          "DataCommitType": 2
+        },
+        "TopCondition": null,
+        "ListViewStyleName": "_RS_NewFashionListStyle2",
+        "ShowColumnHeaderInDesigner": true,
+        "ShowEditStatusIcon": true,
+        "UseSimpleBar": true,
+        "AllowEditInListview": true,
+        "AllowAddNewRow": true,
+        "ColumnOperation": 2,
+        "CommitType": 1
+      }
+    },
+    "2,1": {
+      "NameUsedInJavaScript": "部门名称",
+      "BindingInfo": {
+        "TableName": "客户部门表",
+        "ColumnName": "部门名称",
+        "GUID": "9efa1b1a-6c73-4655-9e16-733ea7cbc3cc"
+      },
+      "CellType": {
+        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+        "SavedValidators": [
+          {
+            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+          }
+        ]
+      },
+      "DataValidationInfo": {
+        "IgnoreBlank": false
+      }
+    },
+    "2,6": {
+      "NameUsedInJavaScript": "联系人",
+      "BindingInfo": {
+        "TableName": "客户部门表",
+        "ColumnName": "联系人",
+        "GUID": "306858a8-cca6-4a4d-8e03-8903837a2fcc"
+      },
+      "CellType": {
+        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+        "SavedValidators": [
+          {
+            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+          }
+        ]
+      },
+      "DataValidationInfo": {
+        "IgnoreBlank": false
+      }
+    },
+    "2,11": {
+      "NameUsedInJavaScript": "邮箱",
+      "BindingInfo": {
+        "TableName": "客户部门表",
+        "ColumnName": "邮箱",
+        "GUID": "68b23b48-026a-4ddf-b7b4-526199d74875"
+      },
+      "CellType": {
+        "$type": "Forguncy.TextCellType, ServerDesignerCommon",
+        "SavedValidators": [
+          {
+            "$type": "Forguncy.CellTypes.Models.UniqueValidadator, ServerDesignerCommon"
+          }
+        ]
+      }
+    },
+    "2,17": {
+      "NameUsedInJavaScript": "对接人",
+      "BindingInfo": {
+        "TableName": "客户部门表",
+        "ColumnName": "对接人",
+        "GUID": "d9a4f6cb-9be3-4699-b857-f70156080a18"
+      },
+      "CellType": {
+        "$type": "Forguncy.DropDownListCellType, ServerDesignerCommon",
+        "IsBounding": true,
+        "DataSource": "用户信息视图",
+        "ValueColumnBindingInfo": {
+          "TableName": "用户信息视图",
+          "ColumnName": "用户名",
+          "GUID": "c0128a3d-da66-4f8b-b21e-4de0cd75febd"
+        },
+        "DisplayColumnBindingInfo": {
+          "TableName": "用户信息视图",
+          "ColumnName": "全名",
+          "GUID": "43e8a52d-5ca9-45a9-9b32-18b42fa7e538"
+        }
+      }
+    },
+    "2,23": {
+      "CellType": {
+        "$type": "Forguncy.HyperlinkCellType, ServerDesignerCommon",
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.DeleteRecordCommand, ServerDesignerCommon",
+            "ShowConfirm": true,
+            "ConfirmText": "您确定要删除吗？"
+          }
+        ],
+        "Text": "删除",
+        "ClickMode": 1
+      }
+    }
+  },
+  "StyleDatas": {
+    "Styles": [
+      {
+        "FontSize": 13.333333333333332,
+        "Foreground": 0,
+        "HorizontalAlignment": 1
+      },
+      {
+        "FontFamily": 2,
+        "FontSize": 13.333333333333332,
+        "Foreground": 0,
+        "HorizontalAlignment": 1
+      },
+      {
+        "FontSize": 13.333333333333332,
+        "Foreground": 3
+      },
+      {
+        "FontFamily": 2,
+        "FontSize": 13.333333333333332,
+        "Foreground": 0,
+        "Formatter": 4,
+        "HorizontalAlignment": 1
+      },
+      {
+        "FontSize": 13.333333333333332,
+        "Foreground": 0,
+        "Formatter": 4,
+        "HorizontalAlignment": 1
+      },
+      {
+        "FontSize": 13.333333333333332,
+        "Foreground": 5,
+        "HorizontalAlignment": 1,
+        "Underline": false
+      },
+      {
+        "FontFamily": 2
+      },
+      {
+        "FontFamily": 2,
+        "FontSize": 13.333333333333332,
+        "Foreground": 0
+      },
+      {
+        "FontFamily": 2,
+        "FontSize": 13.333333333333332
+      }
+    ],
+    "Types": {
+      "Strs": [
+        "Text 1 0",
+        "Center",
+        "Body",
+        "black",
+        "@",
+        "Accent 5 0"
+      ]
+    },
+    "CellStyles": {
+      "1,1": 0,
+      "1,6": 0,
+      "1,11": 1,
+      "1,17": 1,
+      "1,23": 2,
+      "2,1": 3,
+      "2,6": 4,
+      "2,11": 3,
+      "2,17": 1,
+      "2,23": 5,
+      "4,0": 6,
+      "4,1": 7,
+      "4,2": 6,
+      "4,3": 6,
+      "4,5": 6,
+      "4,6": 6,
+      "4,7": 6,
+      "4,8": 6,
+      "4,9": 6,
+      "4,10": 6,
+      "4,11": 6,
+      "4,12": 6,
+      "4,13": 6,
+      "4,14": 6,
+      "4,15": 6,
+      "4,16": 6,
+      "4,17": 6,
+      "4,18": 6,
+      "4,19": 6,
+      "4,20": 6,
+      "4,21": 6,
+      "4,22": 6,
+      "4,23": 6,
+      "4,24": 6,
+      "4,25": 6,
+      "4,26": 6,
+      "5,0": 6,
+      "5,1": 8,
+      "5,26": 6,
+      "7,0": 6,
+      "7,1": 7,
+      "7,2": 6,
+      "7,3": 6,
+      "7,5": 6,
+      "7,6": 6,
+      "7,7": 6,
+      "7,8": 6,
+      "7,9": 6,
+      "7,10": 6,
+      "7,11": 6,
+      "7,12": 6,
+      "7,13": 6,
+      "7,14": 6,
+      "7,15": 6,
+      "7,16": 6,
+      "7,17": 6,
+      "7,18": 6,
+      "7,19": 6,
+      "7,20": 6,
+      "7,21": 6,
+      "7,22": 6,
+      "7,23": 6,
+      "7,24": 6,
+      "7,25": 6,
+      "7,26": 6,
+      "8,0": 6,
+      "8,1": 8,
+      "8,26": 6,
+      "10,0": 6,
+      "10,1": 7,
+      "10,2": 6,
+      "10,3": 6,
+      "10,5": 6,
+      "10,6": 6,
+      "10,7": 6,
+      "10,8": 6,
+      "10,9": 6,
+      "10,10": 6,
+      "10,11": 6,
+      "10,12": 6,
+      "10,13": 6,
+      "10,14": 6,
+      "10,15": 6,
+      "10,16": 6,
+      "10,17": 6,
+      "10,18": 6,
+      "10,19": 6,
+      "10,20": 6,
+      "10,21": 6,
+      "10,22": 6,
+      "10,23": 6,
+      "10,24": 6,
+      "10,25": 6,
+      "10,26": 6,
+      "11,0": 6,
+      "11,1": 8,
+      "11,26": 6,
+      "13,0": 6,
+      "13,1": 7,
+      "13,2": 6,
+      "13,3": 6,
+      "13,5": 6,
+      "13,6": 6,
+      "13,7": 6,
+      "13,8": 6,
+      "13,9": 6,
+      "13,10": 6,
+      "13,11": 6,
+      "13,12": 6,
+      "13,13": 6,
+      "13,14": 6,
+      "13,15": 6,
+      "13,16": 6,
+      "13,17": 6,
+      "13,18": 6,
+      "13,19": 6,
+      "13,20": 6,
+      "13,21": 6,
+      "13,22": 6,
+      "13,23": 6,
+      "13,24": 6,
+      "13,25": 6,
+      "13,26": 6,
+      "14,0": 6,
+      "14,1": 8,
+      "14,26": 6
+    },
+    "SheetStyle": {
+      "FontFamily": 2
+    }
+  },
+  "Spans": [
+    "3,1,12,25",
+    "2,23,1,3",
+    "1,23,1,3",
+    "2,17,1,6",
+    "1,17,1,6",
+    "2,11,1,6",
+    "1,11,1,6",
+    "2,6,1,5",
+    "1,6,1,5",
+    "2,1,1,5",
+    "1,1,1,5"
+  ],
+  "PageInfo": {
+    "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
+    "PermissionData": {
+      "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionData, Forguncy.RbacPermission.Core",
+      "permissionResource": {
+        "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionResource, Forguncy.RbacPermission.Core"
+      },
+      "permissionBindings": [
+        {
+          "$type": "Forguncy.RbacPermission.Core.Impl.Page.PagePermissionBinding, Forguncy.RbacPermission.Core",
+          "roleNames": [
+            "FGC_LoginUser"
+          ]
+        }
+      ]
+    },
+    "RowBreakLines": [],
+    "RepeatRangeSettings": []
+  },
+  "PrintInfo": {
+    "PaperSize": {},
+    "Margin": {}
+  }
+}//YUZR8fCeZ73sTMqzqKA59QKksvVxKhoMfGWUwTjznVqk8P6xT3/69/0gmi75qH+b/6TUgpRUCKp6A4yttUIgaAXAxm2t5BkXvzOkLozcwF1Yv+40v5/p0/FrW9Fd0fEEbSEKYOiaqC7PAHuyhvto4sspZVIMRZuaARyzq0lj7IMbM4ok+v/njrFY+3hKfR3XyEaZGVvb+uO/Hmu/T4OTivY22xN+KyQAS8fUtjvIheCbVmyMBvZAYQkrEJFHM4D6w4zhpSDPENNuWj7fUuFHsA2Oj53LIxySFDI6djexfQpZuL3x46oKuJt/8T0IoYqJR2Jt7tzSp4rM2vsQ7+7w37DX+UShJfzDg5Lr/kkAstw9kj2fFB/3ZA0SpjK/JpS58Oa2r/UEUg0HQG4COMQD+YyXdjo5i3I3NfS+5xuT8I3zxIc7lW8rM5chVuC5zZEzwDysAeIjgWYGFtKVeqtPt+2M5l9R7ldi+qOiQ/6tfhTNw9OYF75uSTVwTT8vxzmIU6753vcuHAeFKr0DDeK3LlxW4Trf3gfxM6X48f6XuhfwPn3aqIkOldlMrJcF/rQcdd4ZFf+dmpKDiCgfNSU2bHVFA3Hlvxv6U7fKoO6vrny75sa+zIBVRw1suDq+J6s/KDFsg1AM7PpiLq8H4gSPmlnoXWA+wI/v8GC77N22PL+Shq0JHzWV9zMxZ1P7mrQzXQtig65pnixGbkQst9+Nahq9u1nK9Y665deuecnXGsgCWrfUoweBCfucO/sYvCQAW2dnOieuQxMjdOmIbcWDJurlUiAVDGof8ARO5NQ1nR1YEmxQ3CGgtslZ6asON9tebLhhFmdfnRx7yze6aIi6wl5SyRdXDB2LFm9YD9KHWbiR7k2vmFAmUd28B97njM/KSFy2Qt54G59Sdg9mLX3Qrw==|920

Pages/客户/客户部门管理.rd

@@ -0,0 +1,5 @@
+{
+  "PageType": 0,
+  "ColumnCount": 27,
+  "RowCount": 16
+}

Pages/项目/项目列表.json

@@ -6,39 +6,57 @@
           "DesignLengthInPixel": 24.0
         }
       },
+      "1": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 40.0
+        }
+      },
       "3": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 35.0
+          "DesignLengthInPixel": 35.0,
+          "IsHidden": true
         }
       },
       "4": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 24.0
+          "DesignLengthInPixel": 10.0,
-        }
+          "IsHidden": true
-      },
-      "5": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 20.0
         }
       },
       "6": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 30.0
+          "DesignLengthInPixel": 15.0,
-        }
+          "IsHidden": true
-      },
-      "7": {
-        "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 10.0
         }
       },
       "8": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 34.0
+          "DesignLengthInPixel": 24.0
         }
       },
       "9": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 540.0,
+          "DesignLengthInPixel": 20.0
+        }
+      },
+      "10": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 30.0
+        }
+      },
+      "11": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 10.0
+        }
+      },
+      "12": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 34.0
+        }
+      },
+      "13": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 327.0,
           "Mode": 2,
           "MinLength": {
             "Unit": 1
@@ -48,17 +66,33 @@
           }
         }
       },
-      "10": {
+      "14": {
         "GridRowColumnDefinition": {
           "DesignLengthInPixel": 32.0,
           "IsHidden": true
         }
+      },
+      "5": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
+      },
+      "7": {
+        "GridRowColumnDefinition": {
+          "DesignLengthInPixel": 35.0
+        }
       }
     },
     "InLogicalVisibleIndexes": [
-      10
+      2,
+      3,
+      4,
+      5,
+      6,
+      7,
+      14
     ],
-    "Count": 11,
+    "Count": 15,
     "DefaultSize": 24.0
   },
   "Cols": {
@@ -80,7 +114,7 @@
       },
       "3": {
         "GridRowColumnDefinition": {
-          "DesignLengthInPixel": 32.0
+          "DesignLengthInPixel": 15.0
         }
       },
       "4": {
@@ -276,13 +310,92 @@
   },
   "Values": {
     "1,1": "%PageTitle%",
-    "3,1": 0,
+    "3,1": "类型",
-    "3,37": "添加项目",
+    "3,4": 0,
-    "6,1": "项目分组",
+    "3,11": "状态",
-    "6,8": "项目列表"
+    "3,20": "项目经理",
+    "3,30": "所属客户",
+    "5,1": "关键字",
+    "7,1": "查询",
+    "7,4": "重置",
+    "10,1": "项目分组",
+    "10,8": "项目列表"
+  },
+  "Formulas": {
+    "10,8": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\""
   },
   "AttachInfos": {
-    "3,1": {
+    "1,29": {
+      "CssName": "toolbar toolbar-right ",
+      "CellType": {
+        "$type": "Forguncy.CustomMenu.ForguncyMenuCellType, Forguncy.CustomMenu",
+        "TemplateKey": "横向迷你菜单",
+        "Items": [
+          {
+            "Value": "菜单1",
+            "Text": "筛选数据",
+            "IconPath": "Application/044_search_5.svg",
+            "SelectedIconColor": "Background 1",
+            "SelectedIconColorUseItemColor": true,
+            "IconColorUseItemColor": true,
+            "IsOldMenuPath": false,
+            "CommandList": [
+              {
+                "$type": "Forguncy.Model.SetCellPropertyCommand, ServerDesignerCommon",
+                "PropertyItemsList": [
+                  {
+                    "TargetCells": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=项目列表!显示搜索栏"
+                    },
+                    "Value": {
+                      "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                      "SerializeProperty": "=NOT(项目列表!显示搜索栏)"
+                    }
+                  }
+                ]
+              }
+            ],
+            "CanVisitRoleList": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Value": "菜单1",
+            "Text": "新增项目",
+            "IconPath": "Application/001_add_1.svg",
+            "SelectedIconColor": "Background 1",
+            "SelectedIconColorUseItemColor": true,
+            "IconColorUseItemColor": true,
+            "IsOldMenuPath": false,
+            "CommandList": [
+              {
+                "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
+                "PopupDisplayMode": 3,
+                "DrawerDirection": 3,
+                "ShowDrawerHeader": true,
+                "PageName": "项目信息",
+                "LoadBindingDataOption": 2
+              }
+            ],
+            "CanVisitRoleList": [
+              "FGC_LoginUser"
+            ]
+          }
+        ],
+        "Orientation": 0,
+        "MenuLevelsStyle": [
+          {
+            "FontSize": 13.333333333333332,
+            "Bold": false,
+            "Height": 32.0,
+            "IconHeight": 14.0,
+            "IconWidth": 14.0
+          }
+        ]
+      }
+    },
+    "3,4": {
       "CssName": "singlebox",
       "CellType": {
         "$type": "Forguncy.RadioGroupCellType, ServerDesignerCommon",
@@ -300,7 +413,7 @@
         ]
       }
     },
-    "3,8": {
+    "3,13": {
       "CellType": {
         "$type": "ElementUI.SelectCellType, ElementUI",
         "CommandList": [],
@@ -378,7 +491,163 @@
         "clearable": true
       }
     },
-    "3,15": {
+    "3,22": {
+      "CellType": {
+        "$type": "ElementUI.SelectCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "useBinding": true,
+        "options": [
+          {
+            "value": "黄金糕",
+            "label": "黄金糕"
+          },
+          {
+            "value": "双皮奶",
+            "label": "双皮奶"
+          },
+          {
+            "value": "蚵仔煎",
+            "label": "蚵仔煎"
+          },
+          {
+            "value": "龙须面",
+            "label": "龙须面"
+          },
+          {
+            "value": "北京烤鸭",
+            "label": "北京烤鸭"
+          }
+        ],
+        "bindingOptions": {
+          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+          "TableName": "用户信息视图",
+          "BindingInfos": [
+            {
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "用户名",
+                "GUID": "a5a1387d-d2cd-49a5-87f7-70b01c59103e"
+              },
+              "ColumnName": "value"
+            },
+            {
+              "BindingInfo": {
+                "TableName": "用户信息视图",
+                "ColumnName": "全名",
+                "GUID": "ab4ad90d-25ad-4ca8-aa8c-67c40c1f6ad5"
+              },
+              "ColumnName": "label"
+            }
+          ],
+          "CustomColumns": []
+        },
+        "AllowAddEmptyItem": true,
+        "EmptyItemLabel": "全部",
+        "placeholder": "选择状态",
+        "noDataText": "无数据",
+        "multiple": true,
+        "collapseTags": true,
+        "filterInServerOptions": {
+          "matchMethod": "contains",
+          "loadingText": "加载中"
+        },
+        "noMatchText": "无匹配数据",
+        "clearable": true
+      }
+    },
+    "3,32": {
+      "CellType": {
+        "$type": "ElementUI.SelectCellType, ElementUI",
+        "CommandList": [],
+        "UIPermissions": [
+          {
+            "Scope": 2,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          },
+          {
+            "Scope": 1,
+            "AllowRoles": [
+              "FGC_Anonymous"
+            ]
+          }
+        ],
+        "useBinding": true,
+        "options": [
+          {
+            "value": "黄金糕",
+            "label": "黄金糕"
+          },
+          {
+            "value": "双皮奶",
+            "label": "双皮奶"
+          },
+          {
+            "value": "蚵仔煎",
+            "label": "蚵仔煎"
+          },
+          {
+            "value": "龙须面",
+            "label": "龙须面"
+          },
+          {
+            "value": "北京烤鸭",
+            "label": "北京烤鸭"
+          }
+        ],
+        "bindingOptions": {
+          "$type": "ServerDesignerCommon.Model.BindingDataSourceModel, ServerDesignerCommon",
+          "TableName": "客户表",
+          "BindingInfos": [
+            {
+              "BindingInfo": {
+                "TableName": "客户表",
+                "ColumnName": "ID",
+                "GUID": "29056705-773d-45f2-8162-c1fad472dbd8"
+              },
+              "ColumnName": "value"
+            },
+            {
+              "BindingInfo": {
+                "TableName": "客户表",
+                "ColumnName": "客户名称",
+                "GUID": "d21ba841-3bea-41fe-8765-c69beb6a63e6"
+              },
+              "ColumnName": "label"
+            }
+          ],
+          "CustomColumns": []
+        },
+        "AllowAddEmptyItem": true,
+        "EmptyItemLabel": "全部",
+        "placeholder": "选择状态",
+        "noDataText": "无数据",
+        "multiple": true,
+        "collapseTags": true,
+        "filterInServerOptions": {
+          "matchMethod": "contains",
+          "loadingText": "加载中"
+        },
+        "noMatchText": "无匹配数据",
+        "clearable": true
+      }
+    },
+    "5,4": {
       "CellType": {
         "$type": "ElementUI.InputCellType, ElementUI",
         "CommandList": [],
@@ -403,7 +672,7 @@
           }
         ],
         "type": "text",
-        "placeholder": "搜索项目",
+        "placeholder": "输入关键词，支持项目名称、项目简介",
         "suffixIcon": {
           "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin",
           "Name": "Application/047_search_8.svg",
@@ -413,30 +682,21 @@
         "resize": "none"
       }
     },
-    "3,37": {
+    "7,1": {
       "CellType": {
         "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
-        "CommandList": [
+        "Text": "查询",
-          {
+        "TemplateKey": "_RS_Main1"
-            "$type": "Forguncy.Model.ShowPopupCommand, ServerDesignerCommon",
-            "PopupDisplayMode": 3,
-            "DrawerDirection": 3,
-            "ShowDrawerHeader": true,
-            "PageName": "项目信息",
-            "LoadBindingDataOption": 2
-          }
-        ],
-        "Text": "添加项目",
-        "TemplateKey": "_RS_Main3",
-        "Icon": {
-          "Name": "增加.svg",
-          "Color": "Accent 1",
-          "UseCellTypeForeColor": true
-        },
-        "IconSize": 14.0
       }
     },
-    "6,5": {
+    "7,4": {
+      "CellType": {
+        "$type": "Forguncy.ButtonCellType, ServerDesignerCommon",
+        "Text": "重置",
+        "TemplateKey": "_RS_Information3"
+      }
+    },
+    "10,5": {
       "CellType": {
         "$type": "Forguncy.ImageCellType, ServerDesignerCommon",
         "CommandList": [
@@ -459,7 +719,7 @@
         "UseCellForeColor": true
       }
     },
-    "8,1": {
+    "12,1": {
       "CellType": {
         "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
         "TemplatePageName": "8ee6eff0b74d43ef8e54cd3ef782f76",
@@ -531,7 +791,7 @@
         "TemplateKey": "竖排无样式"
       }
     },
-    "8,8": {
+    "12,8": {
       "CellType": {
         "$type": "Forguncy.RepeaterCellType, ServerDesignerCommon",
         "TemplatePageName": "b90932e038f94707b54e571ff7cd84d",
@@ -563,7 +823,7 @@
                       }
                     }
                   ],
-                  "ID": "0ecbf710-f55e-4281-93ae-288829efc761"
+                  "ID": "b41bff96-c8b2-4e99-9491-82b500fce7a1"
                 },
                 {
                   "CommandList": [
@@ -576,7 +836,7 @@
                       "LoadBindingDataOption": 2
                     }
                   ],
-                  "ID": "ab7feefa-eb46-4ef5-855b-185e4c80ec8f"
+                  "ID": "5b19c391-2448-4a6e-b63f-97d8f675907e"
                 }
               ]
             }
@@ -669,7 +929,7 @@
                     },
                     "Value": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目列表!P4"
+                      "SerializeProperty": "=项目列表!E6"
                     },
                     "LeftBracket": 1
                   },
@@ -688,7 +948,7 @@
                     },
                     "Value": {
                       "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                      "SerializeProperty": "=项目列表!P4"
+                      "SerializeProperty": "=项目列表!E6"
                     },
                     "RightBracket": 1
                   }
@@ -717,7 +977,7 @@
                 },
                 "Value": {
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=项目列表!I4"
+                  "SerializeProperty": "=项目列表!N4"
                 }
               },
               {
@@ -729,7 +989,7 @@
                 },
                 "Value": {
                   "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
-                  "SerializeProperty": "=项目列表!B4"
+                  "SerializeProperty": "=项目列表!E4"
                 }
               }
             ]
@@ -764,6 +1024,30 @@
         },
         "TemplateKey": "BlackWhite"
       }
+    },
+    "14,8": {
+      "CellType": {
+        "$type": "Forguncy.CheckBoxCellType, ServerDesignerCommon",
+        "Caption": "显示搜索栏",
+        "Style": 1,
+        "CommandList": [
+          {
+            "$type": "Forguncy.Model.SetRowColumnLayoutCommand, ServerDesignerCommon",
+            "PropertyItemsList": [
+              {
+                "Location": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=项目列表!3:8"
+                },
+                "Value": {
+                  "$type": "Forguncy.Model.FormulaReferObject, ServerDesignerCommon",
+                  "SerializeProperty": "=项目列表!显示搜索栏"
+                }
+              }
+            ]
+          }
+        ]
+      }
     }
   },
   "StyleDatas": {
@@ -772,17 +1056,22 @@
         "FontSize": 18.666666666666664,
         "FontWeight": 0
       },
-      {
-        "FontFamily": 1,
-        "FontSize": 13.333333333333332
-      },
       {
         "FontFamily": 1
       },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332
+      },
       {
         "FontFamily": 1,
         "FontSize": 13.333333333333332,
-        "Foreground": 2
+        "Formatter": 2
+      },
+      {
+        "FontFamily": 1,
+        "FontSize": 13.333333333333332,
+        "Foreground": 3
       },
       {
         "FontFamily": 1,
@@ -796,7 +1085,7 @@
       {
         "FontFamily": 1,
         "FontSize": 13.333333333333332,
-        "Foreground": 2,
+        "Foreground": 3,
         "BorderBottom": 0
       },
       {
@@ -807,28 +1096,32 @@
         "BorderRight": 0
       },
       {
-        "HorizontalAlignment": 4
+        "HorizontalAlignment": 5
       },
       {
         "FontSize": 13.333333333333332,
-        "Foreground": 5
+        "Foreground": 6
       },
       {
-        "HorizontalAlignment": 4,
+        "HorizontalAlignment": 5,
         "BorderLeft": null,
         "BorderRight": 0
       },
       {
         "FontFamily": 1,
-        "Formatter": 6
+        "Formatter": 2
+      },
+      {
+        "FontFamily": 1,
+        "HorizontalAlignment": 5
+      },
+      {
+        "BorderRight": 0
       },
       {
         "FontFamily": 1,
         "HorizontalAlignment": 7
       },
-      {
-        "BorderRight": 0
-      },
       {
         "HorizontalAlignment": 7,
         "BorderLeft": null,
@@ -839,48 +1132,71 @@
       "Strs": [
         "Bold",
         "Body",
+        "[AUTO]General",
         "black",
         "Background 2 0",
         "Left",
         "Text 1 50",
-        "[AUTO]General",
         "Center"
       ],
       "Borders": [
         {
-          "Color": 3
+          "Color": 4
         }
       ]
     },
     "CellStyles": {
       "1,1": 0,
-      "3,1": 1,
+      "1,29": 1,
-      "3,8": 1,
+      "1,30": 1,
-      "3,9": 2,
+      "1,31": 1,
-      "3,10": 2,
+      "1,32": 1,
-      "3,11": 2,
+      "1,33": 1,
-      "3,12": 2,
+      "1,34": 1,
+      "1,35": 1,
+      "1,36": 1,
+      "1,37": 1,
+      "1,38": 1,
+      "1,39": 1,
+      "1,40": 1,
+      "3,1": 2,
+      "3,2": 1,
+      "3,4": 2,
+      "3,10": 1,
+      "3,11": 3,
+      "3,12": 1,
       "3,13": 2,
       "3,14": 1,
-      "3,15": 3,
+      "3,15": 1,
-      "3,37": 2,
+      "3,16": 1,
-      "3,38": 2,
+      "3,17": 1,
-      "3,39": 2,
+      "3,18": 1,
-      "3,40": 2,
+      "3,20": 3,
-      "4,1": 4,
+      "3,21": 1,
-      "4,2": 4,
+      "3,22": 2,
-      "4,3": 4,
+      "3,23": 1,
-      "4,4": 4,
+      "3,24": 1,
-      "4,5": 4,
+      "3,25": 1,
-      "4,6": 4,
+      "3,26": 1,
-      "4,7": 4,
+      "3,27": 1,
-      "4,8": 4,
+      "3,28": 1,
-      "4,9": 4,
+      "3,30": 3,
-      "4,10": 4,
+      "3,31": 1,
-      "4,11": 4,
+      "3,32": 2,
-      "4,12": 4,
+      "4,1": 2,
-      "4,13": 4,
+      "4,2": 2,
-      "4,14": 5,
+      "4,3": 2,
+      "4,4": 2,
+      "4,5": 2,
+      "4,6": 2,
+      "4,7": 2,
+      "4,8": 2,
+      "4,9": 2,
+      "4,10": 2,
+      "4,11": 2,
+      "4,12": 2,
+      "4,13": 2,
+      "4,14": 2,
       "4,15": 4,
       "4,16": 4,
       "4,17": 4,
@@ -888,48 +1204,186 @@
       "4,19": 4,
       "4,20": 4,
       "4,21": 4,
-      "4,22": 6,
+      "4,22": 4,
-      "4,23": 6,
+      "4,23": 4,
-      "4,24": 6,
+      "4,24": 4,
-      "4,25": 6,
+      "4,25": 4,
-      "4,26": 6,
+      "4,26": 4,
-      "4,27": 6,
+      "4,27": 4,
-      "4,28": 6,
+      "4,28": 4,
-      "4,29": 6,
+      "4,29": 4,
-      "4,30": 7,
+      "4,30": 4,
-      "4,31": 7,
+      "4,31": 4,
-      "4,32": 7,
+      "4,32": 4,
-      "4,33": 7,
+      "4,33": 4,
-      "4,34": 7,
+      "4,34": 4,
-      "4,35": 7,
+      "4,35": 4,
-      "4,36": 7,
+      "4,37": 1,
-      "4,37": 5,
+      "4,38": 1,
-      "4,38": 5,
+      "4,39": 1,
-      "4,39": 5,
+      "4,40": 1,
-      "4,40": 5,
+      "5,1": 2,
-      "5,6": 8,
+      "5,2": 1,
-      "6,1": 9,
+      "5,4": 4,
-      "6,5": 10,
+      "5,39": 1,
-      "6,6": 11,
+      "5,40": 1,
-      "6,8": 12,
+      "6,1": 2,
-      "7,6": 8,
+      "6,2": 2,
-      "8,1": 13,
+      "6,4": 4,
-      "8,6": 14,
+      "6,5": 4,
-      "8,8": 13,
+      "6,6": 4,
-      "9,6": 15
+      "6,7": 4,
+      "6,8": 4,
+      "6,9": 4,
+      "6,10": 4,
+      "6,11": 4,
+      "6,12": 4,
+      "6,13": 4,
+      "6,14": 4,
+      "6,15": 4,
+      "6,16": 4,
+      "6,17": 4,
+      "6,18": 4,
+      "6,19": 4,
+      "6,20": 4,
+      "6,21": 4,
+      "6,22": 4,
+      "6,23": 4,
+      "6,24": 4,
+      "6,25": 4,
+      "6,26": 4,
+      "6,27": 4,
+      "6,28": 4,
+      "6,29": 4,
+      "6,30": 4,
+      "6,31": 4,
+      "6,32": 4,
+      "6,33": 4,
+      "6,34": 4,
+      "6,35": 4,
+      "6,36": 4,
+      "6,37": 4,
+      "6,38": 4,
+      "6,39": 1,
+      "6,40": 1,
+      "7,1": 2,
+      "7,2": 1,
+      "7,3": 1,
+      "7,4": 3,
+      "7,5": 1,
+      "7,6": 4,
+      "7,7": 4,
+      "7,8": 4,
+      "7,9": 4,
+      "7,10": 4,
+      "7,11": 4,
+      "7,12": 4,
+      "7,13": 4,
+      "7,14": 4,
+      "7,15": 4,
+      "7,16": 4,
+      "7,17": 4,
+      "7,18": 4,
+      "7,19": 4,
+      "7,20": 4,
+      "7,21": 4,
+      "7,22": 4,
+      "7,23": 4,
+      "7,24": 4,
+      "7,25": 4,
+      "7,26": 4,
+      "7,27": 4,
+      "7,28": 4,
+      "7,29": 4,
+      "7,30": 4,
+      "7,31": 4,
+      "7,32": 4,
+      "7,33": 4,
+      "7,34": 4,
+      "7,35": 4,
+      "7,36": 4,
+      "7,37": 4,
+      "7,38": 4,
+      "7,39": 1,
+      "7,40": 1,
+      "8,1": 5,
+      "8,2": 5,
+      "8,3": 5,
+      "8,4": 5,
+      "8,5": 5,
+      "8,6": 5,
+      "8,7": 5,
+      "8,8": 5,
+      "8,9": 5,
+      "8,10": 5,
+      "8,11": 5,
+      "8,12": 5,
+      "8,13": 5,
+      "8,14": 6,
+      "8,15": 5,
+      "8,16": 5,
+      "8,17": 5,
+      "8,18": 5,
+      "8,19": 5,
+      "8,20": 5,
+      "8,21": 5,
+      "8,22": 7,
+      "8,23": 7,
+      "8,24": 7,
+      "8,25": 7,
+      "8,26": 7,
+      "8,27": 7,
+      "8,28": 7,
+      "8,29": 7,
+      "8,30": 8,
+      "8,31": 8,
+      "8,32": 8,
+      "8,33": 8,
+      "8,34": 8,
+      "8,35": 8,
+      "8,36": 8,
+      "8,37": 6,
+      "8,38": 6,
+      "8,39": 6,
+      "8,40": 6,
+      "9,6": 9,
+      "10,1": 10,
+      "10,5": 11,
+      "10,6": 12,
+      "10,8": 13,
+      "11,6": 9,
+      "12,1": 14,
+      "12,6": 15,
+      "12,8": 16,
+      "13,6": 17,
+      "14,8": 1,
+      "14,9": 1,
+      "14,10": 1,
+      "14,11": 1
     },
     "SheetStyle": {
       "FontFamily": 1
     }
   },
   "Spans": [
-    "3,1,1,7",
+    "12,8,2,33",
-    "3,8,1,6",
+    "14,1,1,5",
-    "3,15,1,21",
+    "12,1,2,5",
-    "3,37,1,4",
+    "1,29,1,12",
-    "8,8,2,33",
+    "5,1,1,2",
-    "10,1,1,5",
+    "3,1,1,2",
-    "8,1,2,5"
+    "14,8,1,4",
+    "5,4,1,35",
+    "3,4,1,6",
+    "3,11,1,2",
+    "3,13,1,6",
+    "3,20,1,2",
+    "3,22,1,7",
+    "3,30,1,2",
+    "3,32,1,7",
+    "7,1,1,2",
+    "7,4,1,2",
+    "10,1,1,4"
   ],
   "PageInfo": {
     "$type": "Forguncy.Model.Pages.NormalPage, ServerDesignerCommon",
@@ -959,7 +1413,11 @@
   "CustomNames": [
     {
       "Name": "选中分组",
-      "Formula": "项目列表!$B$11"
+      "Formula": "项目列表!$B$15"
+    },
+    {
+      "Name": "显示搜索栏",
+      "Formula": "项目列表!$I$15"
     }
   ]
-}//L/oLxc5F3x0HUzLXU25aBd7VICxp8vA+Ug3NSsy5Srn+auo17nyWxSBoH4aGiNbI/pFjBW5AI9rflIfNhCyWSriuZMiQ7BdCPgE/sO/MfReV+6BFAVRD1+CHpoysxiGwKLi25OypCI1b9jrCzU6SYe2ZdMGiJyr1+TJlPtqtaB29RZejAoDGEWJXF9tcVIUFE17Ms5bNCGJaGXhfO5wsIyJk6I2kOOeYg+7RHEva0euZDD8xaiUaJF4Djj95OT03w6MdUzf8pmVQP/bMB4MCBffbEmiMJweMRrz3OoAnu6JL3cTG749kURgaKXwRaOS3d5NoEFkOj7Yn3rBrP+iFyhmuNMqWGE9C7L4DQCudQpweqMWtDfn9WQNt/V0tc5r+f0ALDVxhN6AVoBYW010dNulVI/fvknCGkROlYIciTFuk53kjxrHtfl3HcPVgu2/0ptUGNzExsN8Wdr/bJbuVPKgRXqZkY6jwhsw+lJ5Cku+L9WXEe0dTcLphfA8OXU2NP8z1JF1ULyvDW3ZaIb9MHTu1dUuhMuVRAaPQRQ4fxU67bOJlqOQqjX1lUZ47JSNE9K/0FSnjHxJ5A6OXLGMDATCvDRrxQrWjoBwviKxjKVGhsuHQyz7URHKeMaE/lZvgNZr17ey5Ou9i98cJjHZBzxHPMjaE1uAlOg43/1icE9ToGRPtNcnrY7Z8SfTMUBoFF7iexHixg9RDCCv1ymooqywqsQyjdj+FLy9dHdj5ALNuPFR6un2ZB23SS8Uudz022cT/kKENtZZjgYcR6ZNuFOhFcB+926/3mX8Oje+BSvYfakT7pz/vgKGrdnCG6TcReyGF43V10101f0S/0gzHOBrvoqHMT42DMufMZm56SPMI0WgkPbU7e891R/ctS+GyIxinL8EjpI+M9+KpLim+uw==|920
+}//Xk43kcIPWERsCIbnGCdSE8zqzQ2IE2mNg3QLN7EJzTQuIuDFQ5IefugSFoIBto+PduI9kRPR/HWran8siwN5K7ZbirtseelFxa3pf8G76Ot6r6vMYznQPIwkomdNVwCQGgMjjHXW+w7z+13vZ3uA17UQrJ0lVCSrfgSbzRV5JArhN37A2R68tjjxNcsM4bxYo9fUna+NY54bkpSFB5xfLIHwQGRRlVxnPzJtbqar228PqdGTM74Xr7mB4B6jCw+PKaYpo0F226HvWBRLFUcurRaNsJwvyM6HrX5xuZe+EQqeERW86VXEGyYoyKI4im3+QHof/c/vDDJN0QJ1r8vEs+8LWu43GhAxOyt5M4xv0R89AMk+rtHrODrqwJc4DvZ3On4BHfhWxuWnrSFzt7c4BhmT6oEuGJFAQDBE8vGvGfyaO6VRsPXxf7Nv400BxAc0x28rhYQOzGX59jJglirSc3hb5tDW3JvgY2a/CBEIiql0Z6nsA3pCkr+GLrtAYtbfy6gFHs/dYR1E7LP8Mk1NSRFPy5kFJRfiwA3doo6n+rQCqSDq0sO7u+6R3HXW28yihOG3WPCawFbHsZp1NFTVNaBefvFlA9t3qdU9vSCadjtnd2FczoVwXObl8MHPfNVjUe8ZmNGRBVQoIjpLwDJRun7uhr2mw1gOP6/DitLkbnQg84SA2j1DXoioWdIyOvj1zZnKplt3OTvRp6xRGfs1fW50QZOmqBajzSe+Or0Stk1Nu2U0HohSQAGFeg3EIl/OzZNYZe0DLW5Tc9drX164gW82V+rmF0oaxozDs8zzp08d5mKiTwZxffOhNZDqDsP4dHhSjtk1Q+zDN/hLQLR+k2KhCHuvNLL5wSh6SuB/bRd5UhwT2pqODBoKKcWSLmGpTYdJJnTx+9pyDRUOl3A6iA==|920

Pages/项目/项目列表.rd

@@ -1,11 +1,18 @@
 {
   "PageType": 0,
   "ColumnCount": 42,
-  "RowCount": 11,
+  "RowCount": 15,
+  "Formulas": {
+    "10,8": "IF(选中分组=\"\",\"全部\",\"属于[\"&选中分组&\"]的\")&\"项目\""
+  },
   "CustomNames": [
     {
       "Name": "选中分组",
-      "Formula": "项目列表!$B$11"
+      "Formula": "项目列表!$B$15"
+    },
+    {
+      "Name": "显示搜索栏",
+      "Formula": "项目列表!$I$15"
     }
   ]
 }

Pages/项目/项目首页/项目首页-容器页面/任务列表.json

@@ -337,7 +337,7 @@
           ],
           "CustomColumns": []
         },
-        "placeholder": "请选择",
+        "placeholder": "按负责人筛选",
         "noDataText": "无数据",
         "filterInServerOptions": {
           "matchMethod": "contains",
@@ -371,7 +371,7 @@
           }
         ],
         "type": "text",
-        "placeholder": "搜索任务...",
+        "placeholder": "请输入关键字搜索",
         "suffixIcon": {
           "$type": "GrapeCity.Forguncy.Plugin.ImageValue, GrapeCity.Forguncy.Plugin",
           "Name": "Application/047_search_8.svg",
@@ -668,6 +668,7 @@
             "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI",
             "DataColumnName": "总计划工时",
             "Label": "总计划工时",
+            "FormatStr": "0.0\"小时\"",
             "Fixed": "none",
             "Align": "center",
             "HeaderAlign": "center"
@@ -676,6 +677,7 @@
             "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI",
             "DataColumnName": "总实际工时",
             "Label": "总实际工时",
+            "FormatStr": "0.0\"小时\"",
             "Fixed": "none",
             "Align": "center",
             "HeaderAlign": "center"
@@ -684,6 +686,7 @@
             "$type": "ElementUI.VirtualizedTableColumnSetting, ElementUI",
             "DataColumnName": "参与人数",
             "Label": "参与人数",
+            "FormatStr": "0\"人\"",
             "Fixed": "none",
             "Align": "center",
             "HeaderAlign": "center"
@@ -692,8 +695,9 @@
         "DefaultExpansion": "expandAll",
         "ShowLineNumberColumn": true,
         "LineNumberColumnSetting": {
+          "Label": "NO",
           "Width": 35,
-          "Align": "left",
+          "Align": "center",
           "Fixed": "left",
           "HeaderAlign": "center"
         },
@@ -797,4 +801,4 @@
     "PaperSize": {},
     "Margin": {}
   }
-}//3Y5QnvmL8aHv9i85lU4gc+pq6YGGU/fVk2WLVYh0xpo1vRoo7nskrrIVhm6WUMp1XNCAfuWWNWdfsuW8z9Xu5nAOUVsI4Vk7ckXTM2ab53BnM9kXlY8ia/Rp9KNqHii7KgPCJUfMW5TRhzu9GSjHwGpcQYXJ8KFsm7aGP9qpOgrlI3z9hLP0HGUnaJ1J1r3d9j14Bv3ouqYIydBYsQg7gpgozK14xuJ29GMxJ6WKYjWEjn/1FumrMaiUcbuLvlWmCsGmNdO6bWNaBC6ER6koa17oWcH6HZ5f5IwRvYrr2AgKa1bi+arM4buj2+W9dRGUSnidTPkRBCoxEmOW9xf2JAVzG3owtivFHiWiVWsIOJh5UVDwYamPYllLZsoxquF7LnZG1gAoqrvLCHGiOLmlk1lX07E1Ws9bdjq1j4vKgqfqPkcVkjFOTuMlPtcHlJpDZa2+fKWQdg+GmmYey0aIdGn5I4IKh5w/ARx7Hxzvx8rETOAuIQROLPGwgOiOiiOptzEdutt5pWlSZJCPY4Cl3+QK1OxNmMAd3B/ZB7e6zar3DNwkKjasX9ZX7S7NJjiDE9/mDSsES0WKKDMdINqVQWwjD6SYqqCxkSXj0TWGtg1nI1t1knYUvn2KcwS+wBBneqL07HZCrcZr5aYUOWWVoufGdZ0Ip5qmta/elCnybybc2n5+9NGqlb32/0izy/t8cicHoQRr3dSn4J+mAkMYzY9IrWKC099PUiFRDc7HavUWG+rBKEcm75uMVRFCy4KxvzSNGhFTGuZYRdD/RTAVLrRwGQ0F0c/KlTPXVkdvuVeTkpskJpptMI2+aPF/scD+jIg+LpKNK/EhG/XuB3VWbVGsdVrDRqe4z4ZMI28DbWo0dl5hMQyuQ141TUSR5rnW6E+Mt4lQHNN6+0AeVyeZLw==|920
+}//OYCpeLQWcV7jvhQpjQTpCB//gLOjc7gH2vldGIOBJCQeZFKfl2iWlDLnQaNyWCn5K4WojQEogCx9ZYyoUjl3iKvKv92n0gsKjOc2HQhMikjS2CSAvoNXd4HYhlyJK13GR0/7HitS+RUDIWvVldP7ZYq7ie4K+mOIZIA99Pcyaw/qjXl6xP8x2R2KlhyCzIP5jdkrmjUmC5CuAd0dJk8/dpxMpd2gJipHGGNz7UMw6GiGgNU4Xs0TwLxzGJl5bLE15uUs7b/I1KWjs7ysG62ZRhQakjNBeWMk8qD7581QrMKj/zdZkbDiJReXO5AfNxwEszsd9zc1leUNuPlkNjc1e3Y+RBaj0o3KJUVtJPjDYn/h3FIVqBTjQouVV7i6qSbVXpJ8KFXdhwl6cdHETxaicxblmGeo/ra4Lck0iGPyn1qo6ZVfhJeEjnEKIKvRgHchz9FEwMHhi44QsCasn3YLDL7h8PAtgO/bGMlgSJHn5eXExfZDtXabB/VLbci+hIKLWvCEIwtPHu0jo3o93d++hoiiby/s/6P12gY/PXu+XtItGq5pd4dQZ9vD6bG2t0x/NLEaR/KSE9JGLkFOWG2HfTk6MKvTO84rskp24Zh4zw1xqcLwXJGQ1UqQe/DP1zJkCOJwsOSQLAbeIQP8meCfidwT2XmuK9uI/jGLmcuZz1hrtoFQF69nI6vizrwWe6VAwzIIOwYYbOb0H7SuCk015kfV3U6yOVDoF80GtGI9uov2S/XP6D96a2bT0b/HrjvbQl7omc2So93VWmGEQofqVykQafBHbFLGtciq42rJnWnhDIhx0xAzmOfADM2jgtX8jg+/gUfdIT+lp5QDyQm6wXWAlfLYvS28p5yKEpIkrJHu69eDc+6+Mxeywk/Ncn66Jwll3qzHcvI2v1UOaS6SbQ==|920

Tables/客户/客户表.json

@@ -59,6 +59,19 @@
       "Name": "部门数量",
       "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
+    {
+      "$type": "Forguncy.SaveLoad.StatisticColumnSaveData, ServerDesignerCommon",
+      "BindingInfo": {
+        "TableName": "项目表",
+        "ColumnName": "ID",
+        "GUID": "ca5cc556-3c1e-422f-a826-042a9871ed57"
+      },
+      "AggregateFunction": 1,
+      "DataColumnName": "ID",
+      "DetailTableName": "项目表",
+      "Name": "项目数量",
+      "ColumnType": "System.Int32, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
+    },
     {
       "$type": "Forguncy.SaveLoad.UserExtraBingingColumnSaveData, ServerDesignerCommon",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e",

Tables/客户/客户部门表.json

@@ -43,7 +43,7 @@
       "$type": "Forguncy.SaveLoad.UserBindingColumnSaveData, ServerDesignerCommon",
       "DatabaseColumnType": "nvarchar",
       "MaxLength": -1,
-      "Name": "对接成员",
+      "Name": "对接人",
       "ColumnType": "System.String, System.Private.CoreLib, Version=6.0.0.0, Culture=neutral, PublicKeyToken=7cec85d7bea7798e"
     },
     {

UserFile/BaseCss.css

@@ -35,4 +35,61 @@
 
 .ec-label .fgc-align {
     width: 100%;
-}
+}
+
+/* 工具栏bar撑满圆角 */
+.toolbar .menuContainer {
+  border-radius: 5px;
+  padding: 5px 0;
+  height: 100%;
+}
+.toolbar .menuContainer > ul {
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-content: center;
+  align-items: center;
+  height: 100%;
+}
+
+.toolbar-left .menuContainer > ul{
+      justify-content: flex-start;
+}
+
+.toolbar-right .menuContainer > ul{
+      justify-content: flex-end;
+}
+
+.toolbar .menuContainer > ul > li {
+  width: auto !important;
+  padding: 5px 0;
+  margin: 0 10px !important;
+  height: auto;
+}
+
+.toolbar .menuContainer > ul > li > a {
+    padding-left: 12px !important;
+    line-height: 0px !important;
+    min-height: 26px;
+    background: #efefef;
+    transition-duration: 0.3s;
+}
+.toolbar .menuContainer > ul > li > a:hover {
+    background: #d8d8d8;
+}
+
+.toolbar .menuContainer > ul > li > a > i {
+  margin: 0 !important;
+}
+
+.toolbar .menuContainer > ul > li > ul {
+  margin-top: 0px;
+}
+
+.toolbar .menuContainer > ul > li > ul li:last-child > a {
+  border-radius: 0 0 3px 3px;
+}
+
+.toolbar .menuContainer > ul > li > ul li:first-child > a {
+  border-radius: 3px 3px 0 0;
+}