From aaf5a35596647fc90b7fc06f5431b63789db213b Mon Sep 17 00:00:00 2001
From: qiang <guoshengqiang@live.com>
Date: Fri, 13 May 2022 19:36:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20weex-styler=20=E7=BC=96=E8=AF=91=20trans?=
 =?UTF-8?q?ition=20=E7=BC=A9=E5=86=99=E6=94=AF=E6=8C=81=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=B1=9E=E6=80=A7=EF=BC=88question/89110?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weex-styler/lib/shorthand-parser.js       | 31 ++++++++++++++-----
 .../weex-styler/test/shorthand-parser.spec.js | 30 ++++++++++++++++++
 2 files changed, 54 insertions(+), 7 deletions(-)

diff --git a/packages/vue-cli-plugin-hbuilderx/packages/weex-styler/lib/shorthand-parser.js b/packages/vue-cli-plugin-hbuilderx/packages/weex-styler/lib/shorthand-parser.js
index 1c504753f..295476c9f 100644
--- a/packages/vue-cli-plugin-hbuilderx/packages/weex-styler/lib/shorthand-parser.js
+++ b/packages/vue-cli-plugin-hbuilderx/packages/weex-styler/lib/shorthand-parser.js
@@ -16,15 +16,32 @@ function clearImportant (value) {
 }
 
 function transition (declaration) {
-  var CHUNK_REGEXP = /^(\S*)?\s*(\d*\.?\d+(?:ms|s)?)?\s*(\S*)?\s*(\d*\.?\d+(?:ms|s)?)?$/
+  var CHUNK_REGEXP = /^([a-z-_]\S*)(\s+[\d.]+m?s)?(\s+[a-z-_]\S*)?(\s+[\d.]+m?s)?/
   var { value, important } = clearImportant(declaration.value)
-  var match = value.match(CHUNK_REGEXP)
-  var result = []
+  var values = value.replace(/(\d)\s*,\s*/g, '$1#').split(',')
   var position = declaration.position
-  match[1] && result.push(generateDeclaration('transition-property', match[1], important, position))
-  match[2] && result.push(generateDeclaration('transition-duration', match[2], important, position))
-  match[3] && result.push(generateDeclaration('transition-timing-function', match[3], important, position))
-  match[4] && result.push(generateDeclaration('transition-delay', match[4], important, position))
+  var result = []
+  var map = {
+    'transition-property': [],
+    'transition-duration': [],
+    'transition-timing-function': [],
+    'transition-delay': []
+  }
+  if (values.length) {
+    for (var i1 = 0; i1 < values.length; i1++) {
+      var match = values[i1].trim().match(CHUNK_REGEXP)
+      if (!match) {
+        return []
+      }
+      map['transition-property'].push(match[1] || 'all')
+      map['transition-duration'].push((match[2] || '0s').trim())
+      map['transition-timing-function'].push((match[3] || 'ease').trim().replace(/#/g, ', '))
+      map['transition-delay'].push((match[4] || '0s').trim())
+    }
+    for (var key in map) {
+      result.push(generateDeclaration(key, map[key].join(', '), important, position))
+    }
+  }
   return result
 }
 
diff --git a/packages/vue-cli-plugin-hbuilderx/packages/weex-styler/test/shorthand-parser.spec.js b/packages/vue-cli-plugin-hbuilderx/packages/weex-styler/test/shorthand-parser.spec.js
index 41d7cd596..8f4a13fe3 100644
--- a/packages/vue-cli-plugin-hbuilderx/packages/weex-styler/test/shorthand-parser.spec.js
+++ b/packages/vue-cli-plugin-hbuilderx/packages/weex-styler/test/shorthand-parser.spec.js
@@ -43,6 +43,36 @@ describe('shorthand-parser', function () {
         position: {}
       }
     ])
+
+    expect(shorthandParser([{
+      type: 'declaration',
+      property: 'transition',
+      value: 'width 2s ease-in-out, height 1s 1s, top cubic-bezier(0.1, 0.7, 1.0, 0.1)',
+      position: {}
+    }])).eql([{
+      type: 'declaration',
+      property: 'transition-property',
+      value: 'width, height, top',
+      position: {}
+    },
+    {
+      type: 'declaration',
+      property: 'transition-duration',
+      value: '2s, 1s, 0s',
+      position: {}
+    },
+    {
+      type: 'declaration',
+      property: 'transition-timing-function',
+      value: 'ease-in-out, ease, cubic-bezier(0.1, 0.7, 1.0, 0.1)',
+      position: {}
+    },
+    {
+      type: 'declaration',
+      property: 'transition-delay',
+      value: '0s, 1s, 0s',
+      position: {}
+    }])
   })
 
   it('parse margin', function () {
-- 
GitLab