@mpxjs/webpack-plugin 2.10.16-beta.4 → 2.10.16-beta.5

package/lib/platform/template/wx/component-config/progress.js

@@ -10,6 +10,7 @@ module.exports = function ({ print }) {
   const jdPropLog = print({ platform: 'jd', tag: TAG_NAME, isError: false })
   const jdEventLog = print({ platform: 'jd', tag: TAG_NAME, isError: false, type: 'event' })
   const qqPropLog = print({ platform: 'qq', tag: TAG_NAME, isError: false })
+  const ksEventLog = print({ platform: 'ks', tag: TAG_NAME, isError: false, type: 'event' })
 
   return {
     test: TAG_NAME,
@@ -55,6 +56,14 @@ module.exports = function ({ print }) {
           }
           obj.name = propsMap[obj.name]
           return obj
+        },
+        ks (obj) {
+          const propsMap = {
+            activeColor: 'active-color',
+            backgroundColor: 'background-color'
+          }
+          obj.name = propsMap[obj.name]
+          return obj
         }
       },
       {
@@ -76,7 +85,8 @@ module.exports = function ({ print }) {
         ali: aliEventLog,
         swan: baiduEventLog,
         tt: ttEventLog,
-        jd: jdEventLog
+        jd: jdEventLog,
+        ks: ksEventLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/rich-text.js

@@ -5,6 +5,7 @@ module.exports = function ({ print }) {
   const baiduPropLog = print({ platform: 'baidu', tag: TAG_NAME, isError: false })
   const ttPropLog = print({ platform: 'bytedance', tag: TAG_NAME, isError: false })
   const jdPropLog = print({ platform: 'jd', tag: TAG_NAME, isError: false })
+  const ksPropLog = print({ platform: 'ks', tag: TAG_NAME, isError: false })
 
   return {
     test: TAG_NAME,
@@ -35,6 +36,10 @@ module.exports = function ({ print }) {
       {
         test: /^(nodes)$/,
         jd: jdPropLog
+      },
+      {
+        test: /^(user-select)$/,
+        ks: ksPropLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/scroll-view.js

@@ -18,6 +18,8 @@ module.exports = function ({ print }) {
   const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
   const iosEventLog = print({ platform: 'ios', tag: TAG_NAME, isError: false, type: 'event' })
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
+  const ksPropLog = print({ platform: 'ks', tag: TAG_NAME, isError: false })
+  const ksEventLog = print({ platform: 'ks', tag: TAG_NAME, isError: false, type: 'event' })
 
   return {
     test: TAG_NAME,
@@ -67,6 +69,10 @@ module.exports = function ({ print }) {
       {
         test: /^(refresher-default-style|refresher-background)$/,
         ios: iosPropLog
+      },
+      {
+        test: /^(scroll-into-view-offset|enable-back-to-top|enable-passive|refresher-enabled|refresher-threshold|refresher-default-style|refresher-background|refresher-triggered|bounces|fast-deceleration|enable-flex|enhanced|paging-enabled|using-sticky|type|associative-container|reverse|clip|enable-back-to-top|cache-extent|min-drag-distance|scroll-into-view-within-extent|scroll-into-view-alignment|padding|refresher-two-level-enabled|refresher-two-level-triggered|refresher-two-level-threshold|refresher-two-level-close-threshold|refresher-two-level-close-threshold|refresher-two-level-scroll-enabled|refresher-ballistic-refresh-enabled|refresher-two-level-pinned|scroll-anchoring)$/,
+        ks: ksPropLog
       }
     ],
     event: [
@@ -90,13 +96,18 @@ module.exports = function ({ print }) {
         ali: aliEventLog,
         tt: ttEventLog,
         qq: qqEventLog,
-        swan: baiduEventLog
+        swan: baiduEventLog,
+        ks: ksEventLog
       },
       {
         test: /^(refresherpulling|refresherrestore|refresherabort)$/,
         android: androidEventLog,
         ios: iosEventLog,
         harmony: harmonyEventLog
+      },
+       {
+        test: /^(scrollstart|scrollend|refresherwillrefresh|refresherstatuschange)$/,
+        ks: ksEventLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/slider.js

@@ -60,6 +60,14 @@ module.exports = function ({ print }) {
           }
           obj.name = propsMap[obj.name]
           return obj
+        },
+        ks (obj) {
+          const propsMap = {
+            activeColor: 'active-color',
+            backgroundColor: 'background-color'
+          }
+          obj.name = propsMap[obj.name]
+          return obj
         }
       }
     ]

package/lib/platform/template/wx/component-config/swiper-item.js

@@ -9,6 +9,7 @@ module.exports = function ({ print }) {
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
   const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
+  const ksPropLog = print({ platform: 'ks', tag: TAG_NAME, isError: false })
 
   return {
     test: TAG_NAME,
@@ -34,7 +35,8 @@ module.exports = function ({ print }) {
         ali: aliPropLog,
         ios: iosPropLog,
         android: androidPropLog,
-        harmony: harmonyPropLog
+        harmony: harmonyPropLog,
+        ks: ksPropLog
       },
       {
         test: /^(skip-hidden-item-layout)$/,
@@ -42,7 +44,8 @@ module.exports = function ({ print }) {
         ali: aliPropLog,
         tt: ttPropLog,
         swan: baiduPropLog,
-        qq: qqPropLog
+        qq: qqPropLog,
+        ks: ksPropLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/swiper.js

@@ -7,6 +7,7 @@ module.exports = function ({ print }) {
   const qqPropLog = print({ platform: 'qq', tag: TAG_NAME, isError: false })
   const ttPropLog = print({ platform: 'bytedance', tag: TAG_NAME, isError: false })
   const webPropLog = print({ platform: 'web', tag: TAG_NAME, isError: false })
+  const ksPropLog = print({ platform: 'ks', tag: TAG_NAME, isError: false })
   const jdEventLog = print({ platform: 'jd', tag: TAG_NAME, isError: false, type: 'event' })
   const jdPropLog = print({ platform: 'jd', tag: TAG_NAME, isError: false })
   const qaPropLog = print({ platform: 'qa', tag: TAG_NAME, isError: false })
@@ -16,6 +17,7 @@ module.exports = function ({ print }) {
   const androidEventLog = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
   const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
   const harmonyEventLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
+  const ksEventLog = print({ platform: 'ks', tag: TAG_NAME, isError: false, type: 'event' })
 
   return {
     test: TAG_NAME,
@@ -69,6 +71,10 @@ module.exports = function ({ print }) {
         ios: iosPropLog,
         android: androidPropLog,
         harmony: harmonyPropLog
+      },
+      {
+        test: /^(snap-to-edge|previous-margin|next-margin|display-multiple-items|direction|layout-type|transformer-type|indicator-type|indicator-margin|indicator-spacing|indicator-radius|indicator-width|indicator-height|indicator-alignment|indicator-offset|scroll-with-animation|cache-extent)$/,
+        ks: ksPropLog
       }
     ],
     event: [
@@ -95,6 +101,10 @@ module.exports = function ({ print }) {
         ios: iosEventLog,
         android: androidEventLog,
         harmony: harmonyEventLog
+      },
+      {
+        test: /^(onscrollstart|onscrollupdate|onscrollend)$/,
+        ks: ksEventLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/text.js

@@ -9,6 +9,7 @@ module.exports = function ({ print }) {
   const iosPropLog = print({ platform: 'ios', tag: TAG_NAME, isError: false })
   const androidPropLog = print({ platform: 'android', tag: TAG_NAME, isError: false })
   const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
+  const ksPropLog = print({ platform: 'ks', tag: TAG_NAME, isError: false })
 
   return {
     test: TAG_NAME,
@@ -74,6 +75,10 @@ module.exports = function ({ print }) {
           el.isSimple = true
           return false
         }
+      },
+      {
+        test: /^(user-select|overflow|max-lines|decode)$/,
+        ks: ksPropLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/textarea.js

@@ -23,6 +23,8 @@ module.exports = function ({ print }) {
   const harmonyValueLogError = print({ platform: 'harmony', tag: TAG_NAME, isError: true, type: 'value' })
   const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
   const harmonyEventLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
+  const ksPropLog = print({ platform: 'ks', tag: TAG_NAME, isError: false })
+  const ksEventLog = print({ platform: 'ks', tag: TAG_NAME, isError: false, type: 'event' })
 
   return {
     test: TAG_NAME,
@@ -95,12 +97,17 @@ module.exports = function ({ print }) {
         ios: iosPropLog,
         android: androidPropLog,
         harmony: harmonyPropLog
+      },
+      {
+        test: /^(cursor-spacing|cursor|selection-start|selection-end|adjust-position|hold-keyboard|disable-default-padding|confirm-hold|adjust-keyboard-to|placeholder-class|show-confirm-bar)$/,
+        ks: ksPropLog
       }
     ],
     event: [
       {
         test: /^(confirm|linechange)$/,
-        web: webEventLog
+        web: webEventLog,
+        ks: ksEventLog
       },
       {
         test: /^keyboardheightchange$/,
@@ -124,7 +131,17 @@ module.exports = function ({ print }) {
         test: /^keyboard.+$/,
         ios: iosEventLog,
         android: androidEventLog,
-        harmony: harmonyEventLog
+        harmony: harmonyEventLog,
+        ks: ksEventLog
+      },
+      {
+        test: /^(selectionchange)$/,
+        ks: ksEventLog,
+        ali: aliEventLog,
+        jd: jdEventLog,
+        qq: qqEventLog,
+        tt: ttEventLog,
+        web: webEventLog
       }
     ]
   }

package/lib/platform/template/wx/component-config/unsupported.js

@@ -6,6 +6,8 @@ const BAIDU_UNSUPPORTED_TAG_NAME_ARR = ['functional-page-navigator', 'live-pushe
 const QQ_UNSUPPORTED_TAG_NAME_ARR = ['functional-page-navigator', 'official-account', 'editor']
 // 头条小程序不支持的标签集合
 const TT_UNSUPPORTED_TAG_NAME_ARR = ['movable-view', 'cover-image', 'cover-view', 'movable-area', 'open-data', 'official-account', 'editor', 'functional-page-navigator', 'audio', 'live-pusher']
+// 快手小程序不支持的标签集合
+const KS_UNSUPPORTED_TAG_NAME_ARR = ['match-media', 'page-container', 'root-portal', 'selection', 'functional-page-navigator', 'editor', 'editor-portal', 'keyboard-accessory', 'live-player', 'live-pusher', 'voip-room', 'channel-live', 'channel-video', 'ad-custom', 'official-account', 'official-account-publisher', 'open-data', 'store-coupon', 'store-gift', 'store-home', 'store-product']
 // 京东小程序不支持的标签集合
 const JD_UNSUPPORTED_TAG_NAME_ARR = ['functional-page-navigator', 'live-pusher', 'live-player', 'rich-text', 'audio', 'video', 'camera']
 // 快应用不支持的标签集合
@@ -22,6 +24,7 @@ module.exports = function ({ print }) {
   const baiduUnsupportedTagError = print({ platform: 'baidu', isError: true, type: 'tag' })
   const qqUnsupportedTagError = print({ platform: 'qq', isError: true, type: 'tag' })
   const ttUnsupportedTagError = print({ platform: 'bytedance', isError: true, type: 'tag' })
+  const ksUnsupportedTagError = print({ platform: 'ks', isError: true, type: 'tag' })
   const jdUnsupportedTagError = print({ platform: 'jd', isError: true, type: 'tag' })
   const qaUnsupportedTagError = print({ platform: 'qa', isError: true, type: 'tag' })
   const iosUnsupportedTagError = print({ platform: 'ios', isError: true, type: 'tag' })
@@ -32,6 +35,7 @@ module.exports = function ({ print }) {
   const baiduUnsupportedExp = new RegExp('^(' + BAIDU_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const qqUnsupportedExp = new RegExp('^(' + QQ_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const ttUnsupportedExp = new RegExp('^(' + TT_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
+  const ksUnsupportedExp = new RegExp('^(' + KS_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const jdUnsupportedExp = new RegExp('^(' + JD_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const qaUnsupportedExp = new RegExp('^(' + QA_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
   const iosUnsupportedExp = new RegExp('^(' + RN_UNSUPPORTED_TAG_NAME_ARR.join('|') + ')$')
@@ -59,6 +63,11 @@ module.exports = function ({ print }) {
       test: ttUnsupportedExp,
       tt: ttUnsupportedTagError
     },
+    {
+      supportedModes: ['ks'],
+      test: ksUnsupportedExp,
+      ks: ksUnsupportedTagError
+    },
     {
       supportedModes: ['jd'],
       test: jdUnsupportedExp,

package/lib/platform/template/wx/component-config/video.js

@@ -17,6 +17,8 @@ module.exports = function ({ print }) {
   const androidEventLogError = print({ platform: 'android', tag: TAG_NAME, isError: false, type: 'event' })
   const harmonyPropLog = print({ platform: 'harmony', tag: TAG_NAME, isError: false })
   const harmonyEventLogError = print({ platform: 'harmony', tag: TAG_NAME, isError: false, type: 'event' })
+  const ksPropLog = print({ platform: 'ks', tag: TAG_NAME, isError: false })
+  const ksEventLogError = print({ platform: 'ks', tag: TAG_NAME, isError: false, type: 'event' })
   return {
     test: TAG_NAME,
     web (tag, { el }) {
@@ -74,6 +76,10 @@ module.exports = function ({ print }) {
         test: /^(duration|enable-danmu|danmu-btn|page-gesture|direction|show-progress|show-fullscreen-btn|show-center-play-btn|enable-progress-gesture|show-mute-btn|title|play-btn-position|enable-play-gesture|auto-pause-if-navigate|auto-pause-if-open-native|vslide-gesture|vslide-gesture-in-fullscreen|show-bottom-progress|ad-unit-id|poster-for-crawler|show-casting-button|picture-in-picture-mode|picture-in-picture-show-progress| picture-in-picture-init-position|enable-auto-rotation|show-snapshot-button|show-screen-lock-button|show-background-playback-button|background-poster|referrer-policy|is-live)$/,
         android: androidPropLog,
         harmony: harmonyPropLog
+      },
+      {
+        test: /^(duration|danmu-list|enable-danmu|danmu-btn|auto-pause-if-navigate|auto-pause-if-open-native|ad-unit-id|poster-for-crawler|picture-in-picture-mode|picture-in-picture-show-progress|picture-in-picture-init-position|enable-auto-rotation|show-snapshot-button|show-background-playback-button|background-poster|is-drm|is-live|provision-url|certificate-url|license-url|preferred-peak-bit-rate)$/,
+        ks: ksPropLog
       }
     ],
     event: [
@@ -117,6 +123,10 @@ module.exports = function ({ print }) {
         test: /^(progress|enterpictureinpicture|leavepictureinpicture|castinguserselect|castingstatechange|castinginterrupt)$/,
         android: androidEventLogError,
         harmony: harmonyEventLogError
+      },
+      {
+        test: /^(waiting|controlstoggle|enterpictureinpicture|leavepictureinpicture|seekcomplete|castinguserselect)$/,
+        ks: ksEventLogError
       }
     ]
   }

package/lib/platform/template/wx/index.js

@@ -62,7 +62,7 @@ module.exports = function getSpec ({ warn, error }) {
   }
 
   const spec = {
-    supportedModes: ['ali', 'swan', 'qq', 'tt', 'web', 'qa', 'jd', 'dd', 'ios', 'android', 'harmony'],
+    supportedModes: ['ali', 'swan', 'qq', 'tt', 'ks', 'web', 'qa', 'jd', 'dd', 'ios', 'android', 'harmony'],
     // props预处理
     preProps: [],
     // props后处理
@@ -325,6 +325,13 @@ module.exports = function getSpec ({ warn, error }) {
             value
           }
         },
+        ks ({ name, value }) {
+          const dir = this.test.exec(name)[1]
+          return {
+            name: 'ks:' + dir,
+            value
+          }
+        },
         dd ({ name, value }) {
           const dir = this.test.exec(name)[1]
           return {
@@ -413,6 +420,19 @@ module.exports = function getSpec ({ warn, error }) {
             value
           }
         },
+        ks ({ name, value }, { eventRules }) {
+          const match = this.test.exec(name)
+          const prefix = match[1]
+          const eventName = match[2]
+          const modifierStr = match[3] || ''
+          let rPrefix = runRules(spec.event.prefix, prefix, { mode: 'ks' })
+          const rEventName = runRules(eventRules, eventName, { mode: 'ks' })
+          if (rEventName.includes('-')) rPrefix += ':'
+          return {
+            name: rPrefix + rEventName + modifierStr,
+            value
+          }
+        },
         dd ({ name, value }, { eventRules }) {
           const match = this.test.exec(name)
           const prefix = match[1]

package/lib/runtime/components/react/dist/mpx-picker-view/index.jsx

@@ -67,7 +67,7 @@ const _PickerView = forwardRef((props, ref) => {
             columnData,
             ref: cloneRef,
             columnIndex: index,
-            key: `pick-view-${index}`,
+            key: `pick-view-${index}-${columnData.length}`,
             wrapperStyle: {
                 height: normalStyle?.height || DefaultPickerItemH,
                 itemHeight: indicatorH || DefaultPickerItemH

package/lib/runtime/components/react/dist/mpx-picker-view-column/index.jsx

@@ -44,6 +44,7 @@ const _PickerViewColumn = forwardRef((props, ref) => {
     const contentContainerStyle = useMemo(() => {
         return [{ paddingVertical: paddingHeight }];
     }, [paddingHeight]);
+    const initialContentOffsetY = useMemo(() => initialIndex * itemRawH, [initialIndex, itemRawH]);
     const getIndex = useCallback((y) => {
         const calc = Math.round(y / itemRawH);
         return Math.max(0, Math.min(calc, maxIndex));
@@ -93,16 +94,6 @@ const _PickerViewColumn = forwardRef((props, ref) => {
             activeIndex.current = initialIndex;
         }, isIOS ? 0 : 200);
     }, [itemRawH, maxIndex, initialIndex]);
-    const onContentSizeChange = useCallback((_w, h) => {
-        const y = initialIndex * itemRawH;
-        if (y <= h) {
-            clearTimerScrollTo();
-            timerScrollTo.current = setTimeout(() => {
-                scrollViewRef.current?.scrollTo({ x: 0, y, animated: false });
-                activeIndex.current = initialIndex;
-            }, 0);
-        }
-    }, [itemRawH, initialIndex]);
     const onItemLayout = useCallback((e) => {
         const { height: rawH } = e.nativeEvent.layout;
         const roundedH = Math.round(rawH);
@@ -241,8 +232,8 @@ const _PickerViewColumn = forwardRef((props, ref) => {
             onScrollEndDrag,
             onMomentumScrollBegin,
             onMomentumScrollEnd,
-            onContentSizeChange,
-            contentContainerStyle
+            contentContainerStyle,
+            contentOffset: { x: 0, y: initialContentOffsetY }
         });
         return createElement(PickerViewColumnAnimationContext.Provider, { value: offsetYShared }, createElement(Reanimated.ScrollView, innerProps, renderInnerchild()));
     };

package/lib/runtime/components/react/mpx-picker-view/index.tsx

@@ -170,7 +170,7 @@ const _PickerView = forwardRef<HandlerRef<View, PickerViewProps>, PickerViewProp
         columnData,
         ref: cloneRef,
         columnIndex: index,
-        key: `pick-view-${index}`,
+        key: `pick-view-${index}-${columnData.length}`,
         wrapperStyle: {
           height: normalStyle?.height || DefaultPickerItemH,
           itemHeight: indicatorH || DefaultPickerItemH

package/lib/runtime/components/react/mpx-picker-view-column/index.tsx

@@ -98,6 +98,11 @@ const _PickerViewColumn = forwardRef<HandlerRef<ScrollView & View, ColumnProps>,
     return [{ paddingVertical: paddingHeight }]
   }, [paddingHeight])
 
+  const initialContentOffsetY = useMemo(
+    () => initialIndex * itemRawH,
+    [initialIndex, itemRawH]
+  )
+
   const getIndex = useCallback((y: number) => {
     const calc = Math.round(y / itemRawH)
     return Math.max(0, Math.min(calc, maxIndex))
@@ -155,17 +160,6 @@ const _PickerViewColumn = forwardRef<HandlerRef<ScrollView & View, ColumnProps>,
     }, isIOS ? 0 : 200)
   }, [itemRawH, maxIndex, initialIndex])
 
-  const onContentSizeChange = useCallback((_w: number, h: number) => {
-    const y = initialIndex * itemRawH
-    if (y <= h) {
-      clearTimerScrollTo()
-      timerScrollTo.current = setTimeout(() => {
-        scrollViewRef.current?.scrollTo({ x: 0, y, animated: false })
-        activeIndex.current = initialIndex
-      }, 0)
-    }
-  }, [itemRawH, initialIndex])
-
   const onItemLayout = useCallback((e: LayoutChangeEvent) => {
     const { height: rawH } = e.nativeEvent.layout
     const roundedH = Math.round(rawH)
@@ -331,8 +325,8 @@ const _PickerViewColumn = forwardRef<HandlerRef<ScrollView & View, ColumnProps>,
       onScrollEndDrag,
       onMomentumScrollBegin,
       onMomentumScrollEnd,
-      onContentSizeChange,
-      contentContainerStyle
+      contentContainerStyle,
+      contentOffset: { x: 0, y: initialContentOffsetY }
     }) as React.ComponentProps<typeof Reanimated.ScrollView>
 
     return createElement(

package/lib/runtime/stringify.wxs

@@ -45,7 +45,7 @@ function objectKeys (obj) {
 }
 
 function genRegExp (str, flags) {
-  if (!__mpx_wxs__) {
+  if (!__mpx_wxs__ || __mpx_mode__ === 'ks') {
     return new RegExp(str, flags)
   } else {
     return getRegExp(str, flags)
@@ -234,4 +234,4 @@ module.exports = {
     var parsedStaticStyle = typeof staticStyle === 'string' ? parseStyleText(staticStyle) : {}
     return genStyleText(extend(parsedStaticStyle, normalizedDynamicStyle))
   }
-}
+}

package/lib/template-compiler/bind-this.js

@@ -258,7 +258,7 @@ module.exports = {
     })
     return {
       code: pCollectKeys.map((key) => {
-        return isSimpleKey(key) ? `_sc(${JSON.stringify(key)});` : `_c(${JSON.stringify(key)});`
+        return isSimpleKey(key) ? `mpx_sc(${JSON.stringify(key)});` : `mpx_c(${JSON.stringify(key)});`
       }).join('\n'),
       propKeys: [...propKeySet]
     }
@@ -436,7 +436,7 @@ module.exports = {
         exit (path) {
           if (path.collectInfo) {
             const { isSimple, key } = path.collectInfo
-            const callee = isSimple ? t.identifier('_sc') : t.identifier('_c')
+            const callee = isSimple ? t.identifier('mpx_sc') : t.identifier('mpx_c')
             const replaceNode = renderReduce
               ? t.callExpression(callee, [key])
               : t.callExpression(callee, [key, path.node])

package/lib/template-compiler/compiler.js

@@ -1884,24 +1884,25 @@ function processRefReact (el, meta) {
     /**
      * selectorsConf: [type, [[prefix, selector], [prefix, selector]]]
      */
-    if (!val) {
-      const rawId = el.attrsMap.id
-      const rawClass = el.attrsMap.class
-      const rawDynamicClass = el.attrsMap[config[mode].directive.dynamicClass]
-
-      if (rawId) {
-        const staticId = parseMustacheWithContext(rawId).result
-        selectors.push({ prefix: '#', selector: `${staticId}` })
-      }
-      if (rawClass || rawDynamicClass) {
-        const staticClass = parseMustacheWithContext(rawClass).result
-        const dynamicClass = parseMustacheWithContext(rawDynamicClass).result
-        selectors.push({ prefix: '.', selector: `this.__getClass(${staticClass}, ${dynamicClass})` })
-      }
-    } else {
+    if (val) {
       meta.refs.push(refConf)
       selectors.push({ prefix: '', selector: `"${refConf.key}"` })
     }
+
+    const rawId = el.attrsMap.id
+    const rawClass = el.attrsMap.class
+    const rawDynamicClass = el.attrsMap[config[mode].directive.dynamicClass]
+
+    if (rawId) {
+      const staticId = parseMustacheWithContext(rawId).result
+      selectors.push({ prefix: '#', selector: `${staticId}` })
+    }
+    if (rawClass || rawDynamicClass) {
+      const staticClass = parseMustacheWithContext(rawClass).result
+      const dynamicClass = parseMustacheWithContext(rawDynamicClass).result
+      selectors.push({ prefix: '.', selector: `this.__getClass(${staticClass}, ${dynamicClass})` })
+    }
+
     const selectorsConf = selectors.map(item => `["${item.prefix}", ${item.selector}]`)
     const refFnId = forScopes.reduce((preV, curV) => {
       return `${preV} + "_" + ${curV.index}`
@@ -2719,7 +2720,7 @@ function postProcessTemplate (el) {
   }
 }
 
-const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,tenon,ios,android,harmony,noMode')
+const isValidMode = makeMap('wx,ali,swan,tt,qq,web,qa,jd,dd,tenon,ios,android,harmony,ks,noMode')
 
 function isValidModeP (i) {
   return isValidMode(i[0] === '_' ? i.slice(1) : i)
@@ -3261,7 +3262,7 @@ function genFor (node) {
   node.forProcessed = true
   const index = node.for.index || 'index'
   const item = node.for.item || 'item'
-  return `_i(${node.for.exp}, function(${item},${index}){\n${genNode(node)}});\n`
+  return `mpx_i(${node.for.exp}, function(${item},${index}){\n${genNode(node)}});\n`
 }
 
 function genNode (node) {

package/lib/template-compiler/index.js

@@ -112,10 +112,10 @@ module.exports = function (raw) {
   if (rawCode) {
     try {
       const ignoreMap = Object.assign({
-        _i: true,
-        _c: true,
-        _sc: true,
-        _r: true
+        mpx_i: true,
+        mpx_c: true,
+        mpx_sc: true,
+        mpx_r: true
       }, meta.wxsModuleMap)
       const bindResult = optimizeRenderLevel === 2
         ? bindThis.transformSimple(rawCode, {
@@ -126,9 +126,9 @@ module.exports = function (raw) {
           renderReduce: optimizeRenderLevel === 1,
           ignoreMap
         })
-      resultSource += `global.currentInject.render = function (_i, _c, _r, _sc) {
+      resultSource += `global.currentInject.render = function (mpx_i, mpx_c, mpx_r, mpx_sc) {
 ${bindResult.code}
-_r(${optimizeRenderLevel === 2 ? 'true' : ''});
+mpx_r(${optimizeRenderLevel === 2 ? 'true' : ''});
 };\n`
       if ((mode === 'tt' || mode === 'swan') && bindResult.propKeys) {
         resultSource += `global.currentInject.propKeys = ${JSON.stringify(bindResult.propKeys)};\n`

package/lib/utils/dom-tag-config.js

@@ -74,10 +74,10 @@ const isNativeMiniTag = makeMap(
  */
 const isBuildInWebTag = makeMap(
   'mpx-image,mpx-picker-view,mpx-slider,mpx-textarea,mpx-input,mpx-picker,' +
-  'mpx-swiper-item,mpx-video,mpx-button,mpx-keep-alive,mpx-progress,' +
+  'mpx-swiper-item,mpx-video,mpx-button,mpx-progress,' +
   'mpx-swiper,mpx-view,mpx-checkbox-group,mpx-movable-area,mpx-radio-group,' +
   'mpx-switch,mpx-web-view,mpx-checkbox,mpx-movable-view,mpx-radio,' +
-  'mpx-tab-bar-container,mpx-form,mpx-navigator,mpx-rich-text,mpx-tab-bar,' +
+  'mpx-form,mpx-navigator,mpx-rich-text,' +
   'mpx-icon,mpx-picker-view-column,mpx-scroll-view,mpx-text'
 )
 
@@ -86,11 +86,11 @@ const isBuildInWebTag = makeMap(
  */
 const isBuildInReactTag = makeMap(
   'mpx-web-view,mpx-view,mpx-video,mpx-textarea,mpx-text,mpx-switch,' +
-  'mpx-swiper,mpx-swiper-item,mpx-simple-view,mpx-simple-text,mpx-scroll-view,' +
+  'mpx-swiper,mpx-swiper-item,mpx-scroll-view,' +
   'mpx-root-portal,mpx-radio,mpx-radio-group,mpx-navigator,mpx-movable-view,' +
-  'mpx-movable-area,mpx-label,mpx-keyboard-avoiding-view,mpx-input,mpx-inline-text,' +
+  'mpx-movable-area,mpx-label,mpx-input,' +
   'mpx-image,mpx-form,mpx-checkbox,mpx-checkbox-group,mpx-button,' +
-  'mpx-rich-text,mpx-portal,mpx-popup,mpx-picker-view-column,mpx-picker-view,mpx-picker,' +
+  'mpx-rich-text,mpx-picker-view-column,mpx-picker-view,mpx-picker,' +
   'mpx-icon,mpx-canvas,mpx-camera'
 )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mpxjs/webpack-plugin",
-  "version": "2.10.16-beta.4",
+  "version": "2.10.16-beta.5",
   "description": "mpx compile core",
   "keywords": [
     "mpx"