diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 38281d2..b198bc8 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -307,9 +307,24 @@ -
- {{ item.name }} -
+ +

+ + {{ item.name }} + + + + + + 清除 +

选择成员 @@ -407,6 +422,17 @@ + + + + + + + + diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 38281d2..b198bc8 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -307,9 +307,24 @@ -
- {{ item.name }} -
+ +

+ + {{ item.name }} + + + + + + 清除 +

选择成员 @@ -407,6 +422,17 @@ + + + + + diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 2674b98..1b356b1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -79,7 +79,11 @@ }) // 抄送 watch(() => workFlowStore.copyerConfig1, (val) => { + console.log(val.flag) + console.log(val.id === _uid, val.id, _uid) if (val.flag && val.id === _uid) { + console.log('监听抄送人') + emits('update:nodeConfig', val.value) } }) diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 38281d2..b198bc8 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -307,9 +307,24 @@ -
- {{ item.name }} -
+ +

+ + {{ item.name }} + + + + + + 清除 +

选择成员 @@ -407,6 +422,17 @@ + + + + + diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 2674b98..1b356b1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -79,7 +79,11 @@ }) // 抄送 watch(() => workFlowStore.copyerConfig1, (val) => { + console.log(val.flag) + console.log(val.id === _uid, val.id, _uid) if (val.flag && val.id === _uid) { + console.log('监听抄送人') + emits('update:nodeConfig', val.value) } }) diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 38281d2..b198bc8 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -307,9 +307,24 @@ -
- {{ item.name }} -
+ +

+ + {{ item.name }} + + + + + + 清除 +

选择成员 @@ -407,6 +422,17 @@ + + + + + diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 2674b98..1b356b1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -79,7 +79,11 @@ }) // 抄送 watch(() => workFlowStore.copyerConfig1, (val) => { + console.log(val.flag) + console.log(val.id === _uid, val.id, _uid) if (val.flag && val.id === _uid) { + console.log('监听抄送人') + emits('update:nodeConfig', val.value) } }) diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 38281d2..b198bc8 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -307,9 +307,24 @@ -
- {{ item.name }} -
+ +

+ + {{ item.name }} + + + + + + 清除 +

选择成员 @@ -407,6 +422,17 @@ + + + + + diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 2674b98..1b356b1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -79,7 +79,11 @@ }) // 抄送 watch(() => workFlowStore.copyerConfig1, (val) => { + console.log(val.flag) + console.log(val.id === _uid, val.id, _uid) if (val.flag && val.id === _uid) { + console.log('监听抄送人') + emits('update:nodeConfig', val.value) } }) diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/main.ts b/src/main.ts index 657d9f2..695df5c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,7 @@ import { createApp } from 'vue' import ElementPlus from 'element-plus' import print from 'vue3-print-nb' +import * as ElementPlusIconsVue from '@element-plus/icons-vue' import App from './App.vue' import pinia from './store' import router from './router' @@ -26,6 +27,9 @@ app.use(ElementPlus) app.use(pinia) app.use(router) +for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) +} directive(app) app.mount('#app') diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 38281d2..b198bc8 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -307,9 +307,24 @@ -
- {{ item.name }} -
+ +

+ + {{ item.name }} + + + + + + 清除 +

选择成员 @@ -407,6 +422,17 @@ + + + + + diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 2674b98..1b356b1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -79,7 +79,11 @@ }) // 抄送 watch(() => workFlowStore.copyerConfig1, (val) => { + console.log(val.flag) + console.log(val.id === _uid, val.id, _uid) if (val.flag && val.id === _uid) { + console.log('监听抄送人') + emits('update:nodeConfig', val.value) } }) diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/main.ts b/src/main.ts index 657d9f2..695df5c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,7 @@ import { createApp } from 'vue' import ElementPlus from 'element-plus' import print from 'vue3-print-nb' +import * as ElementPlusIconsVue from '@element-plus/icons-vue' import App from './App.vue' import pinia from './store' import router from './router' @@ -26,6 +27,9 @@ app.use(ElementPlus) app.use(pinia) app.use(router) +for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) +} directive(app) app.mount('#app') diff --git a/src/plugins/preload.js b/src/plugins/preload.js index fc008ff..458c53e 100644 --- a/src/plugins/preload.js +++ b/src/plugins/preload.js @@ -178,17 +178,19 @@ return str ? str.substring(0, str.length - 4) : '请设置条件' } }, + // 设置抄送人节点文字 copyerStr(nodeConfig) { + console.log('44444444') console.log(nodeConfig.nodeUserList) if (nodeConfig.nodeUserList.length != 0) { - console.log('copyerStr') + console.log(this.arrToStr(nodeConfig.nodeUserList)) return this.arrToStr(nodeConfig.nodeUserList) } - else { - if (nodeConfig.ccSelfSelectFlag == 1) { - return '发起人自选' - } - } + // else { + // if (nodeConfig.ccSelfSelectFlag == 1) { + // return '发起人自选' + // } + // } }, toggleStrClass(item, key) { const a = item.zdy1 ? item.zdy1.split(',') : [] diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 38281d2..b198bc8 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -307,9 +307,24 @@ -
- {{ item.name }} -
+ +

+ + {{ item.name }} + + + + + + 清除 +

选择成员 @@ -407,6 +422,17 @@ + + + + + diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 2674b98..1b356b1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -79,7 +79,11 @@ }) // 抄送 watch(() => workFlowStore.copyerConfig1, (val) => { + console.log(val.flag) + console.log(val.id === _uid, val.id, _uid) if (val.flag && val.id === _uid) { + console.log('监听抄送人') + emits('update:nodeConfig', val.value) } }) diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/main.ts b/src/main.ts index 657d9f2..695df5c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,7 @@ import { createApp } from 'vue' import ElementPlus from 'element-plus' import print from 'vue3-print-nb' +import * as ElementPlusIconsVue from '@element-plus/icons-vue' import App from './App.vue' import pinia from './store' import router from './router' @@ -26,6 +27,9 @@ app.use(ElementPlus) app.use(pinia) app.use(router) +for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) +} directive(app) app.mount('#app') diff --git a/src/plugins/preload.js b/src/plugins/preload.js index fc008ff..458c53e 100644 --- a/src/plugins/preload.js +++ b/src/plugins/preload.js @@ -178,17 +178,19 @@ return str ? str.substring(0, str.length - 4) : '请设置条件' } }, + // 设置抄送人节点文字 copyerStr(nodeConfig) { + console.log('44444444') console.log(nodeConfig.nodeUserList) if (nodeConfig.nodeUserList.length != 0) { - console.log('copyerStr') + console.log(this.arrToStr(nodeConfig.nodeUserList)) return this.arrToStr(nodeConfig.nodeUserList) } - else { - if (nodeConfig.ccSelfSelectFlag == 1) { - return '发起人自选' - } - } + // else { + // if (nodeConfig.ccSelfSelectFlag == 1) { + // return '发起人自选' + // } + // } }, toggleStrClass(item, key) { const a = item.zdy1 ? item.zdy1.split(',') : [] diff --git a/src/views/setting.vue b/src/views/setting.vue index 5cd7866..1376467 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -9,9 +9,14 @@ import copyerDrawer from '@/components/drawer/copyerDrawer.vue' import conditionDrawer from '@/components/drawer/conditionDrawer.vue' import { getWorkFlowData, setWorkFlowData } from '@/plugins/api.js' +const props = defineProps({ + allowEditNode: { + type: Boolean, + default: true, + }, +}) const workFlowStore = useWorkFlowStore() const router = useRouter() - const tipList = ref([]) const tipVisible = ref(false) const nowVal = ref(100) @@ -138,13 +143,18 @@ {{ nowVal }}%
--> -
- + +
+
-
-
- 流程结束 -
+

结束

+
+
+ +
+ +
+

结束

@@ -163,6 +173,31 @@ justify-content: flex-end; margin: 20px; } + +.box-scale { + display: flex; + justify-content: center; + align-items: center; +} +// .end-node-circle { +.end-node { + justify-content: center; + flex-direction: column; + align-content: center; + + p { + width: 280px; + height: 40px; + line-height: 40px; + color: #fff; + text-align: center; + background-color: #8cafff; + border-radius: 4px; + font-size: 14px; + margin: 0; + } +} +// } + + + + diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 2674b98..1b356b1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -79,7 +79,11 @@ }) // 抄送 watch(() => workFlowStore.copyerConfig1, (val) => { + console.log(val.flag) + console.log(val.id === _uid, val.id, _uid) if (val.flag && val.id === _uid) { + console.log('监听抄送人') + emits('update:nodeConfig', val.value) } }) diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/main.ts b/src/main.ts index 657d9f2..695df5c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,7 @@ import { createApp } from 'vue' import ElementPlus from 'element-plus' import print from 'vue3-print-nb' +import * as ElementPlusIconsVue from '@element-plus/icons-vue' import App from './App.vue' import pinia from './store' import router from './router' @@ -26,6 +27,9 @@ app.use(ElementPlus) app.use(pinia) app.use(router) +for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) +} directive(app) app.mount('#app') diff --git a/src/plugins/preload.js b/src/plugins/preload.js index fc008ff..458c53e 100644 --- a/src/plugins/preload.js +++ b/src/plugins/preload.js @@ -178,17 +178,19 @@ return str ? str.substring(0, str.length - 4) : '请设置条件' } }, + // 设置抄送人节点文字 copyerStr(nodeConfig) { + console.log('44444444') console.log(nodeConfig.nodeUserList) if (nodeConfig.nodeUserList.length != 0) { - console.log('copyerStr') + console.log(this.arrToStr(nodeConfig.nodeUserList)) return this.arrToStr(nodeConfig.nodeUserList) } - else { - if (nodeConfig.ccSelfSelectFlag == 1) { - return '发起人自选' - } - } + // else { + // if (nodeConfig.ccSelfSelectFlag == 1) { + // return '发起人自选' + // } + // } }, toggleStrClass(item, key) { const a = item.zdy1 ? item.zdy1.split(',') : [] diff --git a/src/views/setting.vue b/src/views/setting.vue index 5cd7866..1376467 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -9,9 +9,14 @@ import copyerDrawer from '@/components/drawer/copyerDrawer.vue' import conditionDrawer from '@/components/drawer/conditionDrawer.vue' import { getWorkFlowData, setWorkFlowData } from '@/plugins/api.js' +const props = defineProps({ + allowEditNode: { + type: Boolean, + default: true, + }, +}) const workFlowStore = useWorkFlowStore() const router = useRouter() - const tipList = ref([]) const tipVisible = ref(false) const nowVal = ref(100) @@ -138,13 +143,18 @@ {{ nowVal }}%
--> -
- + +
+
-
-
- 流程结束 -
+

结束

+
+
+ +
+ +
+

结束

@@ -163,6 +173,31 @@ justify-content: flex-end; margin: 20px; } + +.box-scale { + display: flex; + justify-content: center; + align-items: center; +} +// .end-node-circle { +.end-node { + justify-content: center; + flex-direction: column; + align-content: center; + + p { + width: 280px; + height: 40px; + line-height: 40px; + color: #fff; + text-align: center; + background-color: #8cafff; + border-radius: 4px; + font-size: 14px; + margin: 0; + } +} +// } diff --git a/package.json b/package.json index 25866fe..0ebfaad 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "release": "bumpp" }, "dependencies": { + "@element-plus/icons-vue": "^2.0.10", "@tinymce/tinymce-vue": "^5.0.0", "@vueuse/core": "^9.5.0", "@vueuse/integrations": "^9.5.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index db70abb..00c8648 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -2,6 +2,7 @@ specifiers: '@antfu/eslint-config': ^0.29.4 + '@element-plus/icons-vue': ^2.0.10 '@iconify-json/ep': ^1.1.8 '@iconify/vue': ^4.0.0 '@tinymce/tinymce-vue': ^5.0.0 @@ -66,6 +67,7 @@ xlsx: ^0.18.5 dependencies: + '@element-plus/icons-vue': 2.0.10_vue@3.2.44 '@tinymce/tinymce-vue': 5.0.0_vue@3.2.44 '@vueuse/core': 9.5.0_vue@3.2.44 '@vueuse/integrations': 9.5.0_zxnpue2dc5wlnkjhqtaazygmxe @@ -593,6 +595,24 @@ get-tsconfig: 4.2.0 dev: true + /@esbuild/android-arm/0.15.12: + resolution: {integrity: sha512-IC7TqIqiyE0MmvAhWkl/8AEzpOtbhRNDo7aph47We1NbE5w2bt/Q+giAhe0YYeVpYnIhGMcuZY92qDK6dQauvA==} + engines: {node: '>=12'} + cpu: [arm] + os: [android] + requiresBuild: true + dev: true + optional: true + + /@esbuild/linux-loong64/0.15.12: + resolution: {integrity: sha512-tZEowDjvU7O7I04GYvWQOS4yyP9E/7YlsB0jjw1Ycukgr2ycEzKyIk5tms5WnLBymaewc6VmRKnn5IJWgK4eFw==} + engines: {node: '>=12'} + cpu: [loong64] + os: [linux] + requiresBuild: true + dev: true + optional: true + /@eslint/eslintrc/1.3.3: resolution: {integrity: sha512-uj3pT6Mg+3t39fvLrj8iuCIJ38zKO9FpGtJ4BBJebJhEwjoT+KLVNCcHT5QC9NGRIEi7fZ0ZR8YRb884auB4Lg==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} @@ -1516,6 +1536,10 @@ engines: {node: '>=8'} dev: true + /async-validator/4.2.5: + resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==} + dev: false + /async/2.6.4: resolution: {integrity: sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==} dependencies: @@ -2650,6 +2674,186 @@ is-symbol: 1.0.4 dev: true + /esbuild-android-64/0.15.12: + resolution: {integrity: sha512-MJKXwvPY9g0rGps0+U65HlTsM1wUs9lbjt5CU19RESqycGFDRijMDQsh68MtbzkqWSRdEtiKS1mtPzKneaAI0Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-android-arm64/0.15.12: + resolution: {integrity: sha512-Hc9SEcZbIMhhLcvhr1DH+lrrec9SFTiRzfJ7EGSBZiiw994gfkVV6vG0sLWqQQ6DD7V4+OggB+Hn0IRUdDUqvA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-64/0.15.12: + resolution: {integrity: sha512-qkmqrTVYPFiePt5qFjP8w/S+GIUMbt6k8qmiPraECUWfPptaPJUGkCKrWEfYFRWB7bY23FV95rhvPyh/KARP8Q==} + engines: {node: '>=12'} + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-darwin-arm64/0.15.12: + resolution: {integrity: sha512-z4zPX02tQ41kcXMyN3c/GfZpIjKoI/BzHrdKUwhC/Ki5BAhWv59A9M8H+iqaRbwpzYrYidTybBwiZAIWCLJAkw==} + engines: {node: '>=12'} + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-64/0.15.12: + resolution: {integrity: sha512-XFL7gKMCKXLDiAiBjhLG0XECliXaRLTZh6hsyzqUqPUf/PY4C6EJDTKIeqqPKXaVJ8+fzNek88285krSz1QECw==} + engines: {node: '>=12'} + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-freebsd-arm64/0.15.12: + resolution: {integrity: sha512-jwEIu5UCUk6TjiG1X+KQnCGISI+ILnXzIzt9yDVrhjug2fkYzlLbl0K43q96Q3KB66v6N1UFF0r5Ks4Xo7i72g==} + engines: {node: '>=12'} + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-32/0.15.12: + resolution: {integrity: sha512-uSQuSEyF1kVzGzuIr4XM+v7TPKxHjBnLcwv2yPyCz8riV8VUCnO/C4BF3w5dHiVpCd5Z1cebBtZJNlC4anWpwA==} + engines: {node: '>=12'} + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-64/0.15.12: + resolution: {integrity: sha512-QcgCKb7zfJxqT9o5z9ZUeGH1k8N6iX1Y7VNsEi5F9+HzN1OIx7ESxtQXDN9jbeUSPiRH1n9cw6gFT3H4qbdvcA==} + engines: {node: '>=12'} + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm/0.15.12: + resolution: {integrity: sha512-Wf7T0aNylGcLu7hBnzMvsTfEXdEdJY/hY3u36Vla21aY66xR0MS5I1Hw8nVquXjTN0A6fk/vnr32tkC/C2lb0A==} + engines: {node: '>=12'} + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-arm64/0.15.12: + resolution: {integrity: sha512-HtNq5xm8fUpZKwWKS2/YGwSfTF+339L4aIA8yphNKYJckd5hVdhfdl6GM2P3HwLSCORS++++7++//ApEwXEuAQ==} + engines: {node: '>=12'} + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-mips64le/0.15.12: + resolution: {integrity: sha512-Qol3+AvivngUZkTVFgLpb0H6DT+N5/zM3V1YgTkryPYFeUvuT5JFNDR3ZiS6LxhyF8EE+fiNtzwlPqMDqVcc6A==} + engines: {node: '>=12'} + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-ppc64le/0.15.12: + resolution: {integrity: sha512-4D8qUCo+CFKaR0cGXtGyVsOI7w7k93Qxb3KFXWr75An0DHamYzq8lt7TNZKoOq/Gh8c40/aKaxvcZnTgQ0TJNg==} + engines: {node: '>=12'} + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-riscv64/0.15.12: + resolution: {integrity: sha512-G9w6NcuuCI6TUUxe6ka0enjZHDnSVK8bO+1qDhMOCtl7Tr78CcZilJj8SGLN00zO5iIlwNRZKHjdMpfFgNn1VA==} + engines: {node: '>=12'} + cpu: [riscv64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-linux-s390x/0.15.12: + resolution: {integrity: sha512-Lt6BDnuXbXeqSlVuuUM5z18GkJAZf3ERskGZbAWjrQoi9xbEIsj/hEzVnSAFLtkfLuy2DE4RwTcX02tZFunXww==} + engines: {node: '>=12'} + cpu: [s390x] + os: [linux] + requiresBuild: true + dev: true + optional: true + + /esbuild-netbsd-64/0.15.12: + resolution: {integrity: sha512-jlUxCiHO1dsqoURZDQts+HK100o0hXfi4t54MNRMCAqKGAV33JCVvMplLAa2FwviSojT/5ZG5HUfG3gstwAG8w==} + engines: {node: '>=12'} + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-openbsd-64/0.15.12: + resolution: {integrity: sha512-1o1uAfRTMIWNOmpf8v7iudND0L6zRBYSH45sofCZywrcf7NcZA+c7aFsS1YryU+yN7aRppTqdUK1PgbZVaB1Dw==} + engines: {node: '>=12'} + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + /esbuild-sunos-64/0.15.12: + resolution: {integrity: sha512-nkl251DpoWoBO9Eq9aFdoIt2yYmp4I3kvQjba3jFKlMXuqQ9A4q+JaqdkCouG3DHgAGnzshzaGu6xofGcXyPXg==} + engines: {node: '>=12'} + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-32/0.15.12: + resolution: {integrity: sha512-WlGeBZHgPC00O08luIp5B2SP4cNCp/PcS+3Pcg31kdcJPopHxLkdCXtadLU9J82LCfw4TVls21A6lilQ9mzHrw==} + engines: {node: '>=12'} + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-64/0.15.12: + resolution: {integrity: sha512-VActO3WnWZSN//xjSfbiGOSyC+wkZtI8I4KlgrTo5oHJM6z3MZZBCuFaZHd8hzf/W9KPhF0lY8OqlmWC9HO5AA==} + engines: {node: '>=12'} + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + /esbuild-windows-arm64/0.15.12: + resolution: {integrity: sha512-Of3MIacva1OK/m4zCNIvBfz8VVROBmQT+gRX6pFTLPngFYcj6TFH/12VveAqq1k9VB2l28EoVMNMUCcmsfwyuA==} + engines: {node: '>=12'} + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + /esbuild/0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -3658,7 +3862,7 @@ source-map: 0.6.1 wordwrap: 1.0.0 optionalDependencies: - uglify-js: registry.npmmirror.com/uglify-js/3.17.4 + uglify-js: 3.17.4 dev: true /har-schema/2.0.0: @@ -6958,7 +7162,7 @@ '@esbuild-kit/core-utils': 3.0.0 '@esbuild-kit/esm-loader': 2.5.0 optionalDependencies: - fsevents: registry.npmmirror.com/fsevents/2.3.2 + fsevents: 2.3.2 dev: true /tunnel-agent/0.6.0: diff --git a/src/components.d.ts b/src/components.d.ts index dbb2458..a832874 100644 --- a/src/components.d.ts +++ b/src/components.d.ts @@ -8,12 +8,14 @@ declare module '@vue/runtime-core' { export interface GlobalComponents { AddNode: typeof import('./components/workFlow/addNode.vue')['default'] + AddNodeBan: typeof import('./components/workFlow/addNodeBan.vue')['default'] AppContainer: typeof import('./components/AppContainer/index.vue')['default'] ApproverDrawer: typeof import('./components/drawer/approverDrawer.vue')['default'] Auth: typeof import('./components/Auth/index.vue')['default'] AuthAll: typeof import('./components/AuthAll/index.vue')['default'] BatchActionBar: typeof import('./components/BatchActionBar/index.vue')['default'] ConditionDrawer: typeof import('./components/drawer/conditionDrawer.vue')['default'] + copy: typeof import('./components/workFlow/nodeWrap copy.vue')['default'] CopyerDrawer: typeof import('./components/drawer/copyerDrawer.vue')['default'] Copyright: typeof import('./components/Copyright/index.vue')['default'] DeptSelect: typeof import('./components/DeptSelect/index.vue')['default'] @@ -27,6 +29,7 @@ ImagesUpload: typeof import('./components/ImagesUpload/index.vue')['default'] ImageUpload: typeof import('./components/ImageUpload/index.vue')['default'] NodeWrap: typeof import('./components/workFlow/nodeWrap.vue')['default'] + NodeWrapBan: typeof import('./components/workFlow/nodeWrapBan.vue')['default'] NormalTable: typeof import('./components/NormalTable/index.vue')['default'] PageHeader: typeof import('./components/PageHeader/index.vue')['default'] PageMain: typeof import('./components/PageMain/index.vue')['default'] diff --git a/src/components/drawer/approverDrawer.vue b/src/components/drawer/approverDrawer.vue index 38281d2..b198bc8 100644 --- a/src/components/drawer/approverDrawer.vue +++ b/src/components/drawer/approverDrawer.vue @@ -307,9 +307,24 @@ -
- {{ item.name }} -
+ +

+ + {{ item.name }} + + + + + + 清除 +

选择成员 @@ -407,6 +422,17 @@ + + + + + diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 2674b98..1b356b1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -79,7 +79,11 @@ }) // 抄送 watch(() => workFlowStore.copyerConfig1, (val) => { + console.log(val.flag) + console.log(val.id === _uid, val.id, _uid) if (val.flag && val.id === _uid) { + console.log('监听抄送人') + emits('update:nodeConfig', val.value) } }) diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/main.ts b/src/main.ts index 657d9f2..695df5c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,7 @@ import { createApp } from 'vue' import ElementPlus from 'element-plus' import print from 'vue3-print-nb' +import * as ElementPlusIconsVue from '@element-plus/icons-vue' import App from './App.vue' import pinia from './store' import router from './router' @@ -26,6 +27,9 @@ app.use(ElementPlus) app.use(pinia) app.use(router) +for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) +} directive(app) app.mount('#app') diff --git a/src/plugins/preload.js b/src/plugins/preload.js index fc008ff..458c53e 100644 --- a/src/plugins/preload.js +++ b/src/plugins/preload.js @@ -178,17 +178,19 @@ return str ? str.substring(0, str.length - 4) : '请设置条件' } }, + // 设置抄送人节点文字 copyerStr(nodeConfig) { + console.log('44444444') console.log(nodeConfig.nodeUserList) if (nodeConfig.nodeUserList.length != 0) { - console.log('copyerStr') + console.log(this.arrToStr(nodeConfig.nodeUserList)) return this.arrToStr(nodeConfig.nodeUserList) } - else { - if (nodeConfig.ccSelfSelectFlag == 1) { - return '发起人自选' - } - } + // else { + // if (nodeConfig.ccSelfSelectFlag == 1) { + // return '发起人自选' + // } + // } }, toggleStrClass(item, key) { const a = item.zdy1 ? item.zdy1.split(',') : [] diff --git a/src/views/setting.vue b/src/views/setting.vue index 5cd7866..1376467 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -9,9 +9,14 @@ import copyerDrawer from '@/components/drawer/copyerDrawer.vue' import conditionDrawer from '@/components/drawer/conditionDrawer.vue' import { getWorkFlowData, setWorkFlowData } from '@/plugins/api.js' +const props = defineProps({ + allowEditNode: { + type: Boolean, + default: true, + }, +}) const workFlowStore = useWorkFlowStore() const router = useRouter() - const tipList = ref([]) const tipVisible = ref(false) const nowVal = ref(100) @@ -138,13 +143,18 @@ {{ nowVal }}%
--> -
- + +
+
-
-
- 流程结束 -
+

结束

+
+
+ +
+ +
+

结束

@@ -163,6 +173,31 @@ justify-content: flex-end; margin: 20px; } + +.box-scale { + display: flex; + justify-content: center; + align-items: center; +} +// .end-node-circle { +.end-node { + justify-content: center; + flex-direction: column; + align-content: center; + + p { + width: 280px; + height: 40px; + line-height: 40px; + color: #fff; + text-align: center; + background-color: #8cafff; + border-radius: 4px; + font-size: 14px; + margin: 0; + } +} +// } diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index c172ada..235a18a 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -9,9 +9,9 @@ const emits = defineEmits(['close']) const ruleFormRef = ref() const form: Ref = ref({ - number: '', // 编号 - name: '', // 名称 - business: '', // 关联业务 + number: '11111', // 编号 + name: '111', // 名称 + business: 'sss', // 关联业务 desc: '', // 流程描述 selectDecision: '', // 选择的决策 rejectTo: '', // 可驳回至 @@ -139,59 +139,68 @@ 关闭
- - - {{ form.number }} - - - {{ form.name }} - - - {{ form.business }} - - - - - - - - - - - - - - - - - - - - - - - - + + + + + {{ form.number }} + + + + + + + + + + + + + {{ form.name }} + + + + + + + + + + + + + + + + {{ form.business }} + + + + + + + +
-
- {{ item.name }} -
+ +

+ + {{ item.name }} + + + + + + 清除 +

选择成员 @@ -407,6 +422,17 @@ + + + + + diff --git a/src/components/workFlow/nodeWrap.vue b/src/components/workFlow/nodeWrap.vue index 2674b98..1b356b1 100644 --- a/src/components/workFlow/nodeWrap.vue +++ b/src/components/workFlow/nodeWrap.vue @@ -79,7 +79,11 @@ }) // 抄送 watch(() => workFlowStore.copyerConfig1, (val) => { + console.log(val.flag) + console.log(val.id === _uid, val.id, _uid) if (val.flag && val.id === _uid) { + console.log('监听抄送人') + emits('update:nodeConfig', val.value) } }) diff --git a/src/components/workFlow/nodeWrapBan.vue b/src/components/workFlow/nodeWrapBan.vue new file mode 100644 index 0000000..2de6650 --- /dev/null +++ b/src/components/workFlow/nodeWrapBan.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/css/workflow.css b/src/css/workflow.css index 43a0bf8..eee3dec 100644 --- a/src/css/workflow.css +++ b/src/css/workflow.css @@ -1677,6 +1677,9 @@ } .dingflow-design .end-node { + display: flex; + justify-content: center; + align-items: center; border-radius: 50%; font-size: 14px; color: rgb(25 31 37 / 40%); diff --git a/src/main.ts b/src/main.ts index 657d9f2..695df5c 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,6 +1,7 @@ import { createApp } from 'vue' import ElementPlus from 'element-plus' import print from 'vue3-print-nb' +import * as ElementPlusIconsVue from '@element-plus/icons-vue' import App from './App.vue' import pinia from './store' import router from './router' @@ -26,6 +27,9 @@ app.use(ElementPlus) app.use(pinia) app.use(router) +for (const [key, component] of Object.entries(ElementPlusIconsVue)) { + app.component(key, component) +} directive(app) app.mount('#app') diff --git a/src/plugins/preload.js b/src/plugins/preload.js index fc008ff..458c53e 100644 --- a/src/plugins/preload.js +++ b/src/plugins/preload.js @@ -178,17 +178,19 @@ return str ? str.substring(0, str.length - 4) : '请设置条件' } }, + // 设置抄送人节点文字 copyerStr(nodeConfig) { + console.log('44444444') console.log(nodeConfig.nodeUserList) if (nodeConfig.nodeUserList.length != 0) { - console.log('copyerStr') + console.log(this.arrToStr(nodeConfig.nodeUserList)) return this.arrToStr(nodeConfig.nodeUserList) } - else { - if (nodeConfig.ccSelfSelectFlag == 1) { - return '发起人自选' - } - } + // else { + // if (nodeConfig.ccSelfSelectFlag == 1) { + // return '发起人自选' + // } + // } }, toggleStrClass(item, key) { const a = item.zdy1 ? item.zdy1.split(',') : [] diff --git a/src/views/setting.vue b/src/views/setting.vue index 5cd7866..1376467 100644 --- a/src/views/setting.vue +++ b/src/views/setting.vue @@ -9,9 +9,14 @@ import copyerDrawer from '@/components/drawer/copyerDrawer.vue' import conditionDrawer from '@/components/drawer/conditionDrawer.vue' import { getWorkFlowData, setWorkFlowData } from '@/plugins/api.js' +const props = defineProps({ + allowEditNode: { + type: Boolean, + default: true, + }, +}) const workFlowStore = useWorkFlowStore() const router = useRouter() - const tipList = ref([]) const tipVisible = ref(false) const nowVal = ref(100) @@ -138,13 +143,18 @@ {{ nowVal }}%
--> -
- + +
+
-
-
- 流程结束 -
+

结束

+
+
+ +
+ +
+

结束

@@ -163,6 +173,31 @@ justify-content: flex-end; margin: 20px; } + +.box-scale { + display: flex; + justify-content: center; + align-items: center; +} +// .end-node-circle { +.end-node { + justify-content: center; + flex-direction: column; + align-content: center; + + p { + width: 280px; + height: 40px; + line-height: 40px; + color: #fff; + text-align: center; + background-color: #8cafff; + border-radius: 4px; + font-size: 14px; + margin: 0; + } +} +// } diff --git a/src/views/system/process/editProcess.vue b/src/views/system/process/editProcess.vue index c172ada..235a18a 100644 --- a/src/views/system/process/editProcess.vue +++ b/src/views/system/process/editProcess.vue @@ -9,9 +9,9 @@ const emits = defineEmits(['close']) const ruleFormRef = ref() const form: Ref = ref({ - number: '', // 编号 - name: '', // 名称 - business: '', // 关联业务 + number: '11111', // 编号 + name: '111', // 名称 + business: 'sss', // 关联业务 desc: '', // 流程描述 selectDecision: '', // 选择的决策 rejectTo: '', // 可驳回至 @@ -139,59 +139,68 @@ 关闭
- - - {{ form.number }} - - - {{ form.name }} - - - {{ form.business }} - - - - - - - - - - - - - - - - - - - - - - - - + + + + + {{ form.number }} + + + + + + + + + + + + + {{ form.name }} + + + + + + + + + + + + + + + + {{ form.business }} + + + + + + + +
- 详情 +