Merge pull request #2421 from entrylabs/develop

develop-hw  최신화

Author: Tnks2U

src/class/source/DataTableSource.js

@@ -145,7 +145,7 @@ class DataTableSource {
 
     isExist(index) {
         const isExist = this.getValue(index);
-        return !!(isExist === 0 || isExist === null || isExist);
+        return !!(isExist === null || isExist);
     }
 
     appendRow(data) {

src/css/components/popup.less

@@ -89,17 +89,21 @@
     .ai_learning {
         overflow: hidden;
         .learningInputPopup {
-            height: 435px;
-            width: 245px;
-            background-color: white;
+            border: none;
+            height: 248px;
+            width: 294px;
+            background-color: #fff;
+            border-bottom-right-radius: 5px;
+            border-bottom-left-radius: 5px;
         }
         .learningInputPopup.text {
-            height: 200px;
-            width: 269px;
+            height: 165px;
+        }
+        .learningInputPopup.image {
+            height: 245px;
         }
         .learningInputPopup.speech {
-            width: 274px;
-            height: 310px;
+            height: 250px;
         }
     }
 }

src/extensions/dmet.js

@@ -141,7 +141,10 @@ class dmetTable {
             return this.#array[key - 1].value;
         } else if (Array.isArray(key)) {
             const [rowKey, ...keys] = key;
-            const { value: row } = this.#array[rowKey - 1] || {};
+            let { value: row } = this.#array[rowKey - 1] || {};
+            if (rowKey === 0) {
+                row = this.#fields;
+            }
             if (keys.length && row) {
                 return _get(row, `[${keys.map((x) => x - 1).join('][')}]`);
             } else {
@@ -333,10 +336,14 @@ class dmetTable {
             key = index;
         }
         const { value: row, key: objKey, x, y } = this.getRow(key);
-        if (!row) {
-            throw { message: 'not found row' };
+        if (x === -1) {
+            this.#fields[y] = value;
+        } else {
+            if (!row) {
+                throw { message: `not found row ${y}` };
+            }
+            row[y] = value;
         }
-        row[y] = value;
         return this.getOperation({ type: 'replace', key, index, data: value, newKey });
     }
 }

src/playground/blocks/block_analysis.js

@@ -345,7 +345,7 @@ module.exports = {
                         null,
                         {
                             type: 'text',
-                            params: ['1'],
+                            params: ['2'],
                         },
                         {
                             type: 'get_table_fields',
@@ -390,7 +390,7 @@ module.exports = {
                 isNotFor: ['analysis'],
                 func(sprite, script) {
                     const tableId = script.getField('MATRIX', script);
-                    const row = script.getNumberValue('NUMBER', script);
+                    const row = script.getNumberValue('NUMBER', script) - 1;
                     const col = DataTable.getColumnIndex(script.getValue('FIELD', script));
                     const value = script.getValue('VALUE', script);
                     const table = DataTable.getSource(tableId, sprite);
@@ -557,7 +557,7 @@ module.exports = {
                         null,
                         {
                             type: 'text',
-                            params: ['1'],
+                            params: ['2'],
                         },
                         {
                             type: 'get_table_fields',
@@ -574,7 +574,7 @@ module.exports = {
                 isNotFor: ['analysis'],
                 func(sprite, script) {
                     const tableId = script.getField('MATRIX', script);
-                    const row = script.getNumberValue('ROW', script);
+                    const row = script.getNumberValue('ROW', script) - 1;
                     const col = DataTable.getColumnIndex(script.getValue('COL', script));
                     const table = DataTable.getSource(tableId, sprite);