@dolphinweex/weex-vue-render 0.2.32 → 0.2.34

package/dist/index.common.js

@@ -4977,6 +4977,56 @@ var style = {
       }
       return t;
     },
+    weexH: function(h, tag, data, ...children) {
+      // 处理主题 h 方法
+      if (!this.$weexThemeClass) {
+        return h(tag, data, ...children);
+      }
+      if (data && data.staticClass && !data.themeProcessed) {
+        const staticClasses = data.staticClass.split(' ').filter(cls => cls);
+        let allThemeClasses = [];
+        // 为每个静态类名应用主题处理
+        staticClasses.forEach(className => {
+          const themeClasses = this.$weexThemeClass(className);
+          allThemeClasses.push(...themeClasses);
+        });
+        if (allThemeClasses.length > 0) {
+          data.staticClass = data.staticClass + ' ' + allThemeClasses.join(' ');
+        }
+        data.themeProcessed = true;
+      }
+      const processedChildren = this.processChildrenTheme(children);
+      return h(tag, data, ...processedChildren);
+    },
+    processChildrenTheme: function(children) {
+      if (!children || !Array.isArray(children)) {
+        return children;
+      }
+      return children.map(child => {
+        if (Array.isArray(child)) {
+          return this.processChildrenTheme(child);
+        }
+        // 如果是VNode对象
+        if (child && typeof child === 'object' && child.data) {
+          if (child.data.staticClass && !child.data.themeProcessed) {
+            const staticClasses = child.data.staticClass.split(' ').filter(cls => cls);
+            let allThemeClasses = [];
+            staticClasses.forEach(className => {
+              const themeClasses = this.$weexThemeClass(className);
+              allThemeClasses.push(...themeClasses);
+            });
+            if (allThemeClasses.length > 0) {
+              child.data.staticClass = child.data.staticClass + ' ' + allThemeClasses.join(' ');
+            }
+            child.data.themeProcessed = true;
+          }
+          if (child.children && Array.isArray(child.children)) {
+            child.children = this.processChildrenTheme(child.children);
+          }
+        }
+        return child;
+      });
+    },
     _px2rem: function _px2rem (value, rootValue, propKey) {
       var this$1 = this;
       if (typeof value === 'string') {
@@ -8570,7 +8620,7 @@ function _render (context, h) {
       staticStyle: getIndicatorItemStyle(mergedStyle, isActive)
     }));
   }
-  return h('nav', {
+  return context.weexH(h,'nav', {
     attrs: { 'weex-type': 'indicator' },
     staticClass: 'weex-indicator weex-ct'
   }, [
@@ -8579,8 +8629,8 @@ function _render (context, h) {
     // so a smaller wrapper is needed to prevent the overlap.
     // This wrapper will cover only the whole size of all the
     // indicator pointers' item-sizes.
-    h('div', {
-      staticClass: 'weex-indicator-inner'
+    context.weexH(h,'div', {
+      staticClass: 'weex-indicator-inner '
     }, children)
   ])
 }
@@ -8621,7 +8671,7 @@ var indicator$1 = {
   }
 };
 
-__$styleInject("/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied.  See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n \n.weex-slider-wrapper {\n  overflow: hidden;\n}\n\n.weex-slider-inner {\n  width: 100%;\n  height: 100%;\n  overflow: visible;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n}\n\n.weex-slider-cell {\n  width: 100%;\n  height: 100%;\n  float:left;\n  top: 0px;\n  left: 0px;\n  background: transparent !important;\n  overflow: hidden;\n  -webkit-box-align: center;\n  -webkit-align-items: flex-start;\n          align-items: flex-start;\n  -webkit-box-pack: center;\n}\n\n.neighbor-cell {\n  overflow: visible !important;\n}\n\nnav.weex-indicator {\n  position: absolute;\n  z-index: 10;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n  margin: 0;\n  padding: 0;\n  -webkit-box-align: center;\n  -webkit-align-items: center;\n          align-items: center;\n  -webkit-box-pack: center;\n  -webkit-justify-content: center;\n          justify-content: center;\n  -webkit-transform: translate(-10rem, 0px);\n          transform: translate(-10rem, 0px)\n}\n\ndiv.weex-indicator-inner {\n  -webkit-transform: translate(10rem, 0px);\n          transform: translate(10rem, 0px);\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n display: flex; \n}\n\n.weex-indicator-item {\n  display: inline-block;\n  position: relative;\n  border-radius: 50%;\n  width: 0.266667rem;\n  height: 0.266667rem;\n  background-color: #BBBBBB;\n}\n.weex-indicator-item + .weex-indicator-item {\n  margin-left: 0.133333rem;\n}\n\n.weex-indicator-item-active {\n  background-color: blue;\n}",undefined);
+__$styleInject("/*\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements.  See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership.  The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License.  You may obtain a copy of the License at\n *\n *   http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing,\n * software distributed under the License is distributed on an\n * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n * KIND, either express or implied.  See the License for the\n * specific language governing permissions and limitations\n * under the License.\n */\n \n.weex-slider-wrapper {\n  overflow: hidden;\n}\n\n.weex-slider-inner {\n  width: 100%;\n  height: 100%;\n  overflow: visible;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n}\n\n.weex-slider-cell {\n  width: 100%;\n  height: 100%;\n  float:left;\n  top: 0px;\n  left: 0px;\n  background: transparent !important;\n  overflow: hidden;\n  -webkit-box-align: center;\n  -webkit-align-items: flex-start;\n          align-items: flex-start;\n  -webkit-box-pack: center;\n}\n\n.neighbor-cell {\n  overflow: visible !important;\n}\n\nnav.weex-indicator {\n  position: absolute;\n  ;\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n  margin: 0;\n  padding: 0;\n  -webkit-box-align: center;\n  -webkit-align-items: center;\n          align-items: center;\n  -webkit-box-pack: center;\n  -webkit-justify-content: center;\n          justify-content: center;\n  -webkit-transform: translate(-10rem, 0px);\n          transform: translate(-10rem, 0px)\n}\n\ndiv.weex-indicator-inner {\n  -webkit-transform: translate(10rem, 0px);\n          transform: translate(10rem, 0px);\n  -webkit-box-orient: horizontal;\n  -webkit-box-direction: normal;\n  -webkit-flex-direction: row;\n          flex-direction: row;\n display: flex; \n}\n\n.weex-indicator-item {\n  display: inline-block;\n  position: relative;\n  border-radius: 50%;\n  width: 0.266667rem;\n  height: 0.266667rem;\n  background-color: #BBBBBB;\n}\n.weex-indicator-item + .weex-indicator-item {\n  margin-left: 0.133333rem;\n}\n\n.weex-indicator-item-active {\n  background-color: blue;\n}",undefined);
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -10433,6 +10483,13 @@ var dom = {
     var styleText = "@" + key + "{" + stylesText + "}";
     styleText = styleText.replace('local://', 'arkweb://');
     appendCss(styleText, 'dom-added-rules');
+
+    // 记录添加过的字体资源
+    weex.requireModule("weexModule").callNative('fontsHandle', {
+      method: 'addRule',
+      key,
+      styles,
+    }, undefined, undefined, undefined);
   }
 };
 var dom$1 = {
@@ -10440,6 +10497,20 @@ var dom$1 = {
     var extendKeys = weex.utils.extendKeys;
     extendKeys(utils$3, weex.utils, ['camelToKebab', 'appendCss', 'isArray', 'getParentScrollerElement']);
     weex.registerModule('dom', dom);
+
+    // 在二级页面自动加载之前添加过的主题
+    if (!global.addRuleFirst) {
+      global.addRuleFirst = true
+      weex.requireModule("weexModule").callNative('fontsHandle', {
+        method: 'getRules'
+      }, undefined, function(rules){
+        if (rules && Array.isArray(rules)) {
+          rules.forEach(rule=>{
+            dom.addRule(rule.key, rule.styles);
+          })
+        }
+      }, undefined);
+    }
   }
 };
 

package/package.json

@@ -49,5 +49,5 @@
     "type": "git",
     "url": "git+ssh://git@github.com/weexteam/weex-vue-render.git"
   },
-  "version": "0.2.32"
+  "version": "0.2.34"
 }