From eebd1002b37b1926a9ec2bd323c4887acbe344f1 Mon Sep 17 00:00:00 2001 From: "Zhenfei.Li" Date: Wed, 11 Jan 2023 15:06:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20fix:=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .eslintrc | 6 +++--- es6.js | 4 +++- src/core/index.js | 2 +- src/core/wrapper/layout/flex/flex.vertical.js | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.eslintrc b/.eslintrc index f5b262e6e..a2c317000 100644 --- a/.eslintrc +++ b/.eslintrc @@ -41,8 +41,8 @@ }, { "files": ["webpack/*.js", "./*.js", "lib/**/*.js", "lib/*.js", "./bin/*.js", "./bin/**/*.js"], "extends": "plugin:@fui/esnext" - }, { - "files": ["types/*.ts", "typescript/*.ts","typescript/**/*.ts"], - "extends": "plugin:@fui/typescript" + // }, { + // "files": ["types/*.ts", "typescript/*.ts","typescript/**/*.ts"], + // "extends": "plugin:@fui/typescript" }] } diff --git a/es6.js b/es6.js index 7b7734593..d067c861a 100644 --- a/es6.js +++ b/es6.js @@ -155,7 +155,9 @@ ${M} } `; - const prettierCode = prettier.format(outputCode); + const prettierCode = prettier.format(outputCode, { + tabWidth: 4, + }); fs.writeFileSync(srcName, prettierCode); await fix(srcName); diff --git a/src/core/index.js b/src/core/index.js index c8ea3d91a..d3a64ffc7 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -32,9 +32,9 @@ export * from "./structure"; export * from "./h"; export * from "./constant"; export * from "./logic"; -export * from "./utils"; export * from "./wrapper"; export * from "./platform/web"; +export * from "./utils"; export { StyleLoaderManager, diff --git a/src/core/wrapper/layout/flex/flex.vertical.js b/src/core/wrapper/layout/flex/flex.vertical.js index 7847d7009..fefc7abad 100644 --- a/src/core/wrapper/layout/flex/flex.vertical.js +++ b/src/core/wrapper/layout/flex/flex.vertical.js @@ -11,6 +11,8 @@ import { Layout } from "../../layout"; */ @shortcut() export class FlexVerticalLayout extends Layout { + static xtype = "bi.flex_vertical"; + props() { return extend(super.props(...arguments), { baseCls: "bi-f-v",