手动删除 connections 也可以删除连线

weixin · Nov 17, 2017 · 3b66a9c · 3b66a9c
1 parent 54664e6
commit 3b66a9c
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 12 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-enUS.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-enUS.json
@@ -1,7 +1,7 @@
 {
  "name": "Miaow",
  "author": "Tencent WeChat",
- "version": "1.4.0",
+ "version": "1.4.1",
  "identifier": "cn.wechat",
  "description": "A set of plugins for Sketch include drawing links & marks, UI Kit & Color sync, font & text replacing",
  "icon": "minicon.png",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-jaJP.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-jaJP.json
@@ -1,7 +1,7 @@
 {
  "name": "Miaow",
  "author": "Tencent WeChat",
- "version": "1.4.0",
+ "version": "1.4.1",
  "identifier": "cn.wechat",
  "description": "A set of plugins for Sketch include drawing links & marks, UI Kit & Color sync, font & text replacing",
  "icon": "minicon.png",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-zhCN.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-zhCN.json
@@ -1,7 +1,7 @@
 {
  "name": "Miaow",
  "author": "Tencent WeChat",
- "version": "1.4.0",
+ "version": "1.4.1",
  "identifier": "cn.wechat",
  "description": "A set of plugins for Sketch include drawing links & marks, UI Kit & Color sync, font & text replacing",
  "icon": "minicon.png",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-zhTW.json b/WeSketch.sketchplugin/Contents/Sketch/i18n/manifest-zhTW.json
@@ -1,7 +1,7 @@
 {
  "name": "Miaow",
  "author": "Tencent WeChat",
- "version": "1.4.0",
+ "version": "1.4.1",
  "identifier": "cn.wechat",
  "description": "A set of plugins for Sketch include drawing links & marks, UI Kit & Color sync, font & text replacing",
  "icon": "minicon.png",

diff --git a/WeSketch.sketchplugin/Contents/Sketch/link.js b/WeSketch.sketchplugin/Contents/Sketch/link.js
@@ -1072,19 +1072,17 @@ var redrawConnections = function (context) {
  var selectionLayer = context.selection;
 
  //var selectedLayers = doc.findSelectedLayers();
+ var linkLayersPredicate = NSPredicate.predicateWithFormat("userInfo != nil && function(userInfo, 'valueForKeyPath:', %@).destinationArtboardID != nil", kPluginDomain),
+ linkLayers = doc.currentPage().children().filteredArrayUsingPredicate(linkLayersPredicate),
+ loop = linkLayers.objectEnumerator(),
+ connections = [],
+ linkLayer, destinationArtboardID, destinationArtboard, isCondition, linkRect;
 
  var connectionsGroup = getConnectionsGroupInPage(doc.currentPage());
  if (connectionsGroup) {
  connectionsGroup.removeFromParent();
  }
 
- var linkLayersPredicate = NSPredicate.predicateWithFormat("userInfo != nil && function(userInfo, 'valueForKeyPath:', %@).destinationArtboardID != nil", kPluginDomain),
- linkLayers = doc.currentPage().children().filteredArrayUsingPredicate(linkLayersPredicate),
- loop = linkLayers.objectEnumerator(),
- connections = [],
- linkLayer, destinationArtboardID, destinationArtboard, isCondition, linkRect;
-
-
  while (linkLayer = loop.nextObject()) {
  destinationArtboardID = context.command.valueForKey_onLayer_forPluginIdentifier("destinationArtboardID", linkLayer, kPluginDomain);
  var Message = destinationArtboardID.split('____');
@@ -1119,6 +1117,34 @@ var redrawConnections = function (context) {
 var selection = context.selection;
 var destArtboard, linkLayer;
 
+// 检查有没有被手动删掉的
+var connectionsGroup = getConnectionsGroupInPage(context.document.currentPage());
+if (!connectionsGroup) {
+ var linkLayersPredicate = NSPredicate.predicateWithFormat("userInfo != nil && function(userInfo, 'valueForKeyPath:', %@).destinationArtboardID != nil", kPluginDomain),
+ linkLayers = context.document.currentPage().children().filteredArrayUsingPredicate(linkLayersPredicate),
+ loop = linkLayers.objectEnumerator(),
+ linkLayer, destinationArtboardID;
+ while (linkLayer = loop.nextObject()) {
+ context.command.setValue_forKey_onLayer_forPluginIdentifier(nil, "destinationArtboardID", linkLayer, kPluginDomain);
+ }
+}else{
+ var linkLayersPredicate = NSPredicate.predicateWithFormat("userInfo != nil && function(userInfo, 'valueForKeyPath:', %@).destinationArtboardID != nil", kPluginDomain),
+ linkLayers = context.document.currentPage().children().filteredArrayUsingPredicate(linkLayersPredicate),
+ loop = linkLayers.objectEnumerator(),
+ linkLayer, destinationArtboardID;
+ var child = connectionsGroup.layers();
+ while (linkLayer = loop.nextObject()) {
+ for(var i = 0;i < child.length; i++){
+ if(encodeURIComponent(child[i].name()) == encodeURIComponent(linkLayer.objectID())){
+ break;
+ }
+ if(i == child.length-1){
+ context.command.setValue_forKey_onLayer_forPluginIdentifier(nil, "destinationArtboardID", linkLayer, kPluginDomain);
+ }
+ }
+ } 
+}
+
 if (selection.count() != 1 && selection.count() != 2) {
  redrawConnections(context);
  if (!refursh) {

diff --git a/WeSketch.sketchplugin/Contents/Sketch/manifest.json b/WeSketch.sketchplugin/Contents/Sketch/manifest.json
@@ -1,7 +1,7 @@
 {
  "name": "Miaow",
  "author": "Tencent WeChat",
- "version": "1.4.0",
+ "version": "1.4.1",
  "identifier": "cn.wechat",
  "description": "A set of plugins for Sketch include drawing links & marks, UI Kit & Color sync, font & text replacing",
  "icon": "minicon.png",