Explorar o código

1.修改Esign Template控件Item属性,增加Aname和Field。

Pen Li %!s(int64=8) %!d(string=hai) anos
pai
achega
ffccac5f7f

BIN=BIN
Ants Contract/AntsContract.xcworkspace/xcuserdata/macmini1.xcuserdatad/UserInterfaceState.xcuserstate


+ 3 - 0
Ants Contract/Granite Expo eSign/Granite Expo eSign/Template Attributes /AttributeLabelCell.m

@@ -34,6 +34,9 @@
 }
 
 - (void)setValue:(NSString *)value {
+    if (value == nil) {
+        value = @"";
+    }
     [self.value_lb setText:[NSString stringWithFormat:@"%@",value]];
 }
 

+ 2 - 0
Ants Contract/Granite Expo eSign/Granite Expo eSign/Template Attributes /AttributeTableDataSourceAndDelegate.m

@@ -46,6 +46,7 @@ typedef enum {
 
 - (void)changeCheckOptionData:(NSMutableDictionary *)data forSection:(NSInteger)section Row:(NSInteger)row {
     self.check_option = YES;
+    [self.tableView endEditing:YES];
     self.data_index = section;
     self.data_row = row;
     
@@ -63,6 +64,7 @@ typedef enum {
 
 - (void)changeData:(NSMutableDictionary *)data type:(ItemType)type forIndex:(NSInteger)index {
     self.check_option = NO;
+    [self.tableView endEditing:YES]; // 正在编辑状态中,选择其他Item导致编辑信息写入新的Item
     if (data == nil || type == ItemTypeNone) {
         self.data = nil;
         self.template_data = nil;

+ 3 - 0
Ants Contract/Granite Expo eSign/Granite Expo eSign/Template Attributes /AttributeTextFieldCell.m

@@ -34,6 +34,9 @@
 }
 
 - (void)setValue:(NSString *)value {
+    if (value == nil) {
+        value = @"";
+    }
     [self.value_tf setText:[NSString stringWithFormat:@"%@",value]];
 }
 

+ 60 - 5
Ants Contract/Granite Expo eSign/attribute_template.json

@@ -38,11 +38,6 @@
                 "title": "TV VMargin",
                 "key": "tv_vmargin"
             },
-            "aname": {
-                "type": 0,
-                "title": "Aname",
-                "key": "aname"
-            },
             "Font Size": {
                 "type": 0,
                 "title": "Font Size",
@@ -58,6 +53,11 @@
                 "title": "Field",
                 "key": "field"
             },
+            "aname": {
+                "type": 0,
+                "title": "Aname",
+                "key": "aname"
+            },
             "Disable": {
                 "type": 2,
                 "title": "Disable",
@@ -95,6 +95,16 @@
                 "type": 2,
                 "title": "Required",
                 "key": "required"
+            },
+            "Filed": {
+                "type": 0,
+                "title": "Field",
+                "key": "field"
+            },
+            "aname": {
+                "type": 0,
+                "title": "Aname",
+                "key": "aname"
             }
         }
     },
@@ -118,6 +128,16 @@
                 "type": 2,
                 "title": "Required",
                 "key": "required"
+            },
+            "Filed": {
+                "type": 0,
+                "title": "Field",
+                "key": "field"
+            },
+            "aname": {
+                "type": 0,
+                "title": "Aname",
+                "key": "aname"
             }
         }
     },
@@ -151,6 +171,11 @@
                 "type": 0,
                 "title": "Field",
                 "key": "field"
+            },
+            "aname": {
+                "type": 0,
+                "title": "Aname",
+                "key": "aname"
             }
         }
     },
@@ -184,6 +209,16 @@
                 "type": 2,
                 "title": "Disable",
                 "key": "disable"
+            },
+            "Filed": {
+                "type": 0,
+                "title": "Field",
+                "key": "field"
+            },
+            "aname": {
+                "type": 0,
+                "title": "Aname",
+                "key": "aname"
             }
         }
     },
@@ -222,6 +257,16 @@
                 "type": 2,
                 "title": "Show Detail",
                 "key": "show_detail"
+            },
+            "Filed": {
+                "type": 0,
+                "title": "Field",
+                "key": "field"
+            },
+            "aname": {
+                "type": 0,
+                "title": "Aname",
+                "key": "aname"
             }
         }
     },
@@ -255,6 +300,16 @@
                 "type": 2,
                 "title": "Show Detail",
                 "key": "show_detail"
+            },
+            "Filed": {
+                "type": 0,
+                "title": "Field",
+                "key": "field"
+            },
+            "aname": {
+                "type": 0,
+                "title": "Aname",
+                "key": "aname"
             }
         }
     },