fix(alita-core): 修复序号重复，引起的bug

affects: @areslabs/alita-core
areslabs · Apr 28, 2020 · 8ce041d · 8ce041d
1 parent 6b4c6f1
commit 8ce041d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 7 deletions.
diff --git a/packages/alita-core/src/constants.ts b/packages/alita-core/src/constants.ts
@@ -16,6 +16,7 @@ export {
     touchableWithoutFeedbackOrigin,
     touchableOpacityOrigin,
     touchableHighlightOrigin,
+    errorViewOrigin,
 } from '@shared/constants'
 
 

diff --git a/packages/alita-core/src/entrytran/handleEntry.ts b/packages/alita-core/src/entrytran/handleEntry.ts
@@ -41,7 +41,7 @@ export default function (ast, filepath, webpackContext) {
     const tabInfos = []
 
 
-    const go = geneOrder()
+    const go = geneOrder('_')
     errorLogTraverse(ast, {
         enter: path => {
             if (path.type === 'StringLiteral'

diff --git a/packages/alita-core/src/tran/addTempName.js b/packages/alita-core/src/tran/addTempName.js
@@ -14,7 +14,7 @@ import {geneOrder} from '../util/util'
 export default function addTempName (ast, info) {
 
 	let tempNameCount = geneOrder()
-	let diuuCount = geneOrder()
+	let diuuCount = geneOrder('_') // _的传递，是 diuu加属性 和 diuu自增重复
 	let datakeyCount = geneOrder()
 
 	errorLogTraverse(ast, {

diff --git a/packages/alita-core/src/tran/cptCompHandler.js b/packages/alita-core/src/tran/cptCompHandler.js
@@ -16,7 +16,7 @@ import {jsxPropsMap} from '../util/getAndStorecompInfos'
 
 export default function cptCompHandler (ast, info) {
     const ALLCPTCOMPMAP = jsxPropsMap
-    const go = geneOrder()
+    const go = geneOrder('$') // $的传递，是防止生成文件和用户文件重名
     errorLogTraverse(ast, {
         enter: path => {
             // 处理直接是<V>{this.props.children}</V> 这种情况

diff --git a/packages/alita-core/src/tran/geneAllTemplate.js b/packages/alita-core/src/tran/geneAllTemplate.js
@@ -11,7 +11,7 @@ import errorLogTraverse from '../util/ErrorLogTraverse'
 import * as t from '@babel/types'
 import {decTemlate, isJSXChild, isChildCompChild, isChildComp, isRenderReturn, elementAddClass} from '../util/uast';
 import { isEventProp } from '../util/util';
-import {wxBaseComp, originElementAttrName} from "../constants";
+import {wxBaseComp, originElementAttrName, errorViewOrigin} from "../constants";
 import {allBaseComp} from "../util/getAndStorecompInfos";
 
 import configure from '../configure'
@@ -61,7 +61,7 @@ export default function(ast, info) {
                     return
                 }
 
-                if (originAttr.value.value === 'ErrorView') {
+                if (originAttr.value.value === errorViewOrigin) {
                     path.node.attributes = [
                         t.jsxAttribute(
                             t.jsxIdentifier('style'),

diff --git a/packages/alita-core/src/util/util.ts b/packages/alita-core/src/util/util.ts
@@ -19,7 +19,7 @@ const allChars = (low + low.toUpperCase()).split('')
  *
  * @returns {any}
  */
-export function geneOrder() {
+export function geneOrder(suffix = '') {
     let v = ['a']
     return {
         get next() {
@@ -33,7 +33,8 @@ export function geneOrder() {
                 }
             }
 
-            return v.join('')
+            // $ 保证不会和用户数据重复
+            return v.join('') + suffix
         },
     }
 }