Skip to content

Commit

Permalink
chore: update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
buqiyuan committed Jan 29, 2022
1 parent 0d2ad2f commit e26fd98
Show file tree
Hide file tree
Showing 22 changed files with 945 additions and 1,044 deletions.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
> 1%
last 2 versions
not dead
not ie 11
15 changes: 8 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@
"test:br": "npx http-server dist --cors --brotli -c-1"
},
"dependencies": {
"@ant-design/icons-vue": "^6.0.1",
"@vueuse/core": "^7.5.5",
"ant-design-vue": "3.0.0-beta.8",
"ant-design-vue": "3.0.0-beta.9",
"axios": "^0.25.0",
"core-js": "^3.20.3",
"dayjs": "^1.10.7",
Expand All @@ -36,20 +37,20 @@
"mitt": "^3.0.0",
"mockjs": "^1.1.0",
"nprogress": "^1.0.0-1",
"pinia": "2.0.9",
"pinia": "2.0.10",
"qs": "^6.10.3",
"socket.io-client": "4.4.1",
"sortablejs": "^1.14.0",
"vue": "^3.2.29",
"vue-i18n": "^9.2.0-beta.29",
"vue-i18n": "^9.2.0-beta.30",
"vue-router": "^4.0.12",
"xlsx": "^0.17.5"
},
"devDependencies": {
"@commitlint/cli": "^16.1.0",
"@commitlint/config-conventional": "^16.0.0",
"@types/lodash-es": "^4.17.5",
"@types/node": "^17.0.12",
"@types/node": "^17.0.13",
"@types/webpack-env": "^1.16.3",
"@typescript-eslint/eslint-plugin": "^5.10.1",
"@typescript-eslint/parser": "^5.10.1",
Expand All @@ -65,14 +66,14 @@
"commitizen": "^4.2.4",
"compression-webpack-plugin": "^9.2.0",
"conventional-changelog-cli": "^2.2.2",
"eslint": "^8.7.0",
"eslint": "^8.8.0",
"eslint-config-prettier": "^8.3.0",
"eslint-plugin-prettier": "^4.0.0",
"eslint-plugin-vue": "^8.3.0",
"eslint-plugin-vue": "^8.4.0",
"husky": "^7.0.4",
"less": "^4.1.2",
"less-loader": "10.2.0",
"lint-staged": "^12.3.1",
"lint-staged": "^12.3.2",
"path-browserify": "^1.0.1",
"postcss-html": "^1.3.0",
"prettier": "^2.5.1",
Expand Down
2 changes: 1 addition & 1 deletion src/components/basic/button/button.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<script lang="ts" setup>
import { Button } from 'ant-design-vue';
import { computed, type PropType } from 'vue';
import buttonProps, { type ButtonType } from 'ant-design-vue/lib/button/buttonTypes';
import buttonProps, { type ButtonType } from 'ant-design-vue/es/button/buttonTypes';
const props = defineProps({
...buttonProps(),
Expand Down
2 changes: 1 addition & 1 deletion src/components/basic/button/styles/setButtonColor.less
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../../../../node_modules/ant-design-vue/lib/style/themes/default';
@import '../../../../../node_modules/ant-design-vue/es/style/themes/default';
@import '../../../../../node_modules/ant-design-vue/es/button/style/mixin';

.button-variant(@color; @background) {
Expand Down
2 changes: 1 addition & 1 deletion src/components/basic/check-box/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<script lang="ts" setup>
import { computed } from 'vue';
import { Checkbox } from 'ant-design-vue';
import { checkboxProps } from 'ant-design-vue/lib/checkbox';
import { checkboxProps } from 'ant-design-vue/es/checkbox';
import { omit } from 'lodash-es';
const props = defineProps({
Expand Down
4 changes: 2 additions & 2 deletions src/components/basic/image-preview/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { type PropType, defineComponent, ref, computed, watchEffect } from 'vue';
import { Image, type ImageProps } from 'ant-design-vue';
import { imageProps } from 'ant-design-vue/lib/image';
import { type ImagePreviewType } from 'ant-design-vue/lib/vc-image/src/Image';
import { imageProps } from 'ant-design-vue/es/image';
import { type ImagePreviewType } from 'ant-design-vue/es/vc-image/src/Image';
import { omit } from 'lodash-es';

interface PreviewType extends ImagePreviewType {
Expand Down
2 changes: 1 addition & 1 deletion src/components/basic/progress/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<script lang="ts" setup>
import { computed, PropType } from 'vue';
import { Progress } from 'ant-design-vue';
import { progressProps, type ProgressProps } from 'ant-design-vue/lib/progress/props';
import { progressProps, type ProgressProps } from 'ant-design-vue/es/progress/props';
type StrokeColorType = ProgressProps['strokeColor'];
type StrokeColorFn = (percent) => StrokeColorType;
Expand Down
1 change: 1 addition & 0 deletions src/components/core/draggable-modal/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
<script lang="ts" setup>
import { ref, watch, nextTick } from 'vue';
import { Modal, Space } from 'ant-design-vue';
// import { modalProps } from 'ant-design-vue/es/modal/Modal';
import { CloseOutlined, FullscreenOutlined, FullscreenExitOutlined } from '@ant-design/icons-vue';
import { useVModel } from '@vueuse/core';
import { throttle } from 'lodash-es';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<script lang="ts" setup>
import { ref } from 'vue';
import { Tooltip, Dropdown, Menu } from 'ant-design-vue';
import type { TableProps } from 'ant-design-vue/lib/table/Table';
import type { TableProps } from 'ant-design-vue/es/table/Table';
import { ColumnHeightOutlined } from '@ant-design/icons-vue';
import { useTableContext } from '../../hooks/useTableContext';
Expand Down
2 changes: 1 addition & 1 deletion src/components/core/dynamic-table/hooks/usePagination.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ref } from 'vue';
// import Pagination from 'ant-design-vue/lib/pagination/Pagination'
// import Pagination from 'ant-design-vue/es/pagination/Pagination'
import type { TableProps } from 'ant-design-vue';
import { useI18n } from 'vue-i18n';

Expand Down
2 changes: 1 addition & 1 deletion src/components/core/dynamic-table/props.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { PropType, ExtractPropTypes } from 'vue';
import { tableProps } from 'ant-design-vue/lib/table';
import { tableProps } from 'ant-design-vue/es/table';
import type { FormProps } from 'ant-design-vue';
import type { BookType } from 'xlsx';
import type { LoadDataParams, TableColumn, OnChangeCallbackParams } from './typing';
Expand Down
2 changes: 1 addition & 1 deletion src/components/core/dynamic-table/types/tableAction.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { PopconfirmProps } from 'ant-design-vue/es/popconfirm';
import type { ButtonProps, TooltipProps } from 'ant-design-vue/lib/components';
import type { ButtonProps, TooltipProps } from 'ant-design-vue/es/components';
import { ColumnParams } from '../typing';
import type { PermissionType } from '@/core/permission/modules/types';

Expand Down
2 changes: 1 addition & 1 deletion src/components/core/schema-form/helper.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { ValidationRule } from 'ant-design-vue/lib/form/Form';
import type { ValidationRule } from 'ant-design-vue/es/form/Form';
import type { ComponentMapType } from './types';
import { isNumber } from '@/utils/is';
import dayjs from 'dayjs';
Expand Down
4 changes: 2 additions & 2 deletions src/components/core/schema-form/schema-form-item.vue
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@
import { PropType, Ref } from 'vue';
import { computed, unref, toRefs, onMounted } from 'vue';
import { Form, Col, Spin } from 'ant-design-vue';
import type { ValidationRule } from 'ant-design-vue/lib/form/Form';
import type { ValidationRule } from 'ant-design-vue/es/form/Form';
import { componentMap, ComponentMapType } from './componentMap';
import { FormItemSchema, FormSchema } from './types/form';
import { isFunction, isNull, isString } from '@/utils/is';
import { useVModel } from '@vueuse/core';
import { useItemLabelWidth } from './hooks/useLabelWidth';
import cloneDeep from 'lodash/cloneDeep';
import { cloneDeep } from 'lodash-es';
import { createPlaceholderMessage } from './helper';
import BasicHelp from '@/components/basic/basic-help/index.vue';
import { AllComponentProps } from './types';
Expand Down
4 changes: 2 additions & 2 deletions src/components/core/schema-form/schema-form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
getCurrentInstance,
} from 'vue';
import { Form, Row } from 'ant-design-vue';
import { formProps } from 'ant-design-vue/lib/form';
import { formProps } from 'ant-design-vue/es/form';
import { isNullOrUnDef, isObject, isArray, isFunction, isBoolean, isString } from '@/utils/is';
import { deepMerge } from '@/utils/';
import SchemaFormItem from './schema-form-item.vue';
import type { FormItemSchema, FormSchema, FormActionType } from './types/form';
import { NamePath } from 'ant-design-vue/lib/form/interface';
import { NamePath } from 'ant-design-vue/es/form/interface';
import { uniqBy, cloneDeep } from 'lodash-es';
import { dateItemType, handleInputNumberValue } from './helper';
import dayjs from 'dayjs';
Expand Down
6 changes: 3 additions & 3 deletions src/components/core/schema-form/types/form.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import type { NamePath, RuleObject } from 'ant-design-vue/lib/form/interface';
import type { NamePath, RuleObject } from 'ant-design-vue/es/form/interface';
import type { FormItemProps } from './formItem';
import type { Component, VNode } from 'vue';
// import type { ButtonProps as AntdButtonProps } from '/@/components/Button'
import type { ColEx, ComponentMapType, ComponentProps } from './index';
// import type { TableActionType } from '/@/components/Table/src/types/table'
import type { CSSProperties } from 'vue';
import type { RowProps } from 'ant-design-vue/lib/grid/Row';
import type { FormProps } from 'ant-design-vue/lib/form';
import type { RowProps } from 'ant-design-vue/es/grid/Row';
import type { FormProps } from 'ant-design-vue/es/form';

export type { FormProps, RowProps };

Expand Down
4 changes: 2 additions & 2 deletions src/components/core/schema-form/types/formItem.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { FormItemProps as AntdFormItemProps } from 'ant-design-vue/lib/form/FormItem';
import type { FormItemProps as AntdFormItemProps } from 'ant-design-vue/es/form/FormItem';
import type { HTMLAttributes } from 'vue';
import type { ColProps } from 'ant-design-vue/lib/grid/Col';
import type { ColProps } from 'ant-design-vue/es/grid/Col';

export interface FormItemProps extends AntdFormItemProps {
labelCol?: ColProps & HTMLAttributes;
Expand Down
2 changes: 1 addition & 1 deletion src/core/permission/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* path -> ./modules/sys/user
* <a-button v-if="$auth('sysUser.add')">Button</a-button>
*/
// import type { DataNode } from 'rc-tree-select/lib/interface'
// import type { DataNode } from 'rc-tree-select/es/interface'

import type { TreeSelectProps } from 'ant-design-vue';
import type { App } from 'vue';
Expand Down
2 changes: 1 addition & 1 deletion src/core/permission/utils.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { TreeDataItem as ATreeDataItem } from 'ant-design-vue/lib/tree/Tree';
import type { TreeDataItem as ATreeDataItem } from 'ant-design-vue/es/tree/Tree';

export interface TreeDataItem extends ATreeDataItem {
children: any;
Expand Down
3 changes: 1 addition & 2 deletions src/core/socket/socket-io.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { isEmpty, isFunction } from 'lodash-es';
import IO from 'socket.io-client';
import type { Socket } from 'socket.io-client';
import IO, { type Socket } from 'socket.io-client';
import { useUserStore } from '@/store/modules/user';
import { useWsStore } from '@/store/modules/ws';

Expand Down
2 changes: 1 addition & 1 deletion src/views/system/permission/role/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

<script lang="ts" setup>
import { ref } from 'vue';
import type { TreeDataItem } from 'ant-design-vue/lib/tree/Tree';
import type { TreeDataItem } from 'ant-design-vue/es/tree/Tree';
import {
getRoleListByPage,
updateRole,
Expand Down
Loading

0 comments on commit e26fd98

Please sign in to comment.