diff --git a/package-lock.json b/package-lock.json index 8cd2cfa..86574e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,37 +1,39 @@ { "name": "appformlowcode", - "version": "0.0.0", + "version": "2.3.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "appformlowcode", - "version": "0.0.0", + "version": "2.3.0", "dependencies": { "@element-plus/icons-vue": "^2.3.1", "@vueup/vue-quill": "^1.2.0", "@zxing/browser": "^0.1.5", "@zxing/library": "^0.21.3", "axios": "^1.7.7", - "element-plus": "^2.9.6", + "element-plus": "^2.8.6", "font-awesome": "^4.7.0", "html5-qrcode": "^2.3.8", "js-beautify": "^1.15.1", "nprogress": "^0.2.0", "path": "^0.12.7", "pdfjs-dist": "^4.8.69", - "pinia": "^2.3.1", + "pinia": "^2.2.4", "pinia-plugin-persistedstate": "^4.1.1", + "quill": "^2.0.3", "quill-blot-formatter": "^1.0.5", "sass": "^1.80.3", "scss": "^0.2.4", "spark-md5": "^3.0.2", "tinymce": "^7.5.1", "ts-md5": "^1.3.1", + "vscode-element-helper": "file:c:/Users/Administrator/.vscode/extensions/elemefe.vscode-element-helper-0.5.6", "vue": "^3.5.10", "vue-pdf-embed": "^1.2.1", "vue-qrcode-reader": "^5.7.0", - "vue-router": "^4.5.0", + "vue-router": "^4.4.5", "vue3-pdf-embed": "^1.1.7", "vue3-pdfjs": "^0.1.6", "weixin-js-sdk": "^1.6.5" @@ -41,16 +43,39 @@ "@types/node": "^22.7.8", "@types/nprogress": "^0.2.3", "@types/spark-md5": "^3.0.5", - "@vitejs/plugin-vue": "^5.2.1", + "@vitejs/plugin-vue": "^5.1.4", "typescript": "^5.5.3", - "unplugin-auto-import": "^0.18.6", + "unplugin-auto-import": "^0.18.3", "unplugin-icons": "^0.20.0", - "unplugin-vue-components": "^0.27.5", + "unplugin-vue-components": "^0.27.4", "vite": "^5.4.8", "vite-plugin-svg-icons": "^2.0.1", "vue-tsc": "^2.1.6" } }, + "c:/Users/Administrator/.vscode/extensions/elemefe.vscode-element-helper-0.5.6": { + "version": "0.5.6", + "hasInstallScript": true, + "dependencies": { + "cheerio": "^1.0.0-rc.1", + "element-gh-pages": "^1.0.26", + "element-helper-json-new": "^2.0.6", + "hoek": "^5.0.3", + "jquery": "^3.2.1", + "pretty": "^2.0.0", + "shelljs": "^0.7.8" + }, + "devDependencies": { + "@types/mocha": "^2.2.32", + "@types/node": "^6.0.40", + "mocha": "^5.2.0", + "typescript": "^2.0.3", + "vscode": "^1.1.28" + }, + "engines": { + "vscode": "^1.12.0" + } + }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -1725,6 +1750,47 @@ "vue": "^3.2.41" } }, + "node_modules/@vueup/vue-quill/node_modules/eventemitter3": { + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz", + "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==" + }, + "node_modules/@vueup/vue-quill/node_modules/fast-diff": { + "version": "1.1.2", + "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz", + "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==" + }, + "node_modules/@vueup/vue-quill/node_modules/parchment": { + "version": "1.1.4", + "resolved": "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz", + "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==" + }, + "node_modules/@vueup/vue-quill/node_modules/quill": { + "version": "1.3.7", + "resolved": "https://registry.npmmirror.com/quill/-/quill-1.3.7.tgz", + "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==", + "dependencies": { + "clone": "^2.1.1", + "deep-equal": "^1.0.1", + "eventemitter3": "^2.0.3", + "extend": "^3.0.2", + "parchment": "^1.1.4", + "quill-delta": "^3.6.2" + } + }, + "node_modules/@vueup/vue-quill/node_modules/quill/node_modules/quill-delta": { + "version": "3.6.3", + "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-3.6.3.tgz", + "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==", + "dependencies": { + "deep-equal": "^1.0.1", + "extend": "^3.0.2", + "fast-diff": "1.1.2" + }, + "engines": { + "node": ">=0.10" + } + }, "node_modules/@vueuse/core": { "version": "9.13.0", "resolved": "https://registry.npmmirror.com/@vueuse/core/-/core-9.13.0.tgz", @@ -3333,9 +3399,9 @@ } }, "node_modules/eventemitter3": { - "version": "2.0.3", - "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz", - "integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg==" + "version": "5.0.1", + "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-5.0.1.tgz", + "integrity": "sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==" }, "node_modules/execa": { "version": "8.0.1", @@ -5434,9 +5500,9 @@ "dev": true }, "node_modules/parchment": { - "version": "1.1.4", - "resolved": "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz", - "integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg==" + "version": "3.0.0", + "resolved": "https://registry.npmmirror.com/parchment/-/parchment-3.0.0.tgz", + "integrity": "sha512-HUrJFQ/StvgmXRcQ1ftY6VEZUq3jA2t9ncFN4F84J/vN0/FPpQF+8FKXb3l6fLces6q0uOHj6NJn+2xvZnxO6A==" }, "node_modules/pascalcase": { "version": "0.1.1", @@ -5911,16 +5977,17 @@ ] }, "node_modules/quill": { - "version": "1.3.7", - "resolved": "https://registry.npmmirror.com/quill/-/quill-1.3.7.tgz", - "integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==", + "version": "2.0.3", + "resolved": "https://registry.npmmirror.com/quill/-/quill-2.0.3.tgz", + "integrity": "sha512-xEYQBqfYx/sfb33VJiKnSJp8ehloavImQ2A6564GAbqG55PGw1dAWUn1MUbQB62t0azawUS2CZZhWCjO8gRvTw==", "dependencies": { - "clone": "^2.1.1", - "deep-equal": "^1.0.1", - "eventemitter3": "^2.0.3", - "extend": "^3.0.2", - "parchment": "^1.1.4", - "quill-delta": "^3.6.2" + "eventemitter3": "^5.0.1", + "lodash-es": "^4.17.21", + "parchment": "^3.0.0", + "quill-delta": "^5.1.0" + }, + "engines": { + "npm": ">=8.2.3" } }, "node_modules/quill-blot-formatter": { @@ -5945,21 +6012,21 @@ } }, "node_modules/quill/node_modules/fast-diff": { - "version": "1.1.2", - "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz", - "integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig==" + "version": "1.3.0", + "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.3.0.tgz", + "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==" }, "node_modules/quill/node_modules/quill-delta": { - "version": "3.6.3", - "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-3.6.3.tgz", - "integrity": "sha512-wdIGBlcX13tCHOXGMVnnTVFtGRLoP0imqxM696fIPwIf5ODIYUHIvHbZcyvGlZFiFhK5XzDC2lpjbxRhnM05Tg==", + "version": "5.1.0", + "resolved": "https://registry.npmmirror.com/quill-delta/-/quill-delta-5.1.0.tgz", + "integrity": "sha512-X74oCeRI4/p0ucjb5Ma8adTXd9Scumz367kkMK5V/IatcX6A0vlgLgKbzXWy5nZmCGeNJm2oQX0d2Eqj+ZIlCA==", "dependencies": { - "deep-equal": "^1.0.1", - "extend": "^3.0.2", - "fast-diff": "1.1.2" + "fast-diff": "^1.3.0", + "lodash.clonedeep": "^4.5.0", + "lodash.isequal": "^4.5.0" }, "engines": { - "node": ">=0.10" + "node": ">= 12.0.0" } }, "node_modules/rc": { @@ -7999,6 +8066,10 @@ "integrity": "sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==", "dev": true }, + "node_modules/vscode-element-helper": { + "resolved": "c:/Users/Administrator/.vscode/extensions/elemefe.vscode-element-helper-0.5.6", + "link": true + }, "node_modules/vscode-uri": { "version": "3.0.8", "resolved": "https://registry.npmmirror.com/vscode-uri/-/vscode-uri-3.0.8.tgz", diff --git a/package.json b/package.json index 63c1e91..4a126cd 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,44 @@ { "name": "appformlowcode", "private": true, - "version": "0.0.0", + "version": "2.3.0", "type": "module", "scripts": { - "dev": "vite --open", + "dev": "vite serve --mode development", "build": "vue-tsc -b && vite build", "build:prod": "vite build --mode production &&vue-tsc --noEmit", - "preview": "vite preview" + "preview": "husky install", + "lint:eslint": "eslint --fix --ext .ts,.js,.vue ./src ", + "lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,tsx,css,less,scss,vue,html,md}\"", + "lint:stylelint": "stylelint \"**/*.{css,scss,vue}\" --fix", + "lint:lint-staged": "lint-staged", + "commit": "git-cz" + }, + "config": { + "commitizen": { + "path": "node_modules/cz-git" + } + }, + "lint-staged": { + "*.{js,ts}": [ + "eslint --fix", + "prettier --write" + ], + "*.{cjs,json}": [ + "prettier --write" + ], + "*.{vue,html}": [ + "eslint --fix", + "prettier --write", + "stylelint --fix" + ], + "*.{scss,css}": [ + "stylelint --fix", + "prettier --write" + ], + "*.md": [ + "prettier --write" + ] }, "dependencies": { "@element-plus/icons-vue": "^2.3.1", @@ -15,25 +46,27 @@ "@zxing/browser": "^0.1.5", "@zxing/library": "^0.21.3", "axios": "^1.7.7", - "element-plus": "^2.9.6", + "element-plus": "^2.8.6", "font-awesome": "^4.7.0", "html5-qrcode": "^2.3.8", "js-beautify": "^1.15.1", "nprogress": "^0.2.0", "path": "^0.12.7", "pdfjs-dist": "^4.8.69", - "pinia": "^2.3.1", + "pinia": "^2.2.4", "pinia-plugin-persistedstate": "^4.1.1", + "quill": "^2.0.3", "quill-blot-formatter": "^1.0.5", "sass": "^1.80.3", "scss": "^0.2.4", "spark-md5": "^3.0.2", "tinymce": "^7.5.1", "ts-md5": "^1.3.1", + "vscode-element-helper": "file:c:/Users/Administrator/.vscode/extensions/elemefe.vscode-element-helper-0.5.6", "vue": "^3.5.10", "vue-pdf-embed": "^1.2.1", "vue-qrcode-reader": "^5.7.0", - "vue-router": "^4.5.0", + "vue-router": "^4.4.5", "vue3-pdf-embed": "^1.1.7", "vue3-pdfjs": "^0.1.6", "weixin-js-sdk": "^1.6.5" @@ -43,11 +76,11 @@ "@types/node": "^22.7.8", "@types/nprogress": "^0.2.3", "@types/spark-md5": "^3.0.5", - "@vitejs/plugin-vue": "^5.2.1", + "@vitejs/plugin-vue": "^5.1.4", "typescript": "^5.5.3", - "unplugin-auto-import": "^0.18.6", + "unplugin-auto-import": "^0.18.3", "unplugin-icons": "^0.20.0", - "unplugin-vue-components": "^0.27.5", + "unplugin-vue-components": "^0.27.4", "vite": "^5.4.8", "vite-plugin-svg-icons": "^2.0.1", "vue-tsc": "^2.1.6" diff --git a/src/components/lowCode/assistant/departmentOrg.vue b/src/components/lowCode/assistant/departmentOrg.vue index 10c886e..8b83733 100644 --- a/src/components/lowCode/assistant/departmentOrg.vue +++ b/src/components/lowCode/assistant/departmentOrg.vue @@ -188,20 +188,23 @@ const orgTreeProps ={ } \ No newline at end of file diff --git a/src/components/lowCode/assistant/editTime.vue b/src/components/lowCode/assistant/editTime.vue index 213f26c..9d0c3a1 100644 --- a/src/components/lowCode/assistant/editTime.vue +++ b/src/components/lowCode/assistant/editTime.vue @@ -132,7 +132,11 @@ const value = computed({ if(zhiVal != null && zhiVal != "") { zhiVal=zhiVal*1 } - return unixTimeToDayTime(zhiVal) + if(zhiVal != null && zhiVal != "") { + return unixTimeToDayTime(zhiVal) + }else{ + return getCurrentTime() + } } }, set(newVal: any) { @@ -184,10 +188,26 @@ const updateModel = (val: any) => { attribute: controlAttribute }) } +//获取系统当前时间 +const getCurrentTime = () => { + const now = new Date(); + const year = now.getFullYear(); + const month = now.getMonth() + 1; // 月份是从0开始的 + const day = now.getDate(); + const hours = now.getHours(); + const minutes = now.getMinutes(); + const seconds = now.getSeconds(); + + return `${year}-${month.toString().padStart(2, '0')}-${day.toString().padStart(2, '0')} ${hours.toString().padStart(2, '0')}:${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`; +} \ No newline at end of file diff --git a/src/components/lowCode/assistant/founder.vue b/src/components/lowCode/assistant/founder.vue index 6fd5cc8..295601c 100644 --- a/src/components/lowCode/assistant/founder.vue +++ b/src/components/lowCode/assistant/founder.vue @@ -171,7 +171,9 @@ const getFormFounder = (val: any) => { } \ No newline at end of file diff --git a/src/components/lowCode/assistant/founderTime.vue b/src/components/lowCode/assistant/founderTime.vue index 3acb144..99872ab 100644 --- a/src/components/lowCode/assistant/founderTime.vue +++ b/src/components/lowCode/assistant/founderTime.vue @@ -174,8 +174,12 @@ const getCurrentTime = () => { } \ No newline at end of file diff --git a/src/components/lowCode/assistant/uploadPage.vue b/src/components/lowCode/assistant/uploadPage.vue index 3ddc455..1bb85a1 100644 --- a/src/components/lowCode/assistant/uploadPage.vue +++ b/src/components/lowCode/assistant/uploadPage.vue @@ -150,7 +150,9 @@ const uploadSuccess = (response: any, uploadFile: any, uploadFiles: any) => { :on-success="uploadSuccess" :on-remove="uploadRemove" > - + + + {{ props.config?.btnText }} @@ -159,7 +161,7 @@ const uploadSuccess = (response: any, uploadFile: any, uploadFiles: any) => { {{ props.config?.btnText }} - +