Merge pull request baidu#9630 from hsm-lv/fix-scope

fix:scope命中多目标兼容空格情况
lhtuling · Feb 21, 2024 · 7e03085 · 7e03085
2 parents fe47227 + 296c950
commit 7e03085
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/packages/amis-core/__tests__/scoped.test.ts b/packages/amis-core/__tests__/scoped.test.ts
@@ -11,6 +11,7 @@ import {makeEnv} from './helper';
 test('Scoped splitTarget', async () => {
   expect(splitTarget('abc')).toEqual(['abc']);
   expect(splitTarget('a,b,c')).toEqual(['a', 'b', 'c']);
+  expect(splitTarget('a, b, c ')).toEqual(['a', 'b', 'c']);
   expect(splitTarget('a?x=1&y=2,b,c')).toEqual(['a?x=1&y=2', 'b', 'c']);
   expect(splitTarget('a?x=${[a, b]},b,c')).toEqual(['a?x=${[a, b]}', 'b', 'c']);
   expect(splitTarget('a?x=${[a, b]}')).toEqual(['a?x=${[a, b]}']);

diff --git a/packages/amis-core/src/Scoped.tsx b/packages/amis-core/src/Scoped.tsx
@@ -68,7 +68,7 @@ export function splitTarget(target: string): Array<string> {
       let parts: Array<string> = [];
 
       pos.reduceRight((arr: Array<string>, index) => {
-        arr.unshift(target.slice(index + 1));
+        arr.unshift(target.slice(index + 1)?.trim());
         target = target.slice(0, index);
         return arr;
       }, parts);