Skip to content

Commit

Permalink
Merge pull request #105 from Jzow/master
Browse files Browse the repository at this point in the history
Fix incompatible mitt library version is compatible with vue version
  • Loading branch information
suyuan32 authored Sep 11, 2023
2 parents 3bf1b3e + 8798bd8 commit 4e01ac8
Show file tree
Hide file tree
Showing 74 changed files with 177 additions and 86 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/eslint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: ESLint

on:
push:
branches: ["master", "dev"]
pull_request:
branches: ["master", "dev"]
schedule:
- cron: '28 1 * * * 0'

jobs:
eslint:
name: Run eslint scanning
runs-on: ubuntu-latest
permissions:
contents: read
security-events: write
actions: read

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Install ESLint
run: |
pnpm install eslint@8.10.0
pnpm install @microsoft/eslint-formatter-sarif@2.1.7
- name: Run ESLint
run: |
pnpx eslint .
--config .eslintrc.js
--ext .js,.jsx,.ts,.tsx
--format @microsoft/eslint-formatter-sarif
--output-file eslint-results.sarif
continue-on-error: true

- name: Upload analysis results to GitHub
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: eslint-results.sarif

- name: Wait for processing
run: echo "Waiting for analysis results to be processed..."
33 changes: 33 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Node.js CI

on:
push:
branches: [master, dev]
pull_request:
branches: [master, dev]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x, 18.x]

steps:
- name: Checkout code
uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Install pnpm
run: npm install -g pnpm

- name: Install dependencies
run: pnpm install

- name: Build
run: pnpm build
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -104,3 +104,6 @@ dist

# vscode private configuration file
.vscode/redis.json

# webstorm idea
.idea
2 changes: 1 addition & 1 deletion src/components/Application/src/AppDarkModeToggle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
}
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-dark-switch';
@prefix-cls: ~'@{name-space}-dark-switch';
html[data-theme='dark'] {
.@{prefix-cls} {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Application/src/AppLogo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
}
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-app-logo';
@prefix-cls: ~'@{name-space}-app-logo';
.@{prefix-cls} {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Application/src/search/AppSearchFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
const { t } = useI18n();
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-app-search-footer';
@prefix-cls: ~'@{name-space}-app-search-footer';
.@{prefix-cls} {
display: flex;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Application/src/search/AppSearchModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@
}
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-app-search-modal';
@footer-prefix-cls: ~'@{namespace}-app-search-footer';
@prefix-cls: ~'@{name-space}-app-search-modal';
@footer-prefix-cls: ~'@{name-space}-app-search-footer';
.@{prefix-cls} {
display: flex;
position: fixed;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Basic/src/BasicArrow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
});
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-basic-arrow';
@prefix-cls: ~'@{name-space}-basic-arrow';
.@{prefix-cls} {
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Basic/src/BasicHelp.vue
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-basic-help';
@prefix-cls: ~'@{name-space}-basic-help';
.@{prefix-cls} {
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Basic/src/BasicTitle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
]);
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-basic-title';
@prefix-cls: ~'@{name-space}-basic-title';
[data-theme='dark'] {
.@{prefix-cls} {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
</script>

<style lang="less">
@prefix-cls: ~'@{namespace}-collapse-container';
@prefix-cls: ~'@{name-space}-collapse-container';
[data-theme='dark'] {
.@{prefix-cls} {
Expand Down
2 changes: 1 addition & 1 deletion src/components/CountDown/src/CountdownInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-countdown-input';
@prefix-cls: ~'@{name-space}-countdown-input';
.@{prefix-cls} {
.ant-input-group-addon {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Cropper/src/CopperModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@
</script>

<style lang="less">
@prefix-cls: ~'@{namespace}-cropper-am';
@prefix-cls: ~'@{name-space}-cropper-am';
.@{prefix-cls} {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Cropper/src/Cropper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-cropper-image';
@prefix-cls: ~'@{name-space}-cropper-image';
.@{prefix-cls} {
&--circled {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Cropper/src/CropperAvatar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
</script>

<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-cropper-avatar';
@prefix-cls: ~'@{name-space}-cropper-avatar';
.@{prefix-cls} {
display: inline-block;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Drawer/src/BasicDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@
<style lang="less">
@header-height: 60px;
@detail-header-height: 40px;
@prefix-cls: ~'@{namespace}-basic-drawer';
@prefix-cls-detail: ~'@{namespace}-basic-drawer__detail';
@prefix-cls: ~'@{name-space}-basic-drawer';
@prefix-cls-detail: ~'@{name-space}-basic-drawer__detail';
[data-theme='dark'] {
.@{prefix-cls} {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Drawer/src/components/DrawerFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
</script>

<style lang="less">
@prefix-cls: ~'@{namespace}-basic-drawer-footer';
@prefix-cls: ~'@{name-space}-basic-drawer-footer';
@footer-height: 60px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Drawer/src/components/DrawerHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
</script>

<style lang="less">
@prefix-cls: ~'@{namespace}-basic-drawer-header';
@prefix-cls: ~'@{name-space}-basic-drawer-header';
@footer-height: 60px;
.@{prefix-cls} {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/components/FlowChart/src/FlowChartToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-flow-chart-toolbar';
@prefix-cls: ~'@{name-space}-flow-chart-toolbar';
[data-theme='dark'] {
// .lf-dnd {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Form/src/BasicForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-basic-form';
@prefix-cls: ~'@{name-space}-basic-form';
.@{prefix-cls} {
.ant-form-item {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Icon/src/IconPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
}
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-icon-picker';
@prefix-cls: ~'@{name-space}-icon-picker';
.@{prefix-cls} {
.ant-input-group-addon {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Icon/src/SvgIcon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
});
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-svg-icon';
@prefix-cls: ~'@{name-space}-svg-icon';
.@{prefix-cls} {
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Menu/src/index.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@basic-menu-prefix-cls: ~'@{namespace}-basic-menu';
@basic-menu-prefix-cls: ~'@{name-space}-basic-menu';

.app-top-menu-popup {
min-width: 150px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Modal/src/components/ModalClose.vue
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-basic-modal-close';
@prefix-cls: ~'@{name-space}-basic-modal-close';
.@{prefix-cls} {
display: flex;
align-items: center;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Page/src/PageFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
});
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-page-footer';
@prefix-cls: ~'@{name-space}-page-footer';
.@{prefix-cls} {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Page/src/PageWrapper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-page-wrapper';
@prefix-cls: ~'@{name-space}-page-wrapper';
[data-theme='dark'] {
.@{prefix-cls} {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Preview/src/Preview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-image-preview';
@prefix-cls: ~'@{name-space}-image-preview';
.@{prefix-cls} {
.ant-image {
Expand Down
6 changes: 3 additions & 3 deletions src/components/SimpleMenu/src/components/menu.less
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@menu-prefix-cls: ~'@{namespace}-menu';
@menu-popup-prefix-cls: ~'@{namespace}-menu-popup';
@submenu-popup-prefix-cls: ~'@{namespace}-menu-submenu-popup';
@menu-prefix-cls: ~'@{name-space}-menu';
@menu-popup-prefix-cls: ~'@{name-space}-menu-popup';
@submenu-popup-prefix-cls: ~'@{name-space}-menu-submenu-popup';

@transition-time: 0.2s;
@menu-dark-subsidiary-color: rgba(255, 255, 255, 0.7);
Expand Down
4 changes: 2 additions & 2 deletions src/components/SimpleMenu/src/index.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@simple-prefix-cls: ~'@{namespace}-simple-menu';
@prefix-cls: ~'@{namespace}-menu';
@simple-prefix-cls: ~'@{name-space}-simple-menu';
@prefix-cls: ~'@{name-space}-menu';

.@{prefix-cls} {
&-dark&-vertical .@{simple-prefix-cls}__parent {
Expand Down
2 changes: 1 addition & 1 deletion src/components/StrengthMeter/src/StrengthMeter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
});
</script>
<style lang="less" scoped>
@prefix-cls: ~'@{namespace}-strength-meter';
@prefix-cls: ~'@{name-space}-strength-meter';
.@{prefix-cls} {
&-bar {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Table/src/BasicTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
<style lang="less">
@border-color: #cecece4d;
@prefix-cls: ~'@{namespace}-basic-table';
@prefix-cls: ~'@{name-space}-basic-table';
[data-theme='dark'] {
.@{prefix-cls} {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Table/src/components/HeaderCell.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-basic-table-header-cell';
@prefix-cls: ~'@{name-space}-basic-table-header-cell';
.@{prefix-cls} {
&__help {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Table/src/components/TableAction.vue
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-basic-table-action';
@prefix-cls: ~'@{name-space}-basic-table-action';
.@{prefix-cls} {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Table/src/components/TableHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-basic-table-header';
@prefix-cls: ~'@{name-space}-basic-table-header';
.@{prefix-cls} {
&__toolbar {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Table/src/components/TableImg.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-basic-table-img';
@prefix-cls: ~'@{name-space}-basic-table-img';
.@{prefix-cls} {
.ant-image {
Expand Down
2 changes: 1 addition & 1 deletion src/components/Table/src/components/TableTitle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-basic-table-title';
@prefix-cls: ~'@{name-space}-basic-table-title';
.@{prefix-cls} {
display: flex;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@
});
</script>
<style lang="less">
@prefix-cls: ~'@{namespace}-editable-cell';
@prefix-cls: ~'@{name-space}-editable-cell';
.edit-cell-align-left {
text-align: left;
Expand Down
Loading

0 comments on commit 4e01ac8

Please sign in to comment.