diff --git a/package.json b/package.json index ef1a591..20e8d37 100644 --- a/package.json +++ b/package.json @@ -57,6 +57,7 @@ "@sa/hooks": "workspace:*", "@sa/materials": "workspace:*", "@sa/utils": "workspace:*", + "@vicons/fluent": "^0.13.0", "@vueuse/core": "12.5.0", "clipboard": "2.0.11", "dayjs": "1.11.13", @@ -113,9 +114,6 @@ "commit-msg": "pnpm sa git-commit-verify", "pre-commit": "pnpm typecheck && pnpm lint-staged" }, - "lint-staged": { - "*": "eslint --fix" - }, "officialWebsite": "https://snailjob.opensnail.com", "website": "https://snailjob.opensnail.com/docs/preview.html" } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1e21f11..8d49e3d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -41,6 +41,9 @@ importers: '@sa/utils': specifier: workspace:* version: link:packages/utils + '@vicons/fluent': + specifier: ^0.13.0 + version: 0.13.0 '@vueuse/core': specifier: 12.5.0 version: 12.5.0(typescript@5.7.3) @@ -1639,6 +1642,9 @@ packages: peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 || ^6.0.0-0 + '@vicons/fluent@0.13.0': + resolution: {integrity: sha512-bYGZsOE3qzvm3Cm43e7tybgGlr5ZUpYqtRZq0g0Tfupe8jIzLolpvQLNUt1zS8Mgt6goTbUk5YH7Fkv16jkykg==} + '@vitejs/plugin-vue-jsx@4.1.1': resolution: {integrity: sha512-uMJqv/7u1zz/9NbWAD3XdjaY20tKTf17XVfQ9zq4wY1BjsB/PjpJPMe2xiG39QpP4ZdhYNhm4Hvo66uJrykNLA==} engines: {node: ^18.0.0 || >=20.0.0} @@ -6350,6 +6356,8 @@ snapshots: - supports-color - vue + '@vicons/fluent@0.13.0': {} + '@vitejs/plugin-vue-jsx@4.1.1(vite@6.1.0(@types/node@22.13.1)(jiti@2.4.2)(sass@1.84.0)(tsx@4.19.2)(yaml@2.7.0))(vue@3.5.13(typescript@5.7.3))': dependencies: '@babel/core': 7.26.0 diff --git a/public/iconify/system.json b/public/iconify/system.json new file mode 100644 index 0000000..882dbcd --- /dev/null +++ b/public/iconify/system.json @@ -0,0 +1,16 @@ +{ + "prefix": "system", + "lastModified": 1716123717, + "aliases": {}, + "width": 32, + "height": 32, + "icons": { + "config": { + "body": "" + }, + "parameter": { + "body": "" + } + + } +} diff --git a/src/components/common/dynamic-input.vue b/src/components/common/dynamic-input.vue index ba5bd60..0f379a5 100644 --- a/src/components/common/dynamic-input.vue +++ b/src/components/common/dynamic-input.vue @@ -1,4 +1,11 @@ + + diff --git a/src/components/workflow/modules/drawer/branch-drawer.vue b/src/components/workflow/modules/drawer/branch-drawer.vue index 816c28e..e4317ec 100644 --- a/src/components/workflow/modules/drawer/branch-drawer.vue +++ b/src/components/workflow/modules/drawer/branch-drawer.vue @@ -138,6 +138,7 @@ const rules: FormRules = { :value="strategy.value" /> + ([]); const showDetail = (node: Workflow.ConditionNodeType, detailIndex: number) => { detailIds.value = []; - if (store.type === 4) { + if (store.type === 2) { node.jobBatchList ?.sort((a, b) => a.taskBatchStatus - b.taskBatchStatus) .forEach(item => { diff --git a/src/components/workflow/workflow.vue b/src/components/workflow/workflow.vue index 2d81e95..5aa5874 100644 --- a/src/components/workflow/workflow.vue +++ b/src/components/workflow/workflow.vue @@ -14,11 +14,13 @@ interface Props { modelValue?: Workflow.NodeDataType; spinning?: boolean; disabled?: boolean; + hisDisabled?: boolean; } const props = withDefaults(defineProps(), { disabled: false, spinning: false, + hisDisabled: false, modelValue: () => ({}) }); @@ -75,6 +77,8 @@ watch( })); } else { // window.$message?.error('获取工作流历史版本失败'); + historyID.value = syncOptions.value.filter(item => item.key == '-1')[0].label + } } } catch (error) { @@ -212,7 +216,7 @@ const onDragstop = () => { 放大 -
+