chore: resolve conflict

TDesignOteam · Sep 3, 2024 · c437f8f · c437f8f
2 parents 6516408 + b23221e
commit c437f8f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/db/TDesign.db b/db/TDesign.db
diff --git a/packages/scripts/api.json b/packages/scripts/api.json
@@ -116585,7 +116585,7 @@
       "trigger_elements": "",
       "deprecated": 0,
       "version": null,
-      "test_description": "{\"PC\":{\"props\":{\"content\":\"This is a long long long long long tag\"},\"attribute\":[{\"value\":\"150px\",\"expect\":[{\"dom\":\"self\",\"attribute\":{\"style.maxWidth\":\"150px\"}},{\"dom\":\".t-tag--text\",\"attribute\":{\"title\":\"toBeUndefined\"}}]}]}}",
+      "test_description": "{\"PC\":{\"props\":{\"content\":\"This is a long long long long long tag\"},\"attribute\":[{\"value\":\"150px\",\"expect\":[{\"dom\":\"self\",\"attribute\":{\"style.maxWidth\":\"150px\"}},{\"dom\":\".t-tag--text\",\"attribute\":{\"title\":\"This is a long long long long long tag\"}}]}]}}",
       "support_default_value": 0,
       "field_category_text": "Props",
       "platform_framework_text": [
@@ -116813,7 +116813,7 @@
       "trigger_elements": "",
       "deprecated": 0,
       "version": "",
-      "test_description": "{\"PC\":{\"props\":{\"content\":\"This is a long long long long long tag\",\"maxWidth\":\"150px\"},\"attribute\":[{\"value\":\"This is a long long long long long tag\",\"expect\":[{\"dom\":\"self\",\"attribute\":{\"style.maxWidth\":\"150px\"}},{\"dom\":\".t-tag--text\",\"attribute\":{\"title\":\"This is a long long long long long tag\"}}]}]}}",
+      "test_description": "{\"PC\":{\"props\":{\"content\":\"This is a long long long long long tag\",\"maxWidth\":\"150px\"},\"attribute\":[{\"value\":\"This is a long tag\",\"expect\":[{\"dom\":\"self\",\"attribute\":{\"style.maxWidth\":\"150px\"}},{\"dom\":\".t-tag--text\",\"attribute\":{\"title\":\"This is a long tag\"}}]},{\"value\":\"\",\"expect\":[{\"dom\":\"self\",\"attribute\":{\"style.maxWidth\":\"150px\"}},{\"dom\":\".t-tag--text\",\"attribute\":{\"title\":\"This is a long long long long long tag\"}}]},{\"expect\":[{\"dom\":\"self\",\"attribute\":{\"style.maxWidth\":\"150px\"}},{\"dom\":\".t-tag--text\",\"attribute\":{\"title\":\"This is a long long long long long tag\"}}]}]}}",
       "support_default_value": 0,
       "field_category_text": "Props",
       "platform_framework_text": [

diff --git a/packages/scripts/vitest/tests/tag.js b/packages/scripts/vitest/tests/tag.js
@@ -39,7 +39,10 @@ module.exports = {
             value: '150px',
             expect: [
               { dom: 'self', attribute: { 'style.maxWidth': '150px' } },
-              { dom: '.t-tag--text', attribute: { title: 'toBeUndefined' } },
+              {
+                dom: '.t-tag--text',
+                attribute: { title: 'This is a long long long long long tag' },
+              },
             ],
           },
         ],
@@ -64,7 +67,23 @@ module.exports = {
         props: { content: 'This is a long long long long long tag', maxWidth: '150px' },
         attribute: [
           {
-            value: 'This is a long long long long long tag',
+            value: 'This is a long tag',
+            expect: [
+              { dom: 'self', attribute: { 'style.maxWidth': '150px' } },
+              { dom: '.t-tag--text', attribute: { title: 'This is a long tag' } },
+            ],
+          },
+          {
+            value: '',
+            expect: [
+              { dom: 'self', attribute: { 'style.maxWidth': '150px' } },
+              {
+                dom: '.t-tag--text',
+                attribute: { title: 'This is a long long long long long tag' },
+              },
+            ],
+          },
+          {
             expect: [
               { dom: 'self', attribute: { 'style.maxWidth': '150px' } },
               {