dtable-utils 5.0.6 → 5.0.7-beta.2

package/lib/link/core.js

@@ -70,23 +70,30 @@ var getLinkedTableID = function getLinkedTableID(currentTableID, tableID, otherT
 /**
  * Get linked rows ids by the given row id
  * @param {array} links e.g. [ { _id, table1_id, table2_id, table1_table2_map, table2_table1_map, ... }, ... ]
- * @param {string} linkId
- * @param {string} table1Id
- * @param {string} table2Id
- * @param {string} rowId
+ * @param {string} link_id
+ * @param {string} table1_id
+ * @param {string} table2_id
+ * @param {string} row_id
+ * @param {boolean} is_linked_back, determine the self-link column which use 'table1_table2_map'
  * @returns linked rows ids, array
  */
-var getLinkCellValue = function getLinkCellValue(links, linkId, table1Id, table2Id, rowId) {
-  if (!Array.isArray(links) || links.length === 0 || !table1Id || !table2Id || !rowId) return [];
-  var linkBetween2Tables = getLinkById(links, linkId);
+var getLinkCellValue = function getLinkCellValue(_ref) {
+  var links = _ref.links,
+    link_id = _ref.link_id,
+    table1_id = _ref.table1_id,
+    table2_id = _ref.table2_id,
+    row_id = _ref.row_id,
+    is_linked_back = _ref.is_linked_back;
+  if (!Array.isArray(links) || links.length === 0 || !table1_id || !table2_id || !row_id) return [];
+  var linkBetween2Tables = getLinkById(links, link_id);
   if (!linkBetween2Tables) return [];
   var linkMap = {};
-  if (table1Id === table2Id) {
-    linkMap = linkBetween2Tables.table2_table1_map;
+  if (table1_id === table2_id) {
+    linkMap = is_linked_back ? linkBetween2Tables.table1_table2_map : linkBetween2Tables.table2_table1_map;
   } else {
-    linkMap = linkBetween2Tables.table1_id === table1Id ? linkBetween2Tables.table1_table2_map : linkBetween2Tables.table2_table1_map;
+    linkMap = linkBetween2Tables.table1_id === table1_id ? linkBetween2Tables.table1_table2_map : linkBetween2Tables.table2_table1_map;
   }
-  var linkedRowIds = linkMap[rowId];
+  var linkedRowIds = linkMap[row_id];
   if (!linkedRowIds) {
     return [];
   }
@@ -103,21 +110,29 @@ var getTableLinkRows = function getTableLinkRows(operateRows, table, value) {
   linkColumns.forEach(function (column) {
     var key = column.key,
       data = column.data;
-    var _ref = data || {},
-      link_id = _ref.link_id,
-      table_id = _ref.table_id,
-      other_table_id = _ref.other_table_id;
+    var _ref2 = data || {},
+      link_id = _ref2.link_id,
+      table_id = _ref2.table_id,
+      other_table_id = _ref2.other_table_id,
+      is_linked_back = _ref2.is_linked_back;
     var linkedTableId = currentTableId === table_id ? other_table_id : table_id;
     var linkedTable = core$2.getTableById(tables, linkedTableId);
     rows.forEach(function (row) {
-      var rowId = row._id;
-      var linkedRowIds = linkedTable && getLinkCellValue(links, link_id, currentTableId, linkedTableId, rowId) || [];
+      var row_id = row._id;
+      var linkedRowIds = linkedTable && getLinkCellValue({
+        links: links,
+        link_id: link_id,
+        table1_id: currentTableId,
+        table2_id: linkedTableId,
+        row_id: row_id,
+        is_linked_back: is_linked_back
+      }) || [];
 
       // Handle the linked row has been deleted, but link still exists
       linkedRowIds = linkedRowIds.filter(function (linkedRowId) {
         return linkedTable.id_row_map[linkedRowId];
       });
-      linkRows[rowId] = _objectSpread(_objectSpread({}, linkRows[rowId]), {}, _defineProperty__default["default"]({}, key, linkedRowIds));
+      linkRows[row_id] = _objectSpread(_objectSpread({}, linkRows[row_id]), {}, _defineProperty__default["default"]({}, key, linkedRowIds));
     });
   });
   return linkRows;

package/lib/row/convert.js

@@ -161,10 +161,18 @@ var convertRow = function convertRow(row, value, table, view, formulaResults, co
           var _column$data = column.data,
             link_id = _column$data.link_id,
             table_id = _column$data.table_id,
-            other_table_id = _column$data.other_table_id;
+            other_table_id = _column$data.other_table_id,
+            is_linked_back = _column$data.is_linked_back;
           var otherTableID = tableID === table_id ? other_table_id : table_id;
           var links = value.links;
-          result[columnName] = core.getLinkCellValue(links, link_id, tableID, otherTableID, row._id);
+          result[columnName] = core.getLinkCellValue({
+            links: links,
+            link_id: link_id,
+            is_linked_back: is_linked_back,
+            table1_id: tableID,
+            table2_id: otherTableID,
+            row_id: row._id
+          });
           break;
         }
       case cellType.CellType.FORMULA:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-utils",
-  "version": "5.0.6",
+  "version": "5.0.7-beta.2",
   "description": "dtable common utils",
   "main": "./lib/index.js",
   "module": "./es/index.js",