Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

廖井涛

4 小时以前 e73c7b07535af2593083d21c9c5ba7761a5c40df

 north-glass-erp/northglass-erp/package-lock.json

@@ -599,7 +599,6 @@
      "resolved": "https://registry.npmmirror.com/@interactjs/core/-/core-1.10.2.tgz",
      "integrity": "sha512-SA5KRGo+gFJOhBj1Z2dLHhAf0/2nyHNd4SQ460aIQ3jj/QhqbJW6kGzmh7hBa2FzVGgxLhcQu7NZaP4rnDfUNw==",
      "license": "MIT",
      "peer": true,
      "peerDependencies": {
        "@interactjs/utils": "1.10.2"
      }
@@ -681,7 +680,6 @@
      "resolved": "https://registry.npmmirror.com/@interactjs/modifiers/-/modifiers-1.10.2.tgz",
      "integrity": "sha512-3wYEucvZF2NTIslnVIKw5MWhkn9LM42cGCQaC19o3LZeWnbps7NnHJCyQp6zylJrCbwt7f+CSt4Oj2/s0f6XEA==",
      "license": "MIT",
      "peer": true,
      "dependencies": {
        "@interactjs/snappers": "1.10.2"
      },
@@ -763,8 +761,7 @@
      "version": "1.10.2",
      "resolved": "https://registry.npmmirror.com/@interactjs/utils/-/utils-1.10.2.tgz",
      "integrity": "sha512-sOr+pu7XGAN4qv+ikajMo3RJygbkbMLegmx0Tv5Qf6e80sF42FjkmHeMGuV7fL98nwat0VmDiWerOFBnKctXow==",
      "license": "MIT",
      "peer": true
      "license": "MIT"
    },
    "node_modules/@interactjs/vue": {
      "version": "1.10.2",
@@ -964,7 +961,6 @@
      "version": "1.8.0",
      "resolved": "https://registry.npmmirror.com/@leafer-ui/interface/-/interface-1.8.0.tgz",
      "integrity": "sha512-cwZutgshMWVg22xzJ9+34Ye/HX0W6LxMyQwoPtDlMUMQKvBW5EHRfQ5dv4d16X9PFxA0N7Djm0u7/TIpjrCh0g==",
      "peer": true,
      "dependencies": {
        "@leafer/interface": "1.8.0"
      }
@@ -1170,8 +1166,7 @@
    "node_modules/@leafer/interface": {
      "version": "1.8.0",
      "resolved": "https://registry.npmmirror.com/@leafer/interface/-/interface-1.8.0.tgz",
      "integrity": "sha512-76jOG0AabfIw8WMI8nulb1FKylBcVnpucuiTjml5df6P991wcH8xsDSQtRCaOKrsl0C2DbW62BVwst1NHHHalQ==",
      "peer": true
      "integrity": "sha512-76jOG0AabfIw8WMI8nulb1FKylBcVnpucuiTjml5df6P991wcH8xsDSQtRCaOKrsl0C2DbW62BVwst1NHHHalQ=="
    },
    "node_modules/@leafer/layout": {
      "version": "1.8.0",
@@ -1316,7 +1311,6 @@
      "version": "4.17.9",
      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.9.tgz",
      "integrity": "sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==",
      "peer": true,
      "dependencies": {
        "@types/lodash": "*"
      }
@@ -2676,8 +2670,7 @@
    "node_modules/jquery": {
      "version": "3.7.1",
      "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz",
      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
      "peer": true
      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
    },
    "node_modules/jsbarcode": {
      "version": "3.11.6",
@@ -2830,14 +2823,12 @@
    "node_modules/lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
      "peer": true
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
    "node_modules/lodash-es": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
      "peer": true
      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
    },
    "node_modules/lodash-unified": {
      "version": "1.0.3",
@@ -8382,7 +8373,6 @@
      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
      "devOptional": true,
      "peer": true,
      "bin": {
        "rollup": "dist/bin/rollup"
      },
@@ -8682,7 +8672,6 @@
      "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz",
      "integrity": "sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==",
      "dev": true,
      "peer": true,
      "dependencies": {
        "esbuild": "^0.18.10",
        "postcss": "^8.4.27",
@@ -8737,7 +8726,6 @@
      "version": "3.3.4",
      "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
      "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
      "peer": true,
      "dependencies": {
        "@vue/compiler-dom": "3.3.4",
        "@vue/compiler-sfc": "3.3.4",
@@ -9406,7 +9394,6 @@
      "version": "1.10.2",
      "resolved": "https://registry.npmmirror.com/@interactjs/core/-/core-1.10.2.tgz",
      "integrity": "sha512-SA5KRGo+gFJOhBj1Z2dLHhAf0/2nyHNd4SQ460aIQ3jj/QhqbJW6kGzmh7hBa2FzVGgxLhcQu7NZaP4rnDfUNw==",
      "peer": true,
      "requires": {}
    },
    "@interactjs/dev-tools": {
@@ -9471,7 +9458,6 @@
      "version": "1.10.2",
      "resolved": "https://registry.npmmirror.com/@interactjs/modifiers/-/modifiers-1.10.2.tgz",
      "integrity": "sha512-3wYEucvZF2NTIslnVIKw5MWhkn9LM42cGCQaC19o3LZeWnbps7NnHJCyQp6zylJrCbwt7f+CSt4Oj2/s0f6XEA==",
      "peer": true,
      "requires": {
        "@interactjs/interact": "1.10.2",
        "@interactjs/snappers": "1.10.2"
@@ -9525,8 +9511,7 @@
    "@interactjs/utils": {
      "version": "1.10.2",
      "resolved": "https://registry.npmmirror.com/@interactjs/utils/-/utils-1.10.2.tgz",
      "integrity": "sha512-sOr+pu7XGAN4qv+ikajMo3RJygbkbMLegmx0Tv5Qf6e80sF42FjkmHeMGuV7fL98nwat0VmDiWerOFBnKctXow==",
      "peer": true
      "integrity": "sha512-sOr+pu7XGAN4qv+ikajMo3RJygbkbMLegmx0Tv5Qf6e80sF42FjkmHeMGuV7fL98nwat0VmDiWerOFBnKctXow=="
    },
    "@interactjs/vue": {
      "version": "1.10.2",
@@ -9713,7 +9698,6 @@
      "version": "1.8.0",
      "resolved": "https://registry.npmmirror.com/@leafer-ui/interface/-/interface-1.8.0.tgz",
      "integrity": "sha512-cwZutgshMWVg22xzJ9+34Ye/HX0W6LxMyQwoPtDlMUMQKvBW5EHRfQ5dv4d16X9PFxA0N7Djm0u7/TIpjrCh0g==",
      "peer": true,
      "requires": {
        "@leafer/interface": "1.8.0"
      }
@@ -9919,8 +9903,7 @@
    "@leafer/interface": {
      "version": "1.8.0",
      "resolved": "https://registry.npmmirror.com/@leafer/interface/-/interface-1.8.0.tgz",
      "integrity": "sha512-76jOG0AabfIw8WMI8nulb1FKylBcVnpucuiTjml5df6P991wcH8xsDSQtRCaOKrsl0C2DbW62BVwst1NHHHalQ==",
      "peer": true
      "integrity": "sha512-76jOG0AabfIw8WMI8nulb1FKylBcVnpucuiTjml5df6P991wcH8xsDSQtRCaOKrsl0C2DbW62BVwst1NHHHalQ=="
    },
    "@leafer/layout": {
      "version": "1.8.0",
@@ -10049,7 +10032,6 @@
      "version": "4.17.9",
      "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.9.tgz",
      "integrity": "sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==",
      "peer": true,
      "requires": {
        "@types/lodash": "*"
      }
@@ -11037,8 +11019,7 @@
    "jquery": {
      "version": "3.7.1",
      "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz",
      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
      "peer": true
      "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
    },
    "jsbarcode": {
      "version": "3.11.6",
@@ -11173,14 +11154,12 @@
    "lodash": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
      "peer": true
      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
    },
    "lodash-es": {
      "version": "4.17.21",
      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
      "peer": true
      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
    },
    "lodash-unified": {
      "version": "1.0.3",
@@ -11697,7 +11676,6 @@
          "version": "1.10.2",
          "resolved": "https://registry.npmmirror.com/@interactjs/core/-/core-1.10.2.tgz",
          "integrity": "sha512-SA5KRGo+gFJOhBj1Z2dLHhAf0/2nyHNd4SQ460aIQ3jj/QhqbJW6kGzmh7hBa2FzVGgxLhcQu7NZaP4rnDfUNw==",
          "peer": true,
          "requires": {}
        },
        "@interactjs/dev-tools": {
@@ -11762,7 +11740,6 @@
          "version": "1.10.2",
          "resolved": "https://registry.npmmirror.com/@interactjs/modifiers/-/modifiers-1.10.2.tgz",
          "integrity": "sha512-3wYEucvZF2NTIslnVIKw5MWhkn9LM42cGCQaC19o3LZeWnbps7NnHJCyQp6zylJrCbwt7f+CSt4Oj2/s0f6XEA==",
          "peer": true,
          "requires": {
            "@interactjs/interact": "1.10.2",
            "@interactjs/snappers": "1.10.2"
@@ -11816,8 +11793,7 @@
        "@interactjs/utils": {
          "version": "1.10.2",
          "resolved": "https://registry.npmmirror.com/@interactjs/utils/-/utils-1.10.2.tgz",
          "integrity": "sha512-sOr+pu7XGAN4qv+ikajMo3RJygbkbMLegmx0Tv5Qf6e80sF42FjkmHeMGuV7fL98nwat0VmDiWerOFBnKctXow==",
          "peer": true
          "integrity": "sha512-sOr+pu7XGAN4qv+ikajMo3RJygbkbMLegmx0Tv5Qf6e80sF42FjkmHeMGuV7fL98nwat0VmDiWerOFBnKctXow=="
        },
        "@interactjs/vue": {
          "version": "1.10.2",
@@ -12004,7 +11980,6 @@
          "version": "1.8.0",
          "resolved": "https://registry.npmmirror.com/@leafer-ui/interface/-/interface-1.8.0.tgz",
          "integrity": "sha512-cwZutgshMWVg22xzJ9+34Ye/HX0W6LxMyQwoPtDlMUMQKvBW5EHRfQ5dv4d16X9PFxA0N7Djm0u7/TIpjrCh0g==",
          "peer": true,
          "requires": {
            "@leafer/interface": "1.8.0"
          }
@@ -12210,8 +12185,7 @@
        "@leafer/interface": {
          "version": "1.8.0",
          "resolved": "https://registry.npmmirror.com/@leafer/interface/-/interface-1.8.0.tgz",
          "integrity": "sha512-76jOG0AabfIw8WMI8nulb1FKylBcVnpucuiTjml5df6P991wcH8xsDSQtRCaOKrsl0C2DbW62BVwst1NHHHalQ==",
          "peer": true
          "integrity": "sha512-76jOG0AabfIw8WMI8nulb1FKylBcVnpucuiTjml5df6P991wcH8xsDSQtRCaOKrsl0C2DbW62BVwst1NHHHalQ=="
        },
        "@leafer/layout": {
          "version": "1.8.0",
@@ -12340,7 +12314,6 @@
          "version": "4.17.9",
          "resolved": "https://registry.npmjs.org/@types/lodash-es/-/lodash-es-4.17.9.tgz",
          "integrity": "sha512-ZTcmhiI3NNU7dEvWLZJkzG6ao49zOIjEgIE0RgV7wbPxU0f2xT3VSAHw2gmst8swH6V0YkLRGp4qPlX/6I90MQ==",
          "peer": true,
          "requires": {
            "@types/lodash": "*"
          }
@@ -13328,8 +13301,7 @@
        "jquery": {
          "version": "3.7.1",
          "resolved": "https://registry.npmmirror.com/jquery/-/jquery-3.7.1.tgz",
          "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==",
          "peer": true
          "integrity": "sha512-m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg=="
        },
        "jsbarcode": {
          "version": "3.11.6",
@@ -13464,14 +13436,12 @@
        "lodash": {
          "version": "4.17.21",
          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
          "peer": true
          "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
        },
        "lodash-es": {
          "version": "4.17.21",
          "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
          "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==",
          "peer": true
          "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
        },
        "lodash-unified": {
          "version": "1.0.3",
@@ -18968,7 +18938,6 @@
          "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
          "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
          "devOptional": true,
          "peer": true,
          "requires": {
            "fsevents": "~2.3.2"
          }
@@ -19194,7 +19163,6 @@
          "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz",
          "integrity": "sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==",
          "dev": true,
          "peer": true,
          "requires": {
            "esbuild": "^0.18.10",
            "fsevents": "~2.3.2",
@@ -19206,7 +19174,6 @@
          "version": "3.3.4",
          "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
          "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
          "peer": true,
          "requires": {
            "@vue/compiler-dom": "3.3.4",
            "@vue/compiler-sfc": "3.3.4",
@@ -24820,7 +24787,6 @@
      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz",
      "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==",
      "devOptional": true,
      "peer": true,
      "requires": {
        "fsevents": "~2.3.2"
      }
@@ -25046,7 +25012,6 @@
      "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.11.tgz",
      "integrity": "sha512-ksNZJlkcU9b0lBwAGZGGaZHCMqHsc8OpgtoYhsQ4/I2v5cnpmmmqe5pM4nv/4Hn6G/2GhTdj0DhZh2e+Er1q5A==",
      "dev": true,
      "peer": true,
      "requires": {
        "esbuild": "^0.18.10",
        "fsevents": "~2.3.2",
@@ -25058,7 +25023,6 @@
      "version": "3.3.4",
      "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
      "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
      "peer": true,
      "requires": {
        "@vue/compiler-dom": "3.3.4",
        "@vue/compiler-sfc": "3.3.4",