diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index f964a33..d342556 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ jobs: - name: Setup Node.js v14.x uses: actions/setup-node@v1 with: - node-version: "14.x" + node-version: '14.x' - name: Install run: npm install @@ -27,3 +27,4 @@ jobs: publish_dir: ./dist personal_token: ${{ secrets.PERSONAL_TOKEN }} commit_message: Update ghPages + force_orphan: true diff --git a/package.json b/package.json index a3e4a89..0802d89 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "@commitlint/cli": "^12.1.4", "@commitlint/config-conventional": "^12.1.4", "@types/node": "^15.12.2", - "@typescript-eslint/eslint-plugin": "^4.26.1", - "@typescript-eslint/parser": "^4.26.1", + "@typescript-eslint/eslint-plugin": "^4.27.0", + "@typescript-eslint/parser": "^4.27.0", "@vitejs/plugin-legacy": "^1.4.1", "@vitejs/plugin-vue": "^1.2.3", "@vitejs/plugin-vue-jsx": "^1.1.5", @@ -57,12 +57,12 @@ "eslint-plugin-import": "^2.23.4", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-vue": "^7.11.1", - "gh-pages": "^3.2.0", + "gh-pages": "^3.2.1", "husky": "^6.0.0", "lint-staged": "^11.0.0", "prettier": "^2.3.1", "pretty-quick": "^3.1.0", - "sass": "1.34.1", + "sass": "1.35.0", "stylelint": "^13.13.1", "stylelint-config-prettier": "^8.0.2", "stylelint-config-standard": "^22.0.0", diff --git a/src/packages/base-widgets/swipe/index.tsx b/src/packages/base-widgets/swipe/index.tsx index 8d77e25..c831d23 100644 --- a/src/packages/base-widgets/swipe/index.tsx +++ b/src/packages/base-widgets/swipe/index.tsx @@ -1,9 +1,9 @@ /* * @Author: 卜启缘 * @Date: 2021-06-14 12:24:12 - * @LastEditTime: 2021-06-14 18:48:44 + * @LastEditTime: 2021-06-14 21:19:28 * @LastEditors: 卜启缘 - * @Description: + * @Description: 轮播图组件 * @FilePath: \vite-vue3-lowcode\src\packages\base-widgets\swipe\index.tsx */ import { Swipe, SwipeItem } from 'vant' @@ -33,7 +33,11 @@ export default { const { registerRef } = useGlobalProperties() return ( - registerRef(el, block._vid)} {...props}> + registerRef(el, block._vid)} + {...props} + style={{ height: `${props.height}px` }} + > {props.images?.map((item) => ( <> diff --git a/src/packages/base-widgets/switch/index.tsx b/src/packages/base-widgets/switch/index.tsx index d043213..d13c35d 100644 --- a/src/packages/base-widgets/switch/index.tsx +++ b/src/packages/base-widgets/switch/index.tsx @@ -17,6 +17,7 @@ export default { return ( - +