Merge branch 'feature/couponFree' into 'master'

Feature/coupon free

See merge request !52

app/web/page/editor/component/DynamicForm/component/SwitchBtn/index.vue

@@ -11,10 +11,16 @@
     },
     data() {
       return {
-        switchVal: this.value,
+        switchVal: false,
       }
     },
     watch: {
+      value: {
+        immediate: true,
+        handler(val) {
+          this.switchVal = val;
+        }
+      },
       switchVal(val) {
         this.$emit('input', val);
       }

app/web/page/editor/component/DynamicPageForm/index.ts

@@ -42,6 +42,12 @@ export default class DynamicPageForm extends Mixins(ContextMenuMixin) {
         alpha: false
       }
     },
+    // 支持运营内部福利赛需求，包括优惠券组件也做了处理，如果后期不用，可以考虑下线
+    {
+      key: 'titleUseUrl',
+      name: '从URL中获取标题',
+      type: 'SwitchBtn'
+    },
   ];
   bottomSchema: object[] = [
     {

app/web/page/editor/mixins/contextMenu.mixin.ts

@@ -51,6 +51,7 @@ export default class ContextMenuMixin extends Vue {
     if (!this.curEleIndex && this.curEleIndex !== 0) { return; }
     const elements = this.pageData.elements[this.curEleIndex];
     const component = document.getElementById(elements.id);
+    if (!component || (component && component.commonStyle && component.commonStyle.position === 'absolute')) { return; }
     const height = component ? getStyle(component, 'height') : 0;
     const paddingTop = elements.commonStyle.paddingTop || 0;
     const paddingBottom = elements.commonStyle.paddingBottom || 0;

app/web/page/store/modules/editor/state.ts

@@ -90,6 +90,7 @@ export const defaultState = {
       },
       props: {
         titleBgColor: '#fff',
+        titleUseUrl: false,
         showPageBottomTip: true,
         pageBottomTxt: '没有更多啦～',
         pageBottomColor: '#333',

app/web/service/http.service.ts

@@ -97,7 +97,7 @@ instance.interceptors.request.use(
       if (config.accessToken) { config.headers['Access-Token'] = token; }
     }
     const tenantId = localStorage.get('tenantId') || basicConfig.yxmTenantId || '';
-    config.headers['qg-tenant-id'] = tenantId || '';
+    config.headers['qg-tenant-id'] = tenantId;
     return config;
   },
   error => {

package-lock.json

@@ -2176,9 +2176,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.23",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.23.tgz",
-      "integrity": "sha512-DLE3+htghKm3s0ZNeK8FUWH5ZmOxelQjVcPy1Iic1cSaP3XF3GHBym1S+5r2yh8XvAXmt76vc5ivgxv0EtsVJw==",
+      "version": "0.3.23-beta1",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.23-beta1.tgz",
+      "integrity": "sha512-FZ/Udd865iJY6Qtzcl2paKjB6rMZgytiOrVYDaUj0h/IjD08Z2hrDC3iGBwTPzMqwkBb3Fxjaw0ZDJNIFSPzpg==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -29,7 +29,7 @@
     "@hubcarl/json-typescript-mapper": "^2.0.0",
     "@qg/apollo-nodejs": "^2.1.2",
     "@qg/cherry-ui": "2.23.10",
-    "@qg/citrus-ui": "0.3.23",
+    "@qg/citrus-ui": "0.3.23-beta1",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",