🔱: [client] sync upgrade with 6 commits [trident-sync]

chore:
feat: antdv4 支持
perf: 升级依赖版本
Merge remote-tracking branch 'origin/main'
chore: antdv4 start
pull/14/head
GitHub Actions Bot 2023-08-04 19:23:57 +00:00
parent b8eb27441c
commit d5eb4a1900
6 changed files with 57 additions and 59 deletions

View File

@ -24,96 +24,96 @@
"dependencies": { "dependencies": {
"@ant-design/colors": "^7.0.0", "@ant-design/colors": "^7.0.0",
"@ant-design/icons-vue": "^6.1.0", "@ant-design/icons-vue": "^6.1.0",
"@aws-sdk/client-s3": "^3.292.0", "@aws-sdk/client-s3": "^3.383.0",
"@aws-sdk/s3-request-presigner": "^3.292.0", "@aws-sdk/s3-request-presigner": "^3.383.0",
"@fast-crud/fast-crud": "^1.14.7", "@fast-crud/fast-crud": "^1.14.7",
"@fast-crud/fast-extends": "^1.14.7", "@fast-crud/fast-extends": "^1.14.7",
"@fast-crud/ui-antdv": "^1.14.7", "@fast-crud/ui-antdv": "^1.14.7",
"@fast-crud/ui-interface": "^1.14.7", "@fast-crud/ui-interface": "^1.14.7",
"@iconify/iconify": "^3.1.0", "@iconify/iconify": "^3.1.1",
"@iconify/json": "^2.2.35", "@iconify/json": "^2.2.98",
"@purge-icons/generated": "^0.9.0", "@purge-icons/generated": "^0.9.0",
"@soerenmartius/vue3-clipboard": "^0.1.2", "@soerenmartius/vue3-clipboard": "^0.1.2",
"ant-design-vue": "^3.2.15", "ant-design-vue": "^3.2.20",
"axios": "^1.3.4", "axios": "^1.3.4",
"axios-mock-adapter": "^1.21.2", "axios-mock-adapter": "^1.21.2",
"base64-js": "^1.5.1", "base64-js": "^1.5.1",
"better-scroll": "^2.5.0", "better-scroll": "^2.5.1",
"china-division": "^2.6.0", "china-division": "^2.6.1",
"core-js": "^3.29.1", "core-js": "^3.32.0",
"cos-js-sdk-v5": "^1.4.16", "cos-js-sdk-v5": "^1.4.19",
"cropperjs": "^1.5.13", "cropperjs": "^1.5.13",
"dayjs": "^1.11.7", "dayjs": "^1.11.9",
"highlight.js": "^11.7.0", "highlight.js": "^11.8.0",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"mitt": "^3.0.0", "mitt": "^3.0.1",
"nprogress": "^0.2.0", "nprogress": "^0.2.0",
"object-assign": "^4.1.1", "object-assign": "^4.1.1",
"pinia": "2.0.33", "pinia": "2.1.6",
"qiniu-js": "^3.4.1", "qiniu-js": "^3.4.1",
"sortablejs": "^1.15.0", "sortablejs": "^1.15.0",
"vue": "^3.2.47", "vue": "^3.3.4",
"vue-cropperjs": "^5.0.0", "vue-cropperjs": "^5.0.0",
"vue-i18n": "^9.2.2", "vue-i18n": "^9.2.2",
"vue-router": "^4.1.6", "vue-router": "^4.2.4",
"vuedraggable": "^2.24.3" "vuedraggable": "^2.24.3"
}, },
"devDependencies": { "devDependencies": {
"@rollup/plugin-commonjs": "^24.0.1", "@rollup/plugin-commonjs": "^25.0.3",
"@rollup/plugin-node-resolve": "^15.0.1", "@rollup/plugin-node-resolve": "^15.1.0",
"@types/chai": "^4.3.4", "@types/chai": "^4.3.5",
"@types/lodash-es": "^4.17.7", "@types/lodash-es": "^4.17.8",
"@types/mocha": "^10.0.1", "@types/mocha": "^10.0.1",
"@types/node": "^18.15.3", "@types/node": "^20.4.7",
"@types/nprogress": "^0.2.0", "@types/nprogress": "^0.2.0",
"@typescript-eslint/eslint-plugin": "^5.55.0", "@typescript-eslint/eslint-plugin": "^6.2.1",
"@typescript-eslint/parser": "^5.55.0", "@typescript-eslint/parser": "^6.2.1",
"@vitejs/plugin-legacy": "^4.0.2", "@vitejs/plugin-legacy": "^4.1.1",
"@vitejs/plugin-vue": "^4.1.0", "@vitejs/plugin-vue": "^4.2.3",
"@vitejs/plugin-vue-jsx": "^3.0.0", "@vitejs/plugin-vue-jsx": "^3.0.1",
"@vue/compiler-sfc": "^3.2.47", "@vue/compiler-sfc": "^3.3.4",
"@vue/eslint-config-typescript": "^11.0.2", "@vue/eslint-config-typescript": "^11.0.3",
"@vue/test-utils": "^2.3.1", "@vue/test-utils": "^2.4.1",
"autoprefixer": "^10.4.14", "autoprefixer": "^10.4.14",
"caller-path": "^4.0.0", "caller-path": "^4.0.0",
"chai": "^4.3.7", "chai": "^4.3.7",
"dependency-cruiser": "^12.11.0", "dependency-cruiser": "^13.1.1",
"dot": "^1.1.3", "dot": "^1.1.3",
"eslint": "8.36.0", "eslint": "8.46.0",
"eslint-config-prettier": "^8.7.0", "eslint-config-prettier": "^8.10.0",
"eslint-plugin-import": "^2.27.5", "eslint-plugin-import": "^2.28.0",
"eslint-plugin-node": "^11.1.0", "eslint-plugin-node": "^11.1.0",
"eslint-plugin-prettier": "^4.2.1", "eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-promise": "^6.1.1", "eslint-plugin-promise": "^6.1.1",
"eslint-plugin-vue": "^9.9.0", "eslint-plugin-vue": "^9.16.1",
"esno": "^0.16.3", "esno": "^0.17.0",
"husky": "^8.0.3", "husky": "^8.0.3",
"less": "^4.1.3", "less": "^4.1.3",
"less-loader": "^11.1.0", "less-loader": "^11.1.3",
"lint-staged": "^13.2.0", "lint-staged": "^13.2.3",
"postcss": "^8.4.21", "postcss": "^8.4.27",
"prettier": "2.8.4", "prettier": "3.0.1",
"pretty-quick": "^3.1.3", "pretty-quick": "^3.1.3",
"rimraf": "^4.4.0", "rimraf": "^5.0.1",
"rollup": "^3.19.1", "rollup": "^3.27.2",
"rollup-plugin-visualizer": "^5.9.0", "rollup-plugin-visualizer": "^5.9.2",
"stylelint": "^15.2.0", "stylelint": "^15.10.2",
"stylelint-config-prettier": "^9.0.5", "stylelint-config-prettier": "^9.0.5",
"stylelint-order": "^6.0.3", "stylelint-order": "^6.0.3",
"tailwindcss": "^3.2.7", "tailwindcss": "^3.3.3",
"terser": "^5.16.6", "terser": "^5.19.2",
"ts-node": "^10.9.1", "ts-node": "^10.9.1",
"typescript": "4.9.5", "typescript": "5.1.6",
"unplugin-vue-define-options": "^1.2.4", "unplugin-vue-define-options": "^1.3.14",
"vite": "^4.2.0", "vite": "^4.4.8",
"vite-plugin-compression": "^0.5.1", "vite-plugin-compression": "^0.5.1",
"vite-plugin-optimize-persist": "^0.1.2", "vite-plugin-optimize-persist": "^0.1.2",
"vite-plugin-package-config": "^0.1.1", "vite-plugin-package-config": "^0.1.1",
"vite-plugin-purge-icons": "^0.9.2", "vite-plugin-purge-icons": "^0.9.2",
"vite-plugin-theme": "^0.8.6", "vite-plugin-theme": "^0.8.6",
"vite-plugin-windicss": "^1.8.10", "vite-plugin-windicss": "^1.9.0",
"vue-eslint-parser": "^9.1.0", "vue-eslint-parser": "^9.3.1",
"vue-tsc": "^1.2.0", "vue-tsc": "^1.8.8",
"windicss": "^3.5.6" "windicss": "^3.5.6"
}, },
"husky": { "husky": {

View File

@ -1,5 +1,4 @@
import { request, requestForMock } from "/src/api/service"; import { request, requestForMock } from "/src/api/service";
// import "/src/mock";
import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, useUi } from "@fast-crud/fast-crud"; import { ColumnCompositionProps, CrudOptions, FastCrud, PageQuery, PageRes, setLogger, TransformResProps, useColumns, UseCrudProps, UserPageQuery, useTypes, useUi } from "@fast-crud/fast-crud";
import "@fast-crud/fast-crud/dist/style.css"; import "@fast-crud/fast-crud/dist/style.css";
import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader } from "@fast-crud/fast-extends"; import { FsExtendsCopyable, FsExtendsEditor, FsExtendsJson, FsExtendsTime, FsExtendsUploader } from "@fast-crud/fast-extends";
@ -9,7 +8,6 @@ import _ from "lodash-es";
import { useCrudPermission } from "../permission"; import { useCrudPermission } from "../permission";
import { GetSignedUrl } from "/@/views/crud/component/uploader/s3/api"; import { GetSignedUrl } from "/@/views/crud/component/uploader/s3/api";
import { notification } from "ant-design-vue"; import { notification } from "ant-design-vue";
import { useI18n } from "vue-i18n";
function install(app: any, options: any = {}) { function install(app: any, options: any = {}) {
app.use(UiAntdv); app.use(UiAntdv);
@ -30,8 +28,6 @@ function install(app: any, options: any = {}) {
*/ */
commonOptions(props: UseCrudProps): CrudOptions { commonOptions(props: UseCrudProps): CrudOptions {
const crudBinding = props.crudExpose?.crudBinding; const crudBinding = props.crudExpose?.crudBinding;
const { ui } = useUi();
const { t } = useI18n();
const opts: CrudOptions = { const opts: CrudOptions = {
table: { table: {
size: "small", size: "small",

View File

@ -1,6 +1,6 @@
import { requestForMock } from "/src/api/service"; import { requestForMock } from "/src/api/service";
const request = requestForMock; const request = requestForMock;
const apiPrefix = "/mock/BasisValueChange"; const apiPrefix = "/mock/BasisReset";
export function GetList(query: any) { export function GetList(query: any) {
return request({ return request({
url: apiPrefix + "/page", url: apiPrefix + "/page",

View File

@ -15,13 +15,14 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, onMounted } from "vue"; import { defineComponent, onMounted } from "vue";
import { CrudOptions, DynamicType, useFs, UseFsProps } from "@fast-crud/fast-crud"; import { CrudOptions, DynamicType, useFs } from "@fast-crud/fast-crud";
import createCrudOptions from "./crud.js"; import createCrudOptions from "./crud.js";
import _ from "lodash-es"; import _ from "lodash-es";
export default defineComponent({ export default defineComponent({
name: "BasisReset", name: "BasisReset",
setup() { setup() {
const { crudBinding, crudRef, crudExpose, context, crudOptions, resetCrudOptions, appendBindingOptions } = useFs({ createCrudOptions, context: {} }); const { crudBinding, crudRef, crudExpose, crudOptions, resetCrudOptions, appendBindingOptions } = useFs({ createCrudOptions, context: {} });
setTimeout(() => { setTimeout(() => {
//crudOptions //crudOptions

View File

@ -1,7 +1,7 @@
// @ts-ignore // @ts-ignore
import mockUtil from "/src/mock/base"; import mockUtil from "/src/mock/base";
const options: any = { const options: any = {
name: "BasisValueChange", name: "BasisReset",
idGenerator: 0 idGenerator: 0
}; };
const list = [ const list = [

View File

@ -260,6 +260,7 @@ export default function ({ crudExpose }: CreateCrudOptionsProps): CreateCrudOpti
title: "多选自动染色", title: "多选自动染色",
sortable: true, sortable: true,
type: "dict-select", type: "dict-select",
search: { show: true },
form: { form: {
title: "多选本地", title: "多选本地",
component: { component: {