feat(tenant): 组件根据tenantId过滤

app/controller/tenantAuth.ts

@@ -4,6 +4,7 @@ import { omitBy } from 'lodash';
 type GetWhere = {
   id?: number | unknown;
   tenantId?: number | unknown;
+  enable: number;
 };
 
 export default class TenantAuthController extends Controller {
@@ -25,9 +26,15 @@ export default class TenantAuthController extends Controller {
   }
 
   public async get(ctx: Context) {
-    const where: GetWhere = {};
+    const where: GetWhere = {
+      enable: 1,
+    };
     if (ctx.headers['qg-tenant-id']) where.tenantId = ctx.headers['qg-tenant-id'];
-    if (ctx.query.id) where.tenantId = ctx.query.id;
+    if (ctx.query.id) where.id = ctx.query.id;
+    if (!where.tenantId && !where.id) {
+      ctx.body = ctx.helper.ok({});
+      return;
+    }
     try {
       const result = await ctx.model.TenantAuth.findOne({ where });
       ctx.body = ctx.helper.ok(result);

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

@@ -30,6 +30,7 @@ export default class DynamicComponent extends Vue {
         pre[cur.name] = { ...cur, children};
         return pre;
       }, {});
+      this.onHideFinanceTabChange(this.hideFinanceTab);
     } else {
       this.eleConfig = chunk(newVal, 2);
     }

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

@@ -160,7 +160,6 @@ export default class DynamicPageForm extends Mixins(ContextMenuMixin) {
   onAuthStateChange(val) {
     const options = val ? ['购物车', '自定义'] : ['购物车', '分享', '自定义'];
     this.$set(this.floatSchema[1].formControl[0], 'options', options);
-    console.log(this.floatSchema[1].formControl[0].options);
   }
 
   @Watch('pageData', { immediate: true, deep: true })

package-lock.json

@@ -1501,9 +1501,9 @@
       }
     },
     "@qg/citrus-ui": {
-      "version": "0.3.15",
-      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.15.tgz",
-      "integrity": "sha512-r2+TQNexoWy3Gl7egv5cmkA79lyIkWeVLJJt9wQcKzlBXo0vS9HHL/4jHVZJCJpi8ilDavtrjuouQN/aevekmg==",
+      "version": "0.3.17",
+      "resolved": "http://npmprivate.quantgroups.com/@qg%2fcitrus-ui/-/citrus-ui-0.3.17.tgz",
+      "integrity": "sha512-4sF/iTs5ea6PTqObR2dC+IjCAHuJ1qq2W17WOb5UDpbMQywcReK78xxaMiglOyLYB7h1fiHPttsB/SPbF+0rFA==",
       "requires": {
         "@better-scroll/core": "^2.1.1",
         "@qg/cherry-ui": "^2.23.9",

package.json

@@ -27,7 +27,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.15",
+    "@qg/citrus-ui": "0.3.17",
     "@riophae/vue-treeselect": "^0.4.0",
     "@types/lodash": "^4.14.117",
     "@types/node": "^10.12.0",