diff --git a/apps/web-antd/package.json b/apps/web-antd/package.json index 77aabdbc6..c2237dda6 100644 --- a/apps/web-antd/package.json +++ b/apps/web-antd/package.json @@ -55,7 +55,6 @@ "diagram-js": "catalog:", "fast-xml-parser": "catalog:", "highlight.js": "catalog:", - "min-dash": "catalog:", "pinia": "catalog:", "steady-xml": "catalog:", "tinymce": "catalog:", diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js index dbc0b25a5..ffb332c48 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/content-pad/contentPadProvider.js @@ -1,9 +1,10 @@ +import { assign, forEach, isArray } from '@vben/utils'; + import { getChildLanes } from 'bpmn-js/lib/features/modeling/util/LaneUtil'; import { isAny } from 'bpmn-js/lib/features/modeling/util/ModelingUtil'; import { isEventSubProcess, isExpanded } from 'bpmn-js/lib/util/DiUtil'; import { is } from 'bpmn-js/lib/util/ModelUtil'; import { hasPrimaryModifier } from 'diagram-js/lib/util/Mouse'; -import { assign, forEach, isArray } from 'min-dash'; /** * A provider for BPMN 2.0 elements context pad diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/activiti/activitiExtension.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/activiti/activitiExtension.js index 1f04da8f9..d256eb297 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/activiti/activitiExtension.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/activiti/activitiExtension.js @@ -1,9 +1,4 @@ -'use strict'; - -import { some } from 'min-dash'; - -// const some = require('min-dash').some -// const some = some +import { some } from '@vben/utils'; const ALLOWED_TYPES = { FailedJobRetryTimeCycle: [ @@ -25,7 +20,7 @@ function is(element, type) { } function exists(element) { - return element && element.length; + return element && element.length > 0; } function includesType(collection, type) { diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js index 0b09c782c..cc5d2102a 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/camunda/extension.js @@ -1,18 +1,9 @@ -'use strict'; - -import { isFunction, isObject, some } from 'min-dash'; - -// const isFunction = isFunction, -// isObject = isObject, -// some = some -// const isFunction = require('min-dash').isFunction, -// isObject = require('min-dash').isObject, -// some = require('min-dash').some +import { isFunction, isObject, some } from '@vben/utils'; const WILDCARD = '*'; function CamundaModdleExtension(eventBus) { - // eslint-disable-next-line @typescript-eslint/no-this-alias + // eslint-disable-next-line unicorn/no-this-assignment, @typescript-eslint/no-this-alias const self = this; eventBus.on('moddleCopy.canCopyProperty', (context) => { diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/flowable/flowableExtension.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/flowable/flowableExtension.js index a891727c7..d7d80dede 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/flowable/flowableExtension.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/extension-moddle/flowable/flowableExtension.js @@ -1,9 +1,4 @@ -'use strict'; - -import { some } from 'min-dash'; - -// const some = some -// const some = require('min-dash').some +import { some } from '@vben/utils'; const ALLOWED_TYPES = { FailedJobRetryTimeCycle: [ @@ -25,7 +20,7 @@ function is(element, type) { } function exists(element) { - return element && element.length; + return element && element.length > 0; } function includesType(collection, type) { diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/CustomPalette.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/CustomPalette.js index 0299c5acb..db51f9f58 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/CustomPalette.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/CustomPalette.js @@ -1,5 +1,6 @@ +import { assign } from '@vben/utils'; + import PaletteProvider from 'bpmn-js/lib/features/palette/PaletteProvider'; -import { assign } from 'min-dash'; export default function CustomPalette( palette, diff --git a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/paletteProvider.js b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/paletteProvider.js index 8a022542b..9c350785b 100644 --- a/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/paletteProvider.js +++ b/apps/web-antd/src/components/bpmn-process-designer/package/designer/plugins/palette/paletteProvider.js @@ -1,4 +1,4 @@ -import { assign } from 'min-dash'; +import { assign } from '@vben/utils'; /** * A palette provider for BPMN 2.0 elements. diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index c31d07958..637d74a80 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -405,9 +405,6 @@ catalogs: medium-zoom: specifier: ^1.1.0 version: 1.1.0 - min-dash: - specifier: ^4.2.3 - version: 4.2.3 naive-ui: specifier: ^2.42.0 version: 2.43.1 @@ -839,9 +836,6 @@ importers: highlight.js: specifier: 'catalog:' version: 11.11.1 - min-dash: - specifier: 'catalog:' - version: 4.2.3 pinia: specifier: ^3.0.3 version: 3.0.3(typescript@5.9.3)(vue@3.5.22(typescript@5.9.3)) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 6e43aba98..53e1e50a3 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -150,7 +150,6 @@ catalog: markmap-toolbar: ^0.17.0 markmap-view: ^0.16.0 medium-zoom: ^1.1.0 - min-dash: ^4.2.3 naive-ui: ^2.42.0 nitropack: ^2.11.13 nprogress: ^0.2.0