diff --git a/package.json b/package.json index ac607b0..b781b64 100644 --- a/package.json +++ b/package.json @@ -124,6 +124,7 @@ "postcss-html": "^1.5.0", "postcss-scss": "^4.0.6", "prettier": "^2.8.8", + "rollup-plugin-terser": "^7.0.2", "sass": "^1.58.3", "stylelint": "^15.5.0", "stylelint-config-html": "^1.1.0", diff --git a/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/list b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/list new file mode 100644 index 0000000..b82608c --- /dev/null +++ b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/list @@ -0,0 +1 @@ +v0.1.0 diff --git a/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.info b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.info new file mode 100644 index 0000000..92da1e1 --- /dev/null +++ b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.info @@ -0,0 +1 @@ +{"Version":"v0.1.0","Time":"2025-08-20T21:59:11Z"} \ No newline at end of file diff --git a/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.lock b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.lock new file mode 100644 index 0000000..e69de29 diff --git a/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.mod b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.mod new file mode 100644 index 0000000..b84e64d --- /dev/null +++ b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.mod @@ -0,0 +1,3 @@ +module github.com/golang/vscode-go/survey + +go 1.24.0 \ No newline at end of file diff --git a/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.zip b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.zip new file mode 100644 index 0000000..680ea2f Binary files /dev/null and b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.zip differ diff --git a/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.ziphash b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.ziphash new file mode 100644 index 0000000..7cb57f0 --- /dev/null +++ b/pkg/mod/cache/download/github.com/golang/vscode-go/survey/@v/v0.1.0.ziphash @@ -0,0 +1 @@ +h1:xb0wfrbGDzAH53rMZHzsRKysbpIE39IbHLf+QSw8VJA= \ No newline at end of file diff --git a/pkg/mod/cache/download/golang.org/x/tools/gopls/@v/v0.20.0.info b/pkg/mod/cache/download/golang.org/x/tools/gopls/@v/v0.20.0.info new file mode 100644 index 0000000..2b9d809 --- /dev/null +++ b/pkg/mod/cache/download/golang.org/x/tools/gopls/@v/v0.20.0.info @@ -0,0 +1 @@ +{"Version":"v0.20.0","Time":"2025-07-28T18:28:48Z"} \ No newline at end of file diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/lookup/github.com/golang/vscode-go/survey@v0.1.0 b/pkg/mod/cache/download/sumdb/sum.golang.org/lookup/github.com/golang/vscode-go/survey@v0.1.0 new file mode 100644 index 0000000..c87b16d --- /dev/null +++ b/pkg/mod/cache/download/sumdb/sum.golang.org/lookup/github.com/golang/vscode-go/survey@v0.1.0 @@ -0,0 +1,9 @@ +42389416 +github.com/golang/vscode-go/survey v0.1.0 h1:xb0wfrbGDzAH53rMZHzsRKysbpIE39IbHLf+QSw8VJA= +github.com/golang/vscode-go/survey v0.1.0/go.mod h1:67MoCjDPlWMr9FZ2d5BhLYR//kGR/bmjhzjy6FXSM74= + +go.sum database tree +45397085 +Q08DMHCrmZD7Zsiq5TpsB/JTYZmvPijBiIqUxsz+8fY= + +— sum.golang.org Az3grl4BXbPgBbxGJxcshVA2zNKOttFAyV8B6prkb9KDELwGDNlx0asydXInM0hqO92L4lcs/neWYXfoZ3iOd1BLfg8= diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x165/583 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x165/583 new file mode 100644 index 0000000..0923fdd Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x165/583 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x171/044 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x171/044 new file mode 100644 index 0000000..6757151 Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x171/044 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x171/044.p/15 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x171/044.p/15 new file mode 100644 index 0000000..a3b588b Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x171/044.p/15 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x177/332.p/93 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x177/332.p/93 new file mode 100644 index 0000000..3cf10c0 Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/0/x177/332.p/93 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/646 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/646 new file mode 100644 index 0000000..0129bd1 Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/646 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/668 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/668 new file mode 100644 index 0000000..c7efcf5 Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/668 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/668.p/36 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/668.p/36 new file mode 100644 index 0000000..0e149dd Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/668.p/36 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/692.p/180 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/692.p/180 new file mode 100644 index 0000000..fc006b4 Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/1/692.p/180 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/2/002.p/156 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/2/002.p/156 new file mode 100644 index 0000000..49ab266 Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/2/002.p/156 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/2/002.p/180 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/2/002.p/180 new file mode 100644 index 0000000..33db2af Binary files /dev/null and b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/2/002.p/180 differ diff --git a/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/3/000.p/2 b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/3/000.p/2 new file mode 100644 index 0000000..948d7fa --- /dev/null +++ b/pkg/mod/cache/download/sumdb/sum.golang.org/tile/8/3/000.p/2 @@ -0,0 +1,3 @@ +o +”@m°%q±£T `…ow!^ñ¾Z—{§ËéÐvÍ빜5Ñ1 "sJ®YFØñ Ç +iÂéè¶9Z•Æ9Æ \ No newline at end of file diff --git a/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/LICENSE b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/LICENSE new file mode 100644 index 0000000..bec3260 --- /dev/null +++ b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/LICENSE @@ -0,0 +1,24 @@ +vscode-go + +The MIT License (MIT) + +Original Work Copyright (c) 2015-2020 Microsoft Corporation +Current Work and Modifications Copyright (c) 2020-present The Go Authors + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/README.md b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/README.md new file mode 100644 index 0000000..94ddf6b --- /dev/null +++ b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/README.md @@ -0,0 +1,41 @@ +# Go Developer Survey Configuration + +This Go module serves the configuration file for the Go Developer Survey shown in the [VS Code Go extension](https://github.com/golang/vscode-go). + +## Purpose + +This module exists solely to host the `config.json` file. By hosting it as a Go module, it can be fetched via module proxy, providing a reliable and secure way for the VS Code Go extension to get the latest survey configuration. + +This approach is inspired by the Go team's telemetry configuration module. + +## `config.json` + +The `config.json` file defines the parameters for the Go Developer Survey. It has the following structure: + +```json +{ + "StartDate": "2023-09-01T00:00:00Z", + "EndDate": "2023-10-01T00:00:00Z", + "URL": "https://google.com/survey/url" +} +``` + +- `StartDate`: The ISO 8601 timestamp for when the survey promotion should start. +- `EndDate`: The ISO 8601 timestamp for when the survey promotion should end. +- `URL`: The URL to the survey. + +## Usage + +This module is not intended to be used as a library. It is fetched by the VS Code Go extension. + +## Tagging + +The versioning scheme follows semantic versioning, with each change to the configuration being a **minor** version increment. + +As this module is in the `survey/` subdirectory of its repository, the git tag **must** be prefixed with `survey/`. This is a requirement for Go modules located in subdirectories. For more details, see the [Go Modules documentation](https://go.dev/ref/mod#vcs-version). + +For example, if the most recent tag is `survey/v0.1.0`, the new tag should be `survey/v0.2.0`. + +## Release Process + +When changes are made to `config.json`, a new version of this module must be released. This is done by creating a new git tag that follows the convention described above. diff --git a/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/config.json b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/config.json new file mode 100644 index 0000000..ebdcea9 --- /dev/null +++ b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/config.json @@ -0,0 +1,5 @@ +{ + "StartDate": "2025-09-09T00:00:00Z", + "EndDate": "2025-10-01T00:00:00Z", + "URL": "https://google.qualtrics.com/jfe/form/SV_3wwSstC8vv4Ymkm" +} \ No newline at end of file diff --git a/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/go.mod b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/go.mod new file mode 100644 index 0000000..b84e64d --- /dev/null +++ b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/go.mod @@ -0,0 +1,3 @@ +module github.com/golang/vscode-go/survey + +go 1.24.0 \ No newline at end of file diff --git a/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/survey.go b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/survey.go new file mode 100644 index 0000000..d5446cb --- /dev/null +++ b/pkg/mod/github.com/golang/vscode-go/survey@v0.1.0/survey.go @@ -0,0 +1,9 @@ +// The survey package holds the config.json file defining the Go Developer +// Survey configuration. +// +// The survey configuration specifies the survey's start and end dates, and the +// URL for the survey. +// +// This package contains no actual Go code, and exists only so the config.json +// file can be served by module proxies. +package survey diff --git a/src/api/DesignForm/filterUnit.ts b/src/api/DesignForm/filterUnit.ts index 1105823..208369a 100644 --- a/src/api/DesignForm/filterUnit.ts +++ b/src/api/DesignForm/filterUnit.ts @@ -6,7 +6,7 @@ import { layoutUnit } from "@/api/DesignForm/fieldUnit"; @ 功能: 解æžå‡ºè¡¨å•å¯ä½œä¸ºAIå˜é‡çš„元素 */ const analysisFromUnit = (unitInfo:formStruct) => { - console.log("解æžå‡ºè¡¨å•å¯ä½œä¸ºAIå˜é‡çš„元素------------>",unitInfo) + // console.log("解æžå‡ºè¡¨å•å¯ä½œä¸ºAIå˜é‡çš„元素------------>",unitInfo) let optionsInfo = new Array if(unitInfo.formData&&unitInfo.formData.list && unitInfo.formData.list.length>0 ){ unitInfo.formData.list.forEach((item:any) => { @@ -17,7 +17,7 @@ const analysisFromUnit = (unitInfo:formStruct) => { //显示å­è¡¨å•å­—段 if(item.type=="table"){ - item.list.forEach(eles => { + item.list.forEach((eles: { label: string; item: { label: string; }; unitName: string; name: any; }) => { let labelName = "" if(eles.label){ labelName = eles.label diff --git a/src/api/DesignForm/flowPower.ts b/src/api/DesignForm/flowPower.ts new file mode 100644 index 0000000..a0734c3 --- /dev/null +++ b/src/api/DesignForm/flowPower.ts @@ -0,0 +1,7 @@ +const allNodePwoer = inject('flowNodePower') +const currentNodePowerKey = inject('currentNodeKey') + +export const ObtainAuthorization = (key:string,types?:number) => { + console.log("测试是å¦èŽ·å–授æƒ-1-->",allNodePwoer) + console.log("测试是å¦èŽ·å–授æƒ-2-->",currentNodePowerKey) +} diff --git a/src/api/DesignForm/type.ts b/src/api/DesignForm/type.ts index c3b865a..6a18c2f 100644 --- a/src/api/DesignForm/type.ts +++ b/src/api/DesignForm/type.ts @@ -31,8 +31,9 @@ export type CustomerFormPageResult = PageResult; //åˆå§‹åŒ–表å•åŸºæœ¬ä¿¡æ¯ export interface customerFormConfig{ - formname:string; + formName:string; formlogo:string; + signCode:string; } //æ ¹æ®Id获å–ä¿¡æ¯ export interface getContForId{ @@ -206,7 +207,8 @@ export interface formTableField{ export interface tableButtonEs { id?: string; name?: string; - field?: string; + field?: any; + label?: string; types?: string; attribute:string; pattern?: string; diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts index 22e2461..3081a6e 100644 --- a/src/api/DesignForm/types.ts +++ b/src/api/DesignForm/types.ts @@ -10,9 +10,9 @@ export interface FormList { tableData?: any // å­è¡¨æ—¶ options?: Options[] // radio;checkbox;select选项 styles:{ - divStyle:{}, - labelStyle:{}, - inputStyle:{} + divStyle:any, + labelStyle:any, + inputStyle:any } } export interface Options { @@ -118,15 +118,26 @@ export interface formData{ qrCodeOutside:boolean, qrCodePrintStyle:any, qrCodeShowFields:any, + labelPosition:string, + dataSource:string, + dataSourceConfig:{ + id: string, + dataBaseName: string, + tableName: string, + tableKey: string, + dsn: {}, + } }; config: any; events?:any; styles:{ + labelPosition:"", divStyle:{}, labelStyle:{}, inputStyle:{} }; purview?:any[]; + aiConfig?:any[]; } //表å•åŸºæœ¬ä¿¡æ¯ export interface formTableInfo{ diff --git a/src/api/role/index.ts b/src/api/role/index.ts index ff27c57..eb3c246 100644 --- a/src/api/role/index.ts +++ b/src/api/role/index.ts @@ -1,6 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; -import { RoleQuery, RolePageResult, RoleForm } from './types'; +import { RoleQuery, RolePageResult, RoleForm,RoleListTree,orgAndPostisListTree } from './types'; /** * 获å–è§’è‰²åˆ†é¡µæ•°æ® @@ -119,3 +119,43 @@ export function gainRoleList(data?: any) { data: data }); } + +//获å–角色树 +export function giveRoleTree(): AxiosPromise { + return request({ + url: "/systemapi/permission/giveRoleTree", + method: "POST" + }); +} + +//获å–角色组树 +export function giveRoleGroupTree(): AxiosPromise { + return request({ + url: "/systemapi/permission/giveRoleGroupTree", + method: "POST" + }); +} +//编辑角色 +export function editRoleCont(data?: any) { + return request({ + url: "/systemapi/permission/editRoleCont", + method: "POST", + data: data + }); +} +//ä¿®æ”¹è§’è‰²çŠ¶æ€ +export function editRoleStatus(data?: any) { + return request({ + url: "/systemapi/permission/editRoleStatus", + method: "POST", + data: data + }); +} +//获å–行政组织加岗ä½æ ‘ +export function getOrgPostTree(data?: any) : AxiosPromise { + return request({ + url: "/systemapi/permission/getOrgPostTree", + method: "POST", + data: data + }); +} \ No newline at end of file diff --git a/src/api/role/types.ts b/src/api/role/types.ts index 2d259c7..c95fa97 100644 --- a/src/api/role/types.ts +++ b/src/api/role/types.ts @@ -76,3 +76,34 @@ export interface RoleForm { */ status?: number; } + +export interface RoleListTree{ + id:string|number; + label:string; + types:number; + status:boolean; + superior:string|number; + sort:number; + children?:RoleListTree[] +} + +//ç¼–è¾‘è§’è‰²ä¿¡æ¯ +export interface RoleFormInfo{ + id?:string|number; + name:string; + type:string|number; + superior:string|number; + sort:number; +} +//行政组织加岗ä½æ ‘ +export interface orgAndPostisListTree{ + id:string|number; + label:string; + types:string; + typeName:string; + status:boolean; + superior:string|number; + key:string; + sort:number; + children?:orgAndPostisListTree[] +} \ No newline at end of file diff --git a/src/api/taskapi/management.ts b/src/api/taskapi/management.ts index b28dacc..7678209 100644 --- a/src/api/taskapi/management.ts +++ b/src/api/taskapi/management.ts @@ -77,7 +77,7 @@ export function generateFlow(data: nodeFlow):any{ //获å–任务表å•å†…容 -export function gainTaskFormInfo(data: customerFormLogo):AxiosPromise { +export function gainTaskFormInfo(data: customerFormLogo) { return request({ url: '/systemapi/task_management/gainTaskFormInfo', method: 'post', @@ -104,7 +104,7 @@ export function gainEditDataLog(data: any):any{ } //添加任务是回显表å•æ•°æ®ï¼Œè‹¥æœ‰æµç¨‹å›žæ˜¾æµç¨‹ -export function echoTableFormPage(data: any):any{ +export function echoTableFormPage(data: any){ return request({ url: '/systemapi/task_management/echoTableFormPage', method: 'post', diff --git a/src/api/taskapi/types.ts b/src/api/taskapi/types.ts index e5d114e..af21294 100644 --- a/src/api/taskapi/types.ts +++ b/src/api/taskapi/types.ts @@ -41,6 +41,7 @@ export interface taskListCont{ //自定义表å•æ ‡è¯†ç¬¦ export interface customerFormLogo{ id:string; + runFlowId?:string; } //自定义表å•ç‰ˆæœ¬å†…容 export interface customerFormVersionCont{ @@ -109,3 +110,22 @@ export interface runWeekInfo { hour:number; minute:number; } +//èŠ‚ç‚¹èµ‹æƒ +export interface nodePoweInfo { + nodeKey:string; + powerAry:powerAryInfo[]; + apiSetup?:apiSetupInfo +} +//节点ç¦æ³‰ç»“构体 +export interface powerAryInfo{ + id:string; + isEdit:boolean; + isLook:boolean; + name:string; + status?:number +} +//节点ç¦æ³‰è¡¥å…… +export interface apiSetupInfo{ + library?:any[]; + title?:any[]; +} diff --git a/src/api/workflowapi/index.ts b/src/api/workflowapi/index.ts index 3495ed3..e5e5c47 100644 --- a/src/api/workflowapi/index.ts +++ b/src/api/workflowapi/index.ts @@ -1,5 +1,6 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; +import { powerNoke } from './types'; import { formTableName, @@ -128,3 +129,12 @@ export function setFlowFormKeyPower(data: any) { data: data }); } + +//获å–æ‰€æœ‰ç»„ä»¶çŠ¶æ€ +export function analyFormJsonMap(data: any): AxiosPromise { + return request({ + url: '/systemapi/task_flow/analyFormJsonMap', + method: 'post', + data: data + }); +} diff --git a/src/api/workflowapi/types.ts b/src/api/workflowapi/types.ts index 8e5df98..e54912b 100644 --- a/src/api/workflowapi/types.ts +++ b/src/api/workflowapi/types.ts @@ -24,3 +24,17 @@ export interface optionsInfo{ label:string; value:string; } + +export interface powerNoke{ + nodeKey:string; + recUnitAry?:powerNokeInfo[] +} +export interface powerNokeInfo{ + id: string; + name: string; + status: number; + isLook: boolean; + isEdit: boolean; + sort?: number; + list?:powerNoke[]; +} diff --git a/src/assets/icons/dels.svg b/src/assets/icons/dels.svg new file mode 100644 index 0000000..b087828 --- /dev/null +++ b/src/assets/icons/dels.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/components/DesignForm/aceDrawer.vue b/src/components/DesignForm/aceDrawer.vue index de58f47..6b6ec6a 100644 --- a/src/components/DesignForm/aceDrawer.vue +++ b/src/components/DesignForm/aceDrawer.vue @@ -74,7 +74,7 @@ const jiShuDiGui = (val: []) => { if (!Array.isArray(val)) return (jibuqi = 0); val.forEach((item: any) => { jibuqi++; - console.log("递归查数", jibuqi); + // console.log("递归查数", jibuqi); if (item.children && item.children.length > 0) { jiShuDiGui(item.children); } @@ -113,7 +113,7 @@ const drawerBeforeClose = () => { treeSelectAry.value = []; }; onMounted(() => { - console.log("预览视图--------------------------------》", props.data); + // console.log("预览视图--------------------------------》", props.data); }); onUnmounted(() => { if (Object.keys(editor.value).length !== 0) { @@ -217,7 +217,7 @@ const dialogConfirmTree = () => { // }) // emits('confirm', treeSelectAry) - console.log("回填主表值", treeSelectAry.value); + // console.log("回填主表值", treeSelectAry.value); emits("confirmTree", treeSelectAry.value, props.data.type); drawerBeforeClose(); }; @@ -227,9 +227,9 @@ const dialogConfirmTree = () => { @ 功能: åˆ é™¤æŒ‡å®šèŠ‚ç‚¹æ•°æ® */ const pickDel = (val: treeStruct) => { - console.log("è¦åˆ é™¤å¾—节点-->", val.value); + // console.log("è¦åˆ é™¤å¾—节点-->", val.value); delDiGui(treeSelectAry.value, val); - console.log("删除指定节点数æ®---结果-->", treeSelectAry); + // console.log("删除指定节点数æ®---结果-->", treeSelectAry); }; /** @ 作者: 秦东 @@ -237,7 +237,7 @@ const pickDel = (val: treeStruct) => { @ 功能: 执行递归删除 */ const delDiGui = (tree: treeStruct[], val: treeStruct) => { - console.log("è¦åˆ é™¤å¾—节点-11->", tree, val.value); + // console.log("è¦åˆ é™¤å¾—节点-11->", tree, val.value); for (let i = 0; i < tree.length; i++) { const node = tree[i]; if (node.value == val.value) { diff --git a/src/components/DesignForm/formControlPropertiNew.vue b/src/components/DesignForm/formControlPropertiNew.vue index 2320cf8..372ab19 100644 --- a/src/components/DesignForm/formControlPropertiNew.vue +++ b/src/components/DesignForm/formControlPropertiNew.vue @@ -1429,7 +1429,7 @@ const getPropByPath = (obj: any, path: string, val: any) => { } } // liwenxuan å…³è”选项设置会在标签å称改å˜æ—¶æ¸…空 end 250410 - console.log("修改指定路径下的值", keyArr, tempObj); + // console.log("修改指定路径下的值", keyArr, tempObj); let i = 0; for (i; i < keyArr.length - 1; i++) { const key = keyArr[i]; @@ -1623,12 +1623,12 @@ const openAttrDialog = (type?: string, tooltip?: string) => { console.log("更多属性弹窗", controlData.value); switch (type) { case "treeSelect": - console.log("更多属性弹窗", controlData.value.control.data); + // console.log("更多属性弹窗", controlData.value.control.data); editData = controlData.value.control.data; break; case "cascader": - console.log("更多属性级è”", controlData.value.options); + // console.log("更多属性级è”", controlData.value.options); editData = controlData.value.options; break; case "optionsParams": // 选项请求附加å‚æ•° @@ -1647,12 +1647,12 @@ const openAttrDialog = (type?: string, tooltip?: string) => { callback: (result: any) => { switch (type) { case "treeSelect": - console.log("更多属性弹窗会写数æ®ï¼š", result); + // console.log("更多属性弹窗会写数æ®ï¼š", result); controlData.value.control.data = result; - console.log( - "更多属性弹窗会写数æ®-----1------>：", - controlData.value.control.data - ); + // console.log( + // "更多属性弹窗会写数æ®-----1------>：", + // controlData.value.control.data + // ); break; case "cascader": controlData.value.options = result; @@ -1895,8 +1895,8 @@ const isNotWrite = (val: any) => { return false; }; const isNotWriteWord = (val: any) => { - console.log("isNotWriteWord---->", val); - console.log("isNotWriteWord--formField-->", props.formField); + // console.log("isNotWriteWord---->", val); + // console.log("isNotWriteWord--formField-->", props.formField); if ( val.eventName === "filedNameKey" && props.customerformid != "" && @@ -1921,7 +1921,7 @@ const formListmap = ref(); const subUnit = ref(); //é»˜è®¤å€¼å¤„ç† const digitPageSub = (val: any, envt: any) => { - console.log("默认值处ç†--->", val, envt, props.formData); + // console.log("默认值处ç†--->", val, envt, props.formData); // console.log("默认值处ç†-1-->",props.formList) // console.log("默认值处ç†-2-->",props.formConfig) @@ -2161,7 +2161,7 @@ function haveOrgTreeInfo() { //orgTreeLoading.value = true; getOrgTreeList({ orgid: 309 }) .then(({ data }) => { - console.log("行政组织树对照值", data); + // console.log("行政组织树对照值", data); @@ -2993,7 +2993,7 @@ function associatedFormsHideDialoghandle() { controlData.value.control.hideConditionHtmlCopy = controlData.value.control.hideConditionHtml; nextTick(() => { - aft.value.focusEditor(); + aft.value.focusEditor }); } @@ -3496,8 +3496,8 @@ watch( ) ); } else { - console.log(changedOptions); - console.log(controlData.value.control.glxxsz); + // console.log(changedOptions); + // console.log(controlData.value.control.glxxsz); for (var i = 0; i < changedOptions.length; i++) { if (controlData.value.control.glxxsz[i] === undefined) { //新增了æŸä¸ªoption @@ -3923,7 +3923,7 @@ const requiredText = (val: any) => { @ 功能: æ ¡éªŒæ–‡æœ¬æ¡†æ”¹å˜ */ const requiredTextRadio = (val: any) => { - console.log("校验文本框改å˜-->", val); + // console.log("校验文本框改å˜-->", val); if (val.type == radioVerify.type) { if (typeof controlData.value.customRules == "object") { if (Array.isArray(controlData.value.customRules)) { @@ -3992,7 +3992,7 @@ const requiredChangeSet = (val: boolean) => { @ 功能: å•é€‰æ”¹å˜äº‹ä»¶ */ const radioChangeSet = (val: any) => { - console.log("å•é€‰æ”¹å˜äº‹ä»¶-222-->", val); + // console.log("å•é€‰æ”¹å˜äº‹ä»¶-222-->", val); let pickRadio = {}; let isTrue = true; textUinrVerfy.forEach((item: any) => { @@ -4056,7 +4056,7 @@ watch( // } }); } else { - console.log("formData.value---------------", formData.value); + // console.log("formData.value---------------", formData.value); if (formData.value.dataSourceConfi) { formData.value.dataSourceConfig.id = ""; formData.value.dataSourceConfig.dataBaseName = ""; @@ -4072,7 +4072,7 @@ watch( } formAttr.value.forEach((item) => { - console.log(item.label, "item.", item.type); + // console.log(item.label, "item.", item.type); if (!item.hide) { if (!item.type) { // console.log(item.label, "item.", item.type); @@ -4269,7 +4269,7 @@ function resetClick(){ function delRowClick(param: any){ let key = param.key - console.log(key) + // console.log(key) controlData.value.control.roleCheckDataList = controlData.value.control.roleCheckDataList.filter((item: { key: any; }) => item.key !== key); let arr: any[] = [] controlData.value.control.roleCheckDataList.forEach((element: { key: string; }) => { @@ -4316,7 +4316,7 @@ const closeDataSource = () => { */ // const dataList = ref([]); const updataBase = (val: any) => { - console.log("设定关è”æ•°æ®", val); + // console.log("设定关è”æ•°æ®", val); formData.value.dataSourceConfig.id = val.id; formData.value.dataSourceConfig.dataBaseName = val.dataBaseName; formData.value.dataSourceConfig.tableName = val.tableName; diff --git a/src/components/DesignForm/public/expand/org.vue b/src/components/DesignForm/public/expand/org.vue index 6844fbf..ee26a75 100644 --- a/src/components/DesignForm/public/expand/org.vue +++ b/src/components/DesignForm/public/expand/org.vue @@ -11,7 +11,7 @@ const props = withDefaults( defineProps<{ modelValue?: string; disabled?: boolean; - data?: Object; + data?: any; }>(), {} ); @@ -24,7 +24,7 @@ const value = computed({ if(hasComma(props.modelValue)||multiple){ return commaStringToNumberArray(props.modelValue) }else{ - return props.modelValue * 1; + return props.modelValue; } } else { return props.modelValue; @@ -131,13 +131,13 @@ function haveOrgTreeInfo() { orgTreeLoading.value = true; getOrgTreeList({ orgid: 309 }) .then(({ data }) => { - console.log("行政组织树对照值", data); + // console.log("行政组织树对照值", data); //liwenxuan 250916 start // 目标ID数组（需ä¿ç•™çš„核心节点ID）自动忽略id数组中为其他idå­èŠ‚点的id const targetIds = props.data.control.range - console.log(targetIds) + // console.log(targetIds) if(targetIds&&targetIds.length>0){ // 执行过滤 const filteredTree = filterOrganizationTree(data, targetIds); @@ -233,7 +233,7 @@ function filterChildTargetIds(targetIds: any[], nodeMap: Map) { // å‘上追溯所有祖先，判断是å¦æœ‰ç¥–先在有效目标ID中 while (parentId !== undefined && nodeMap.has(parentId)) { if (validTargetIds.includes(parentId)) { - console.log(`æ示：ID ${currentId} 是目标ID ${parentId} çš„å­èŠ‚点，已忽略`); + // console.log(`æ示：ID ${currentId} 是目标ID ${parentId} çš„å­èŠ‚点，已忽略`); return false; // 是其他目标IDçš„å­èŠ‚点，排除 } parentId = nodeMap.get(parentId).superior; // 继续å‘上追溯 diff --git a/src/components/DesignForm/public/expand/pickpost.vue b/src/components/DesignForm/public/expand/pickpost.vue index 3cf03ea..288bd02 100644 --- a/src/components/DesignForm/public/expand/pickpost.vue +++ b/src/components/DesignForm/public/expand/pickpost.vue @@ -71,7 +71,7 @@ function haveOrgTreeInfo() { orgTreeLoading.value = true; getOrgTreeList({ orgid: 309 }) .then(({ data }) => { - console.log("行政组织树对照值", data); + // console.log("行政组织树对照值", data); orgTreeList.value = data; }) .finally(() => { diff --git a/src/components/DesignForm/public/form/childTable.vue b/src/components/DesignForm/public/form/childTable.vue index abd0e2c..34caf36 100644 --- a/src/components/DesignForm/public/form/childTable.vue +++ b/src/components/DesignForm/public/form/childTable.vue @@ -63,7 +63,7 @@ onMounted(()=>{ } }) const addColumn = () => { - console.log("如果编辑页ç¦ç”¨æ—¶--------->", tableDataNew.value); + // console.log("如果编辑页ç¦ç”¨æ—¶--------->", tableDataNew.value); const temp: any = {}; if (props.data.list) { props.data.list.forEach((item: any) => { @@ -71,15 +71,15 @@ const addColumn = () => { temp[item.name] = item.control.modelValue; } }); - console.log("如果编辑页ç¦ç”¨æ—¶-------temp:", temp); - console.log("如果编辑页ç¦ç”¨æ—¶-------jsonParseStringify:", jsonParseStringify(temp)); + // console.log("如果编辑页ç¦ç”¨æ—¶-------temp:", temp); + // console.log("如果编辑页ç¦ç”¨æ—¶-------jsonParseStringify:", jsonParseStringify(temp)); tableDataNew.value.push(jsonParseStringify(temp)); } }; const getText = (text: any, val: any, name: any) => { - console.log("text===>", text); - console.log("name===>", name); - console.log("val===>", val); + // console.log("text===>", text); + // console.log("name===>", name); + // console.log("val===>", val); if (typeof text === "string") { return text; } else { diff --git a/src/components/DesignForm/public/form/formGroup.vue b/src/components/DesignForm/public/form/formGroup.vue index 2099408..f7d9d27 100644 --- a/src/components/DesignForm/public/form/formGroup.vue +++ b/src/components/DesignForm/public/form/formGroup.vue @@ -16,7 +16,8 @@ import { constFormBtnEvent, constFormProps } from "@/api/DesignForm/utils"; import { Md5 } from "ts-md5"; import { jsonParseStringify } from "@/utils/DesignForm"; import request from "@/utils/request"; -import { AnalysisCss } from "@/components/DesignForm/public/form/calculate/cssInfo.ts"; +import { AnalysisCss } from "@/components/DesignForm/public/form/calculate/cssInfo"; +import { nodePoweInfo,powerAryInfo } from "@/api/taskapi/types"; const props = withDefaults( defineProps<{ @@ -53,7 +54,7 @@ watch( () => props.data, (v: FormList[]) => { dataList.value = v; - console.log("监å¬è¡¨å•å˜åŒ–++++++++++>", v); + // console.log("监å¬è¡¨å•å˜åŒ–++++++++++>", v); }, { deep: true, @@ -143,11 +144,11 @@ const draggableAdd = (evt: any) => { const key = new Date().getTime().toString(); const obj: any = dataList.value[newIndex]; const isNested = evt.target && evt.target.getAttribute("data-type"); // ä¸èƒ½åµŒå¥— - console.log("设计拖拽事件-----1------->", newIndex); - console.log("设计拖拽事件-----2------->", key); - console.log("设计拖拽事件-----3------->", obj); - console.log("设计拖拽事件-----4------->", isNested); - console.log("设计拖拽事件-----4------->", dataList.value); + // console.log("设计拖拽事件-----1------->", newIndex); + // console.log("设计拖拽事件-----2------->", key); + // console.log("设计拖拽事件-----3------->", obj); + // console.log("设计拖拽事件-----4------->", isNested); + // console.log("设计拖拽事件-----4------->", dataList.value); if ( (isNested === "not-nested" && notNested(obj.type)) || ((isNested === "not-table" || isNested === "not-flex") && @@ -273,7 +274,7 @@ const groupClick = (item: any, ele?: string) => { state.gridAdd = item.type === "grid"; // state.clone = !notNested(item.type) state.clone = !notNestedTableFlex(item.type); - console.log("点击激活当å‰--->", store); + // console.log("点击激活当å‰--->", store); }; // 返回栅格宽度 const getFormItemStyle = (ele: FormList) => { @@ -494,7 +495,7 @@ function asfValueChanged(val: any) { fillFieldsChild = fillFieldsChild.filter((element: any) => { if (containsDangerousWords(element.filterCondition.gongShi.mathsFormula)) { //alert("筛选æ¡ä»¶éžæ³•") - console.log("筛选æ¡ä»¶éžæ³•===>" + element.filterCondition.conditionHtml); + // console.log("筛选æ¡ä»¶éžæ³•===>" + element.filterCondition.conditionHtml); } else { return element; } @@ -752,6 +753,48 @@ function optionsValue3GetTable(data: any, fieldName: string) { /* */ + +const allNodePwoer = inject('flowNodePower') as any +const currentNodePowerKey = inject('currentNodeKey') as any + +//获å–当å‰èŠ‚ç‚¹æŽˆæƒ +const curNodePowerAry = () => { + if(currentNodePowerKey && currentNodePowerKey.value && currentNodePowerKey.value != ""){ + if(allNodePwoer.value && Array.isArray(allNodePwoer.value) && allNodePwoer.value.length > 0){ + let powerAry: any[] = [] + allNodePwoer.value.forEach((item:nodePoweInfo) => { + if(item.nodeKey == currentNodePowerKey.value){ + powerAry = item.powerAry + } + }) + return powerAry + }else{ + return [] + } + }else{ + return [] + } +} +/** +@ 作者: 秦东 +@ 时间: 2025-11-06 14:03:21 +@ 功能: 判断此组件是å¦å¯è§ +*/ +const judgeIsShow = (key: string) => { + let myPower = curNodePowerAry() //获å–æƒé™æ•°ç»„ + if(Array.isArray(myPower) && myPower.length > 0){ + let isOk = true + myPower.forEach((item:powerAryInfo) => { + if(key == item.id){ + isOk = item.isLook + } + }) + return isOk + }else{ + return true + } +} +