Skip to content

Commit

Permalink
Merge pull request #1858 from DevCloudFE/dev
Browse files Browse the repository at this point in the history
chore: update main from dev
  • Loading branch information
GreatZPP committed May 26, 2024
2 parents ddadfcc + 36f3672 commit 7c9acbf
Show file tree
Hide file tree
Showing 7 changed files with 8,462 additions and 6,493 deletions.
32 changes: 16 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,32 +5,32 @@
"prepare": "husky install",
"precommit": "lint-staged",
"scripts": "better-scripts",
"dev": "pnpm scripts run dev",
"dev:site": "pnpm scripts run dev:site",
"build": "pnpm scripts run build",
"build:lib": "pnpm scripts run build:lib",
"build:lib:theme": "pnpm scripts run build:lib:theme",
"test": "pnpm scripts run tests.test"
"dev": "pnpm --filter vue-devui dev",
"dev:site": "pnpm --filter vue-devui dev:site",
"build": "pnpm --filter vue-devui build",
"build:lib": "pnpm --filter vue-devui build:lib",
"build:lib:theme": "pnpm --filter vue-devui build:lib:theme",
"test": "pnpm --filter vue-devui tests.test"
},
"devDependencies": {
"@commitlint/cli": "^11.0.0",
"@ls-lint/ls-lint": "^1.10.0",
"@types/lodash": "^4.14.182",
"@types/node": "^16.11.6",
"all-contributors-cli": "^6.20.0",
"better-scripts": "^0.1.1",
"@ls-lint/ls-lint": "^1.11.2",
"@types/lodash": "^4.17.4",
"@types/node": "^16.18.97",
"all-contributors-cli": "^6.26.1",
"better-scripts": "^0.1.4",
"esbuild-register": "^2.6.0",
"eslint": "^7.28.0",
"eslint-plugin-import": "^2.24.2",
"eslint-plugin-vue": "^7.11.1",
"eslint": "^7.32.0",
"eslint-plugin-import": "^2.29.1",
"eslint-plugin-vue": "^7.20.0",
"husky": "^7.0.4",
"intersection-observer": "^0.12.2",
"lint-staged": "^11.0.0",
"lint-staged": "^11.2.6",
"npm-run-all": "^4.1.5",
"stylelint": "^13.13.1",
"stylelint-config-recommended-scss": "^4.3.0",
"stylelint-config-standard": "^22.0.0",
"stylelint-scss": "^3.20.1"
"stylelint-scss": "^3.21.0"
},
"lint-staged": {
"packages/**/{*.vue,*.js,*.ts,*.jsx,*.tsx}": "eslint --fix",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export default defineComponent({
<d-input
v-model={formData.text}
autocomplete='off'
autofocus
maxlength={tag.value.maxLength}
placeholder={tag.value.placeholder || ''}></d-input>
</d-form-item>
Expand Down
2 changes: 1 addition & 1 deletion packages/devui-vue/devui/select/src/select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export default defineComponent({
style={styles.value}
class={props.menuClass}>
<div v-dLoading={isLoading.value} class={dropdownCls}>
<ul class={listCls} v-show={!isLoading.value} ref={dropdownContainer}>
<ul class={listCls} v-show={!isLoading.value && !isShowEmptyText.value} ref={dropdownContainer}>
{isShowCreateOption.value && (
<Option value={filterQuery.value} name={filterQuery.value} create>
{props.multiple ? <Checkbox modelValue={false} label={filterQuery.value} /> : filterQuery.value}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
@import './custom-blocks.scss';
@import './sidebar-links.scss';
@import './demo-block.scss';
@import 'devui-theme/src/theme-collection/extend-theme-vue.scss';
@import '../../devui-theme/src/theme-collection/extend-theme-vue.scss';
2 changes: 1 addition & 1 deletion packages/devui-vue/docs/components/editor-md/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ export default defineComponent({
const fd = new FormData();
fd.append('file', file);
xhr.send(fd);
}).then((res: any) => {
}).then((res) => {
if (res.status === 'success') {
callback({ name: file.name, imgUrl: res['imgUrl'], title: res['imgTitle'] });
} else {
Expand Down
5 changes: 1 addition & 4 deletions packages/devui-vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-devui",
"version": "1.6.18",
"version": "1.6.19",
"license": "MIT",
"description": "DevUI components based on Vite and Vue3",
"keywords": [
Expand Down Expand Up @@ -88,12 +88,9 @@
"@commitlint/config-conventional": "^11.0.0",
"@docsearch/css": "^3.3.0",
"@docsearch/js": "^3.3.0",
"@types/chalk": "^2.2.0",
"@types/commander": "^2.12.2",
"@types/jest": "^26.0.24",
"@types/markdown-it": "^12.2.3",
"@types/node": "^16.11.6",
"@types/ora": "^3.2.0",
"@typescript-eslint/eslint-plugin": "^4.27.0",
"@typescript-eslint/parser": "^4.27.0",
"@vitejs/plugin-vue": "^1.3.0",
Expand Down
Loading

0 comments on commit 7c9acbf

Please sign in to comment.