diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json index 437c25928..1340bf38a 100644 --- a/node_modules/.package-lock.json +++ b/node_modules/.package-lock.json @@ -1027,6 +1027,12 @@ "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", "dev": true }, + "node_modules/@types/spark-md5": { + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/@types/spark-md5/-/spark-md5-3.0.4.tgz", + "integrity": "sha512-qtOaDz+IXiNndPgYb6t1YoutnGvFRtWSNzpVjkAPCfB2UzTyybuD4Tjgs7VgRawum3JnJNRwNQd4N//SvrHg1Q==", + "dev": true + }, "node_modules/@types/svgo": { "version": "2.6.4", "resolved": "https://registry.npmmirror.com/@types/svgo/-/svgo-2.6.4.tgz", @@ -8191,6 +8197,11 @@ "deprecated": "See https://github.com/lydell/source-map-url#deprecated", "dev": true }, + "node_modules/spark-md5": { + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/spark-md5/-/spark-md5-3.0.2.tgz", + "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==" + }, "node_modules/spdx-correct": { "version": "3.2.0", "resolved": "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz", diff --git a/package-lock.json b/package-lock.json index 8d015cf22..6c3a3cfbb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,6 +30,7 @@ "path-to-regexp": "^6.2.0", "pinia": "^2.1.6", "screenfull": "^6.0.0", + "spark-md5": "^3.0.2", "tinymce": "^6.8.1", "ts-md5": "^1.3.1", "uuid": "^9.0.1", @@ -47,6 +48,7 @@ "@types/md5": "^2.3.2", "@types/nprogress": "^0.2.0", "@types/path-browserify": "^1.0.0", + "@types/spark-md5": "^3.0.4", "@types/uuid": "^9.0.7", "@typescript-eslint/eslint-plugin": "^5.59.6", "@typescript-eslint/parser": "^5.59.6", @@ -1421,6 +1423,12 @@ "integrity": "sha512-MMzuxN3GdFwskAnb6fz0orFvhfqi752yjaXylr0Rp4oDg5H0Zn1IuyRhDVvYOwAXoJirx2xuS16I3WjxnAIHiQ==", "dev": true }, + "node_modules/@types/spark-md5": { + "version": "3.0.4", + "resolved": "https://registry.npmmirror.com/@types/spark-md5/-/spark-md5-3.0.4.tgz", + "integrity": "sha512-qtOaDz+IXiNndPgYb6t1YoutnGvFRtWSNzpVjkAPCfB2UzTyybuD4Tjgs7VgRawum3JnJNRwNQd4N//SvrHg1Q==", + "dev": true + }, "node_modules/@types/svgo": { "version": "2.6.4", "resolved": "https://registry.npmmirror.com/@types/svgo/-/svgo-2.6.4.tgz", @@ -8598,6 +8606,11 @@ "deprecated": "See https://github.com/lydell/source-map-url#deprecated", "dev": true }, + "node_modules/spark-md5": { + "version": "3.0.2", + "resolved": "https://registry.npmmirror.com/spark-md5/-/spark-md5-3.0.2.tgz", + "integrity": "sha512-wcFzz9cDfbuqe0FZzfi2or1sgyIrsDwmPwfZC4hiNidPdPINjeUwNfv5kldczoEAcjl9Y1L3SM7Uz2PUEQzxQw==" + }, "node_modules/spdx-correct": { "version": "3.2.0", "resolved": "https://registry.npmmirror.com/spdx-correct/-/spdx-correct-3.2.0.tgz", diff --git a/package.json b/package.json index b39c53265..e03d75bce 100644 --- a/package.json +++ b/package.json @@ -49,9 +49,9 @@ "@wecom/jssdk": "^1.3.2", "axios": "^1.4.0", "clipboard": "^2.0.11", + "echarts": "^5.4.3", "element-plus": "^2.3.4", "font-awesome": "^4.7.0", - "echarts": "^5.4.3", "js-beautify": "^1.14.8", "js-md5": "^0.7.3", "mapv-three": "^1.0.18", @@ -61,6 +61,7 @@ "path-to-regexp": "^6.2.0", "pinia": "^2.1.6", "screenfull": "^6.0.0", + "spark-md5": "^3.0.2", "tinymce": "^6.8.1", "ts-md5": "^1.3.1", "uuid": "^9.0.1", @@ -78,6 +79,7 @@ "@types/md5": "^2.3.2", "@types/nprogress": "^0.2.0", "@types/path-browserify": "^1.0.0", + "@types/spark-md5": "^3.0.4", "@types/uuid": "^9.0.7", "@typescript-eslint/eslint-plugin": "^5.59.6", "@typescript-eslint/parser": "^5.59.6", diff --git a/src/api/DesignForm/gromGroup/api.ts b/src/api/DesignForm/gromGroup/api.ts new file mode 100644 index 000000000..821cb333f --- /dev/null +++ b/src/api/DesignForm/gromGroup/api.ts @@ -0,0 +1,28 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { fromGroupSearch,fromGroupInfo,editFromGroupInfo,shareId } from "@/api/DesignForm/gromGroup/types"; + +/** +@ 作者: 秦东 +@ 时间: 2024-03-09 10:10:55 +@ 功能: 获取分组内容 +*/ +export function gainFormGroupInfo(data:shareId){ + return request({ + url: '/systemapi/customer_form/gainFormGroupInfo', + method: 'post', + data: data + }); +} +/** +@ 作者: 秦东 +@ 时间: 2024-03-09 13:05:37 +@ 功能: 添加表单分组内容 +*/ +export function addCustomerFormGroup(data:fromGroupInfo){ + return request({ + url: '/systemapi/customer_form/addCustomerFormGroup', + method: 'post', + data: data + }); +} diff --git a/src/api/DesignForm/gromGroup/data.ts b/src/api/DesignForm/gromGroup/data.ts new file mode 100644 index 000000000..b7465f022 --- /dev/null +++ b/src/api/DesignForm/gromGroup/data.ts @@ -0,0 +1,128 @@ +/** +@ 作者: 秦东 +@ 时间: 2024-03-06 16:59:53 +@ 功能: 状态数组 +*/ +export const groupStateAry = [ + { + "key":1, + "label":"启用", + "value":1 + }, + { + "key":2, + "label":"禁用", + "value":2 + } +] +/** +@ 作者: 秦东 +@ 时间: 2024-03-09 14:31:45 +@ 功能: 保存按钮 +*/ +export const submitButton = { + type: "div", + control:{}, + config:{ + textAlign: "center", + span: "" + }, + list: [ + { + type: "button", + control: + { + label: "保存", + type: "primary", + key: "submit" + }, + config: + { + textAlign: "center" + }, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } + } + ] +} +/** +@ 作者: 秦东 +@ 时间: 2024-03-09 14:33:07 +@ 功能: 返回按钮 +*/ +export const cancelButton = { + type: "div", + control:{}, + config:{ + textAlign: "center", + span: "" + }, + list: [ + { + type: "button", + control:{ + label: "返回", + type: "danger", + key: "cancel" + }, + config:{ + textAlign: "center" + }, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } + } + ] +} +/** +@ 作者: 秦东 +@ 时间: 2024-03-09 14:34:15 +@ 功能: 保存和提交 +*/ +export const submitAndCancelButton = { + type: "div", + control:{}, + config:{ + span: 24, + textAlign: "center" + }, + list: [ + { + type: "button", + control:{ + label: "保存", + type: "primary", + key: "submit" + }, + config:{ + span: 0 + }, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } + }, + { + type: "button", + control:{ + label: "返回", + type: "danger", + key: "cancel" + }, + config:{ + span: 0 + }, + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + } + } + ] +}; diff --git a/src/api/DesignForm/gromGroup/types.ts b/src/api/DesignForm/gromGroup/types.ts new file mode 100644 index 000000000..663f30c69 --- /dev/null +++ b/src/api/DesignForm/gromGroup/types.ts @@ -0,0 +1,46 @@ +/** +@ 作者: 秦东 +@ 时间: 2024-03-09 10:00:17 +@ 功能: 通用ID +*/ +export interface shareId{ + id: string|number; +} +/** +@ 作者?: 秦东 +@ 时间: 2024-03-06 16:24:01 +@ 功能: 搜索自定义表单分组条件 +*/ +export interface fromGroupSearch { + name?:string; + orgid?:string; + superior?:string; + state?:number; +} +/** +@ 作者: 秦东 +@ 时间: 2024-03-09 10:01:23 +@ 功能: 表单分组内容 +*/ +export interface fromGroupInfo { + title?:string; + icon?:string; + sort?:number; + ordid?:string; +} +/** +@ 作者: 秦东 +@ 时间: 2024-03-09 10:03:05 +@ 功能: 编辑表单分组内容 +*/ +export interface editFromGroupInfo extends fromGroupInfo { + id: string|number; +} +/** +@ 作者: 秦东 +@ 时间: 2024-03-09 10:03:05 +@ 功能: 编辑表单分组状态 +*/ +export interface editFromGroupState extends shareId { + status: number; +} diff --git a/src/api/DesignForm/type.ts b/src/api/DesignForm/type.ts index 0f0526d98..8f4b867cf 100644 --- a/src/api/DesignForm/type.ts +++ b/src/api/DesignForm/type.ts @@ -133,6 +133,7 @@ export interface hanziToPinyin{ title:string; types:number; connector:string; + formJson?:string; } //获取工作流步进节点 export interface nodeFlow extends enableVersionId{ diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts index 454dfcb27..869001111 100644 --- a/src/api/DesignForm/types.ts +++ b/src/api/DesignForm/types.ts @@ -106,7 +106,13 @@ export interface formData{ formName:any }; config: any; - events?:any + events?:any; + styles:{ + divStyle:{}, + labelStyle:{}, + inputStyle:{} + }; + purview?:any[]; } //表单基本信息 export interface formTableInfo{ diff --git a/src/api/workflowapi/index.ts b/src/api/workflowapi/index.ts index f4a65e55d..3495ed364 100644 --- a/src/api/workflowapi/index.ts +++ b/src/api/workflowapi/index.ts @@ -95,3 +95,36 @@ export function switchFlowVersion(data: any) { data: data }); } +//判断是否已经存在工作流以及是否开启 +export function judgeFormFlowIsOpen(data: any) { + return request({ + url: '/systemapi/task_flow/judgeFormFlowIsOpen', + method: 'post', + data: data + }); +} +//开启或关闭表单流程 +export function openFormFlow(data: any) { + return request({ + url: '/systemapi/task_flow/openFormFlow', + method: 'post', + data: data + }); +} + +//获取所有组件状态 +export function analysisForm(data: any) { + return request({ + url: '/systemapi/task_flow/analysisForm', + method: 'post', + data: data + }); +} +//编辑节点权限 +export function setFlowFormKeyPower(data: any) { + return request({ + url: '/systemapi/task_flow/setFlowFormKeyPower', + method: 'post', + data: data + }); +} diff --git a/src/assets/images/3.png b/src/assets/images/3.png new file mode 100644 index 000000000..96e90550b Binary files /dev/null and b/src/assets/images/3.png differ diff --git a/src/assets/scss/form.css b/src/assets/scss/form.css new file mode 100644 index 000000000..203f2a9a0 --- /dev/null +++ b/src/assets/scss/form.css @@ -0,0 +1,948 @@ +@charset "UTF-8"; +.design-container { + margin: 10px !important; + display: flex; + background-color: #FFFFFF; +} + +.components-list { + width: 250px; + padding: 8px 0; + overflow-y: auto; + height: calc(100vh - 40px); + position: relative; + overflow-x: hidden; +} + +.components-list .title { + padding: 8px 12px; + position: relative; +} + +.components-list .title .template { + position: absolute; + right: 12px; + top: 0; + padding: 8px; + cursor: pointer; +} + +.components-list ul { + position: relative; + overflow: hidden; + padding: 0 10px 10px; + margin: 0; +} + +.components-list ul li { + font-size: 13px; + display: flex; + width: 48%; + line-height: 28px; + position: relative; + float: left; + left: 0; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + margin: 0 1% 5px; + color: #333; + padding: 0 10px; + border: 1px solid transparent; + background: #f4f6fc; + user-select: none; + align-items: center; +} + +.components-list ul li i { + margin-right: 5px; +} + +.components-list ul li:hover { + color: #66b1ff; + border: 1px dashed #66b1ff; + cursor: move; +} + +.components-list ul li.title { + padding: 0 10px; +} + +.components-list .content { + margin-left: 12px; +} + +.use-template { + position: absolute; + left: -100%; + top: 0; + width: 100%; + bottom: 0; + background: #fff; + opacity: 0; +} + +.use-template.active { + animation: templateAni .5s forwards; +} + +.use-template .close { + position: absolute; + right: 5px; + top: 5px; + font-size: 14px; + cursor: pointer; +} + +.use-template .list { + padding: 30px 10px; + overflow-y: auto; +} + +.use-template .list .item { + box-shadow: 0 0 4px rgba(0, 21, 41, 0.1); + padding: 10px; + text-align: center; + transition: all .5s; + cursor: pointer; + margin-bottom: 10px; +} + +.use-template .list .item img { + display: block; + width: 100%; + margin: 0 auto 10px; +} + +.use-template .list .item:hover { + box-shadow: 0 0 4px rgba(0, 21, 41, 0.25); +} + +.use-template .no-date { + text-align: center; + padding-top: 20px; + color: #999; +} + +@keyframes templateAni { + 100% { + opacity: 1; + left: 0; + } +} + +.main-body { + flex: 2; + border-left: 1px solid #e0e0e0; + border-right: 1px solid #e0e0e0; + margin: 0; + overflow: hidden; +} + +.main-body .empty-tips { + text-align: center; + width: 100%; + font-size: 20px; + color: #ccc; + position: absolute; + left: 0; + top: 100px; +} + +.main-body .main-form { + background: #fff; + border: 1px dashed #999; + margin: 10px; + height: calc(100vh - 105px); + overflow-y: auto; + overflow-x: hidden; + position: relative; +} + +.main-tools { + line-height: 26px; + border-bottom: 2px solid #e4e7ed; + margin-right: 10px; + padding: 8px 0; + display: flex; + align-items: center; + justify-content: flex-end; +} + +.main-tools button { + color: #66b1ff; +} + +.main-tools button i { + padding-right: 5px; +} + +.add-form { + padding: 0px; + box-sizing: border-box; +} + +.add-form .form-row .form-col.active-col { + border: 3px solid #66b1ff; + position: relative; +} + +.add-form .form-row .form-col.active-col > .drag-control { + display: block; +} + +.add-form .form-row .form-col.active-col > .tooltip { + display: block; +} + +.add-form .title { + border-bottom: 1px solid #ddd; + font-weight: 700; + font-size: 14px; + height: 30px; + padding: 0 5px; + margin-bottom: 22px; +} + +.add-form .form-tabs .drag { + min-height: 80px; +} + +.add-form .group-card .el-collapse { + border: 0; +} + +.add-form .group-card .el-collapse-item__header { + font-weight: 700; + border-bottom: 1px solid #ddd; + margin-bottom: 20px; +} + +.add-form .group-card .el-collapse-item__wrap { + border: 0; +} + +.add-form .group-inputSlot { + display: none; +} + +.add-form .form-table { + margin-bottom: 22px; +} + +.add-form .form-table .drag { + border: 0; + display: flex; + overflow-x: auto; + white-space: nowrap; + padding: 0; + flex-wrap: nowrap; +} + +.add-form .form-table .drag > div { + min-width: 150px; + width: auto; +} + +.add-form .form-table .el-form-item { + display: block; +} + +.add-form .table-btn { + padding-top: 10px; +} + +.add-form .el-collapse-item__content { + padding-bottom: 5px; +} + +.add-form .form-table-add .el-form-item__label { + display: none; +} + +.add-form .form-table-add .el-form-item { + margin: 0; +} + +.add-form .form-table-add .el-table .cell { + overflow: inherit; +} + +.add-form .form-table-add .el-table .cell .el-form-item__error { + padding-top: 0; +} + +.add-form .gray { + color: #999; +} + +.add-form > .drag { + border: 0 !important; +} + +.add-form .group-flex .flex-group { + display: flex; + justify-content: space-between; +} + +.add-form .group-flex .flex-group button { + margin-left: 10px; +} + +.add-form .group-flex .flex-item { + flex: 2; +} + +.add-form .group-txt { + margin-bottom: 18px; +} + +.add-form .div-layout { + /*&.inline { + .drag {display: inline-flex} + .group {width: auto;margin-right: 10px} + }*/ +} + +.add-form .div-layout.right .drag { + text-align: right; + justify-content: flex-end; +} + +.add-form .div-layout.center .drag { + text-align: center; + justify-content: center; +} + +.add-form .el-select { + width: 100%; +} + +.add-form .el-select .el-input__wrapper .el-input__suffix { + position: absolute; + right: 10px; +} + +.add-form .group { + width: 100%; +} + +.add-form .drag { + display: flex; + flex-wrap: wrap; +} + +.add-form.form-row-2 .group { + width: 50%; +} + +.add-form.form-row-3 .group { + width: 33%; +} + +.add-form.form-row-4 .group { + width: 25%; +} + +.sidebar-tools { + width: 300px; + right: 0; + top: 0; + overflow-y: auto; + box-sizing: border-box; + padding-bottom: 10px; + bottom: 0; + height: calc(100vh - 40px); +} + +.sidebar-tools .form .el-form-item { + margin-bottom: 10px; +} + +.sidebar-tools .h3 { + font-size: 14px; + margin-bottom: 10px; + display: flex; + align-items: center; +} + +.sidebar-tools .h3 h3 { + font-size: 14px; +} + +.sidebar-tools .el-tabs__nav-wrap { + padding: 0 10px; +} + +.sidebar-tools .el-tabs__content { + padding: 0 10px; +} + +.sidebar-tools .icon-del { + cursor: pointer; +} + +.sidebar-tools .option-radio > label { + margin-right: 8px; +} + +.sidebar-tools .event-btn button { + margin: 0 12px 5px 0; +} + +#editJson, #editJsonCopy { + width: 100%; + height: calc(100vh - 65px); +} + +#editJsonCopy { + height: calc(100vh - 350px); +} + +.ace-dialog { + background: #1e1e1e; +} + +.ace-dialog .el-drawer__body { + padding: 0; +} + +.ace-dialog .el-drawer__header { + margin: 0; + color: #e9e9e9; + font-size: 12px; + padding: 3px 10px; +} + +.ace-dialog .dialog-footer { + text-align: center; + padding-top: 5px; +} + +.export-dialog .el-dialog__body { + padding: 0 20px; +} + +.design-form { + min-height: calc(100vh - 170px); +} + +.design-form > div { + height: 100%; +} + +.design-form > .drag { + min-height: calc(100vh - 170px) !important; +} + +.design-form .ghost { + background: #F56C6C; + border: 2px solid #F56C6C; + outline-width: 0; + height: 3px; + box-sizing: border-box; + font-size: 0; + content: ''; + overflow: hidden; + padding: 0; + width: 100%; +} + +.design-form .group { + border: 1px dashed #ddd; + margin: 2px 0px 10px 0px; + padding: 5px; + position: relative; + min-height: 50px; +} + +.design-form .group.active { + border: 3px solid #66b1ff; + position: relative; +} + +.design-form .group.active > .drag-control { + display: block; +} + +.design-form .group.active > .tooltip { + display: block; +} + +.design-form .group:hover { + border-color: #66b1ff; + background: #ecf5ff; +} + +.design-form .group > div { + margin-bottom: 0; +} + +.design-form .group:after { + content: ''; + position: absolute; + left: 0; + top: 0; + right: 0; + bottom: 0; + opacity: 0; + z-index: 1; + display: block; +} + +.design-form .group.group-grid:after, .design-form .group.group-tabs:after, .design-form .group.group-card:after, .design-form .group.group-flex:after, .design-form .group.group-div:after, .design-form .group.group-table:after { + display: none; +} + +.design-form .group-inputSlot { + border-color: #eebe77; + display: inline-block; +} + +.design-form .group-inputSlot:hover, .design-form .group-inputSlot.active { + border-color: #eebe77 !important; +} + +.design-form .tooltip { + display: none; + position: absolute; + font-size: 12px; + top: 0; + right: 0; + z-index: 5; +} + +.design-form .drag-control { + display: none; +} + +.design-form .drag-control .item-control { + position: absolute; + right: 0; + bottom: 0; + z-index: 2; + display: flex; + align-items: center; + height: 24px; + background: #66b1ff; +} + +.design-form .drag-control .item-control i { + width: 24px; + height: 24px; + color: #fff; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; +} + +.design-form .drag-control .drag-move { + position: absolute; + left: 0; + top: 0; + z-index: 2; + width: 24px; + height: 24px; + background: #66b1ff; + color: #fff; + text-align: center; + line-height: 24px; + cursor: move; +} + +.design-form .drag { + height: 100%; + border: 1px dashed #ddd; + min-height: 40px; + margin: 0 2px; + padding: 5px; + align-content: flex-start; +} + +.design-form.form-row-2 .group { + width: 48%; +} + +.design-form.form-row-3 .group { + width: 32%; +} + +.design-form.form-row-4 .group { + width: 23%; +} + +.detail-form { + min-height: calc(100vh - 170px); +} + +.detail-form > div { + height: 100%; +} + +.detail-form > .drag { + min-height: calc(100vh - 170px) !important; +} + +.detail-form .ghost { + background: #F56C6C; + border: 2px solid #F56C6C; + outline-width: 0; + height: 3px; + box-sizing: border-box; + font-size: 0; + content: ''; + overflow: hidden; + padding: 0; + width: 100%; +} + +.detail-form .group { + border: 0px dashed #ddd; + margin: 2px 0px 10px 0px; + padding: 5px; + position: relative; + min-height: 50px; +} + +.detail-form .group > div { + margin-bottom: 0; +} + +.detail-form .group-inputSlot { + border-color: #eebe77; + display: inline-block; +} + +.detail-form .group-inputSlot:hover, .detail-form .group-inputSlot.active { + border-color: #eebe77 !important; +} + +.detail-form .tooltip { + display: none; + position: absolute; + font-size: 12px; + top: 0; + right: 0; + z-index: 5; +} + +.detail-form .drag-control { + display: none; +} + +.detail-form .drag-control .item-control { + position: absolute; + right: 0; + bottom: 0; + z-index: 2; + display: flex; + align-items: center; + height: 24px; + background: #66b1ff; +} + +.detail-form .drag-control .item-control i { + width: 24px; + height: 24px; + color: #fff; + display: flex; + align-items: center; + justify-content: center; + cursor: pointer; +} + +.detail-form .drag-control .drag-move { + position: absolute; + left: 0; + top: 0; + z-index: 2; + width: 24px; + height: 24px; + background: #66b1ff; + color: #fff; + text-align: center; + line-height: 24px; + cursor: move; +} + +.detail-form .drag { + height: 100%; + border: 0px dashed #ddd; + min-height: 40px; + margin: 0 2px; + padding: 5px; + align-content: flex-start; +} + +.detail-form.form-row-2 .group { + width: 48%; +} + +.detail-form.form-row-3 .group { + width: 32%; +} + +.detail-form.form-row-4 .group { + width: 23%; +} + +/*表格设计*/ +.design-table .main-body { + border-left: 0; +} + +.design-table .header { + position: relative; +} + +.design-table .header .field { + position: absolute; + left: 10px; + top: 7px; + display: flex; +} + +.design-table .components-list .content { + padding: 0 12px; +} + +.design-table .components-list .content > div { + display: flex; + flex-wrap: wrap; + justify-content: flex-start; +} + +.design-table .components-list .content > div label { + margin: 0 10px 8px 0 !important; +} + +.design-table .main-table { + padding: 10px 20px; +} + +.design-table .main-table .add-form { + min-height: auto; + display: flex; +} + +.design-table .main-table .add-form > .drag { + height: auto; + min-height: auto !important; +} + +.design-table .main-table .el-divider { + margin: 8px 0 0; +} + +.design-table .main-table .table-tip { + color: #999; + padding: 30px 0; + line-height: 22px; +} + +.design-table .main-table .search-box { + position: relative; +} + +.design-table .main-table .search-box:after { + content: ''; + width: 100%; + height: 100%; + position: absolute; + left: 0; + right: 0; + bottom: 0; + top: 0; + z-index: 2; + cursor: pointer; +} + +.design-table .main-table .search-box .group { + width: auto; + margin-right: 10px; +} + +.design-table .main-table .control-btn { + padding: 10px 0; + margin-bottom: 10px; + display: flex; + justify-content: space-between; + align-items: center; +} + +.design-table .main-table .tip { + border: 1px dotted #ddd; + padding: 3px 5px; + border-radius: 5px; + color: #999; + text-align: center; + cursor: pointer; +} + +.design-table .main-table .el-table__header th .cell { + position: relative; +} + +.design-table .main-table .el-table__header th .icon-close { + display: none; + font-size: 12px; + margin-left: 12px; + cursor: pointer; + position: absolute; +} + +.design-table .main-table .el-table__header th:hover .icon-close { + display: inline-block; +} + +.design-table .table-tag .el-form-item__content { + display: flex; +} + +.design-table .table-tag .el-form-item__content > div { + flex: 2; + margin-right: 5px; +} + +.table-field-list h3 { + font-size: 14px; +} + +.table-field-list .item { + margin-bottom: 20px; +} + +.table-field-list .list { + display: flex; + justify-content: flex-start; + flex-wrap: wrap; +} + +.table-field-list .list label { + width: 25%; + margin: 0; +} + +.table-list-comm { + display: flex; + justify-content: space-between; +} + +.table-list-comm .tree-sidebar { + width: 180px; + border-right: 1px solid #ddd; + padding-right: 10px; + margin-right: 10px; + flex-shrink: 0; +} + +.table-list-comm .tree-sidebar .el-input { + margin-bottom: 10px; +} + +.table-list-comm .table-list { + display: block; + width: 100%; +} + +.table-list-comm .table-main { + margin-bottom: 20px; +} + +.table-list-comm .table-main.hide-vertical-scroll .el-scrollbar__wrap { + overflow: hidden; +} + +.table-list-comm .table-main.hide-vertical-scroll .is-vertical { + display: none !important; +} + +.table-list-comm .table-main .table-operate-btn { + display: flex; + align-items: center; +} + +.table-list-comm .table-search { + position: relative; +} + +.table-list-comm .table-search form { + display: flex; + flex-wrap: wrap; + padding-bottom: 0; + border-bottom: 1px solid #dcdfe6; + margin-bottom: 10px; +} + +.table-list-comm .table-search .drag { + display: flex; + flex-wrap: wrap; +} + +.table-list-comm .table-search .drag > div { + margin-right: 10px; +} + +.table-list-comm .table-search .group { + width: auto; +} + +.table-list-comm .table-search .search-icon { + margin-left: 10px; + height: 30px; + cursor: pointer; + position: absolute; + right: 0; + top: 0; +} + +.table-list-comm .table-search .autoHeight-enter-active, +.table-list-comm .table-search .autoHeight-leave-active { + max-height: 200px; + transition: all .6s; + overflow: hidden; +} + +.table-list-comm .table-search .autoHeight-enter-from, +.table-list-comm .table-search .autoHeight-leave-to { + max-height: 0; +} + +.table-list-comm .control-btn { + margin-bottom: 10px; + display: flex; + justify-content: space-between; + align-items: center; +} + +/*图片文件上传*/ +.upload-style .limit .el-upload { + display: none; +} + +.upload-style .el-upload-list__item-preview { + display: none !important; +} + +.upload-style .el-upload--picture .icon-plus { + font-size: 28px; + display: flex; + align-items: center; + justify-content: center; + color: #8c939d; + width: 148px; + height: 148px; + border: 1px dashed #d9d9d9; + border-radius: 6px; + cursor: pointer; + overflow: hidden; + background: #fbfdff; +} + +/*分页*/ +.table-page { + padding-top: 10px; + display: flex; + justify-content: flex-end; +} diff --git a/src/assets/scss/form.min.css b/src/assets/scss/form.min.css new file mode 100644 index 000000000..4a57ccf15 --- /dev/null +++ b/src/assets/scss/form.min.css @@ -0,0 +1 @@ +.design-container{margin:10px !important;display:flex;background-color:#FFFFFF}.components-list{width:250px;padding:8px 0;overflow-y:auto;height:calc(100vh - 40px);position:relative;overflow-x:hidden}.components-list .title{padding:8px 12px;position:relative}.components-list .title .template{position:absolute;right:12px;top:0;padding:8px;cursor:pointer}.components-list ul{position:relative;overflow:hidden;padding:0 10px 10px;margin:0}.components-list ul li{font-size:13px;display:flex;width:48%;line-height:28px;position:relative;float:left;left:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin:0 1% 5px;color:#333;padding:0 10px;border:1px solid transparent;background:#f4f6fc;user-select:none;align-items:center}.components-list ul li i{margin-right:5px}.components-list ul li:hover{color:#66b1ff;border:1px dashed #66b1ff;cursor:move}.components-list ul li.title{padding:0 10px}.components-list .content{margin-left:12px}.use-template{position:absolute;left:-100%;top:0;width:100%;bottom:0;background:#fff;opacity:0}.use-template.active{animation:templateAni .5s forwards}.use-template .close{position:absolute;right:5px;top:5px;font-size:14px;cursor:pointer}.use-template .list{padding:30px 10px;overflow-y:auto}.use-template .list .item{box-shadow:0 0 4px rgba(0,21,41,0.1);padding:10px;text-align:center;transition:all .5s;cursor:pointer;margin-bottom:10px}.use-template .list .item img{display:block;width:100%;margin:0 auto 10px}.use-template .list .item:hover{box-shadow:0 0 4px rgba(0,21,41,0.25)}.use-template .no-date{text-align:center;padding-top:20px;color:#999}@keyframes templateAni{100%{opacity:1;left:0}}.main-body{flex:2;border-left:1px solid #e0e0e0;border-right:1px solid #e0e0e0;margin:0;overflow:hidden}.main-body .empty-tips{text-align:center;width:100%;font-size:20px;color:#ccc;position:absolute;left:0;top:100px}.main-body .main-form{background:#fff;border:1px dashed #999;margin:10px;height:calc(100vh - 105px);overflow-y:auto;overflow-x:hidden;position:relative}.main-tools{line-height:26px;border-bottom:2px solid #e4e7ed;margin-right:10px;padding:8px 0;display:flex;align-items:center;justify-content:flex-end}.main-tools button{color:#66b1ff}.main-tools button i{padding-right:5px}.add-form{padding:0px;box-sizing:border-box}.add-form .form-row .form-col.active-col{border:3px solid #66b1ff;position:relative}.add-form .form-row .form-col.active-col>.drag-control{display:block}.add-form .form-row .form-col.active-col>.tooltip{display:block}.add-form .title{border-bottom:1px solid #ddd;font-weight:700;font-size:14px;height:30px;padding:0 5px;margin-bottom:22px}.add-form .form-tabs .drag{min-height:80px}.add-form .group-card .el-collapse{border:0}.add-form .group-card .el-collapse-item__header{font-weight:700;border-bottom:1px solid #ddd;margin-bottom:20px}.add-form .group-card .el-collapse-item__wrap{border:0}.add-form .group-inputSlot{display:none}.add-form .form-table{margin-bottom:22px}.add-form .form-table .drag{border:0;display:flex;overflow-x:auto;white-space:nowrap;padding:0;flex-wrap:nowrap}.add-form .form-table .drag>div{min-width:150px;width:auto}.add-form .form-table .el-form-item{display:block}.add-form .table-btn{padding-top:10px}.add-form .el-collapse-item__content{padding-bottom:5px}.add-form .form-table-add .el-form-item__label{display:none}.add-form .form-table-add .el-form-item{margin:0}.add-form .form-table-add .el-table .cell{overflow:inherit}.add-form .form-table-add .el-table .cell .el-form-item__error{padding-top:0}.add-form .gray{color:#999}.add-form>.drag{border:0 !important}.add-form .group-flex .flex-group{display:flex;justify-content:space-between}.add-form .group-flex .flex-group button{margin-left:10px}.add-form .group-flex .flex-item{flex:2}.add-form .group-txt{margin-bottom:18px}.add-form .div-layout.right .drag{text-align:right;justify-content:flex-end}.add-form .div-layout.center .drag{text-align:center;justify-content:center}.add-form .el-select{width:100%}.add-form .el-select .el-input__wrapper .el-input__suffix{position:absolute;right:10px}.add-form .group{width:100%}.add-form .drag{display:flex;flex-wrap:wrap}.add-form.form-row-2 .group{width:50%}.add-form.form-row-3 .group{width:33%}.add-form.form-row-4 .group{width:25%}.sidebar-tools{width:300px;right:0;top:0;overflow-y:auto;box-sizing:border-box;padding-bottom:10px;bottom:0;height:calc(100vh - 40px)}.sidebar-tools .form .el-form-item{margin-bottom:10px}.sidebar-tools .h3{font-size:14px;margin-bottom:10px;display:flex;align-items:center}.sidebar-tools .h3 h3{font-size:14px}.sidebar-tools .el-tabs__nav-wrap{padding:0 10px}.sidebar-tools .el-tabs__content{padding:0 10px}.sidebar-tools .icon-del{cursor:pointer}.sidebar-tools .option-radio>label{margin-right:8px}.sidebar-tools .event-btn button{margin:0 12px 5px 0}#editJson,#editJsonCopy{width:100%;height:calc(100vh - 65px)}#editJsonCopy{height:calc(100vh - 350px)}.ace-dialog{background:#1e1e1e}.ace-dialog .el-drawer__body{padding:0}.ace-dialog .el-drawer__header{margin:0;color:#e9e9e9;font-size:12px;padding:3px 10px}.ace-dialog .dialog-footer{text-align:center;padding-top:5px}.export-dialog .el-dialog__body{padding:0 20px}.design-form{min-height:calc(100vh - 170px)}.design-form>div{height:100%}.design-form>.drag{min-height:calc(100vh - 170px) !important}.design-form .ghost{background:#F56C6C;border:2px solid #F56C6C;outline-width:0;height:3px;box-sizing:border-box;font-size:0;content:'';overflow:hidden;padding:0;width:100%}.design-form .group{border:1px dashed #ddd;margin:2px 0px 10px 0px;padding:5px;position:relative;min-height:50px}.design-form .group.active{border:3px solid #66b1ff;position:relative}.design-form .group.active>.drag-control{display:block}.design-form .group.active>.tooltip{display:block}.design-form .group:hover{border-color:#66b1ff;background:#ecf5ff}.design-form .group>div{margin-bottom:0}.design-form .group:after{content:'';position:absolute;left:0;top:0;right:0;bottom:0;opacity:0;z-index:1;display:block}.design-form .group.group-grid:after,.design-form .group.group-tabs:after,.design-form .group.group-card:after,.design-form .group.group-flex:after,.design-form .group.group-div:after,.design-form .group.group-table:after{display:none}.design-form .group-inputSlot{border-color:#eebe77;display:inline-block}.design-form .group-inputSlot:hover,.design-form .group-inputSlot.active{border-color:#eebe77 !important}.design-form .tooltip{display:none;position:absolute;font-size:12px;top:0;right:0;z-index:5}.design-form .drag-control{display:none}.design-form .drag-control .item-control{position:absolute;right:0;bottom:0;z-index:2;display:flex;align-items:center;height:24px;background:#66b1ff}.design-form .drag-control .item-control i{width:24px;height:24px;color:#fff;display:flex;align-items:center;justify-content:center;cursor:pointer}.design-form .drag-control .drag-move{position:absolute;left:0;top:0;z-index:2;width:24px;height:24px;background:#66b1ff;color:#fff;text-align:center;line-height:24px;cursor:move}.design-form .drag{height:100%;border:1px dashed #ddd;min-height:40px;margin:0 2px;padding:5px;align-content:flex-start}.design-form.form-row-2 .group{width:48%}.design-form.form-row-3 .group{width:32%}.design-form.form-row-4 .group{width:23%}.detail-form{min-height:calc(100vh - 170px)}.detail-form>div{height:100%}.detail-form>.drag{min-height:calc(100vh - 170px) !important}.detail-form .ghost{background:#F56C6C;border:2px solid #F56C6C;outline-width:0;height:3px;box-sizing:border-box;font-size:0;content:'';overflow:hidden;padding:0;width:100%}.detail-form .group{border:0px dashed #ddd;margin:2px 0px 10px 0px;padding:5px;position:relative;min-height:50px}.detail-form .group>div{margin-bottom:0}.detail-form .group-inputSlot{border-color:#eebe77;display:inline-block}.detail-form .group-inputSlot:hover,.detail-form .group-inputSlot.active{border-color:#eebe77 !important}.detail-form .tooltip{display:none;position:absolute;font-size:12px;top:0;right:0;z-index:5}.detail-form .drag-control{display:none}.detail-form .drag-control .item-control{position:absolute;right:0;bottom:0;z-index:2;display:flex;align-items:center;height:24px;background:#66b1ff}.detail-form .drag-control .item-control i{width:24px;height:24px;color:#fff;display:flex;align-items:center;justify-content:center;cursor:pointer}.detail-form .drag-control .drag-move{position:absolute;left:0;top:0;z-index:2;width:24px;height:24px;background:#66b1ff;color:#fff;text-align:center;line-height:24px;cursor:move}.detail-form .drag{height:100%;border:0px dashed #ddd;min-height:40px;margin:0 2px;padding:5px;align-content:flex-start}.detail-form.form-row-2 .group{width:48%}.detail-form.form-row-3 .group{width:32%}.detail-form.form-row-4 .group{width:23%}.design-table .main-body{border-left:0}.design-table .header{position:relative}.design-table .header .field{position:absolute;left:10px;top:7px;display:flex}.design-table .components-list .content{padding:0 12px}.design-table .components-list .content>div{display:flex;flex-wrap:wrap;justify-content:flex-start}.design-table .components-list .content>div label{margin:0 10px 8px 0 !important}.design-table .main-table{padding:10px 20px}.design-table .main-table .add-form{min-height:auto;display:flex}.design-table .main-table .add-form>.drag{height:auto;min-height:auto !important}.design-table .main-table .el-divider{margin:8px 0 0}.design-table .main-table .table-tip{color:#999;padding:30px 0;line-height:22px}.design-table .main-table .search-box{position:relative}.design-table .main-table .search-box:after{content:'';width:100%;height:100%;position:absolute;left:0;right:0;bottom:0;top:0;z-index:2;cursor:pointer}.design-table .main-table .search-box .group{width:auto;margin-right:10px}.design-table .main-table .control-btn{padding:10px 0;margin-bottom:10px;display:flex;justify-content:space-between;align-items:center}.design-table .main-table .tip{border:1px dotted #ddd;padding:3px 5px;border-radius:5px;color:#999;text-align:center;cursor:pointer}.design-table .main-table .el-table__header th .cell{position:relative}.design-table .main-table .el-table__header th .icon-close{display:none;font-size:12px;margin-left:12px;cursor:pointer;position:absolute}.design-table .main-table .el-table__header th:hover .icon-close{display:inline-block}.design-table .table-tag .el-form-item__content{display:flex}.design-table .table-tag .el-form-item__content>div{flex:2;margin-right:5px}.table-field-list h3{font-size:14px}.table-field-list .item{margin-bottom:20px}.table-field-list .list{display:flex;justify-content:flex-start;flex-wrap:wrap}.table-field-list .list label{width:25%;margin:0}.table-list-comm{display:flex;justify-content:space-between}.table-list-comm .tree-sidebar{width:180px;border-right:1px solid #ddd;padding-right:10px;margin-right:10px;flex-shrink:0}.table-list-comm .tree-sidebar .el-input{margin-bottom:10px}.table-list-comm .table-list{display:block;width:100%}.table-list-comm .table-main{margin-bottom:20px}.table-list-comm .table-main.hide-vertical-scroll .el-scrollbar__wrap{overflow:hidden}.table-list-comm .table-main.hide-vertical-scroll .is-vertical{display:none !important}.table-list-comm .table-main .table-operate-btn{display:flex;align-items:center}.table-list-comm .table-search{position:relative}.table-list-comm .table-search form{display:flex;flex-wrap:wrap;padding-bottom:0;border-bottom:1px solid #dcdfe6;margin-bottom:10px}.table-list-comm .table-search .drag{display:flex;flex-wrap:wrap}.table-list-comm .table-search .drag>div{margin-right:10px}.table-list-comm .table-search .group{width:auto}.table-list-comm .table-search .search-icon{margin-left:10px;height:30px;cursor:pointer;position:absolute;right:0;top:0}.table-list-comm .table-search .autoHeight-enter-active,.table-list-comm .table-search .autoHeight-leave-active{max-height:200px;transition:all .6s;overflow:hidden}.table-list-comm .table-search .autoHeight-enter-from,.table-list-comm .table-search .autoHeight-leave-to{max-height:0}.table-list-comm .control-btn{margin-bottom:10px;display:flex;justify-content:space-between;align-items:center}.upload-style .limit .el-upload{display:none}.upload-style .el-upload-list__item-preview{display:none !important}.upload-style .el-upload--picture .icon-plus{font-size:28px;display:flex;align-items:center;justify-content:center;color:#8c939d;width:148px;height:148px;border:1px dashed #d9d9d9;border-radius:6px;cursor:pointer;overflow:hidden;background:#fbfdff}.table-page{padding-top:10px;display:flex;justify-content:flex-end} diff --git a/src/assets/scss/form.scss b/src/assets/scss/form.scss index 752000a8a..282530c07 100644 --- a/src/assets/scss/form.scss +++ b/src/assets/scss/form.scss @@ -2,7 +2,7 @@ // 左侧栏 $mainColor: #66b1ff; .design-container {margin: 10px !important;display: flex; background-color: #FFFFFF;} -.components-list {width: 250px;padding: 8px 0;overflow-y: auto;height: calc(100vh - 20px);position: relative;overflow-x: hidden; +.components-list {width: 250px;padding: 8px 0;overflow-y: auto;height: calc(100vh - 40px);position: relative;overflow-x: hidden; .title {padding: 8px 12px;position: relative; .template {position: absolute;right: 12px;top: 0;padding: 8px;cursor: pointer} } @@ -35,7 +35,7 @@ $mainColor: #66b1ff; .main-body {flex: 2; border-left: 1px solid #e0e0e0;border-right: 1px solid #e0e0e0;margin: 0;overflow: hidden; .empty-tips {text-align: center;width: 100%;font-size: 20px;color: #ccc;position: absolute;left: 0;top: 100px; } - .main-form { background: #fff;border: 1px dashed #999;margin: 10px;height: calc(100vh - 85px);overflow-y: auto;overflow-x: hidden;position: relative} + .main-form { background: #fff;border: 1px dashed #999;margin: 10px;height: calc(100vh - 105px);overflow-y: auto;overflow-x: hidden;position: relative} } // 中间按钮工具 .main-tools {line-height: 26px;border-bottom: 2px solid #e4e7ed;margin-right: 10px;padding: 8px 0;display: flex;align-items: center;justify-content: flex-end; @@ -119,7 +119,7 @@ $mainColor: #66b1ff; .group {width: 25%} } } -.sidebar-tools {width: 300px;right: 0;top: 0;overflow-y: auto;box-sizing: border-box;padding-bottom: 10px;bottom: 0; height: calc(100vh - 30px); +.sidebar-tools {width: 300px;right: 0;top: 0;overflow-y: auto;box-sizing: border-box;padding-bottom: 10px;bottom: 0; height: calc(100vh - 40px); .form { .el-form-item {margin-bottom: 10px;} } diff --git a/src/components/DesignForm/formControlAttr.vue b/src/components/DesignForm/formControlAttr.vue index ae386a073..4d18483ba 100644 --- a/src/components/DesignForm/formControlAttr.vue +++ b/src/components/DesignForm/formControlAttr.vue @@ -1,4 +1,5 @@ + + + + +======= + @ 作者: 秦东 + @ 时间: 2024-02-29 14:18:54 + @ 备注: 样式布局 + --> + + + + +>>>>>>> v7_master diff --git a/src/components/DesignForm/public/form/form.vue b/src/components/DesignForm/public/form/form.vue index 22a55c200..ef336f33d 100644 --- a/src/components/DesignForm/public/form/form.vue +++ b/src/components/DesignForm/public/form/form.vue @@ -90,6 +90,7 @@ let eventName = '' let getValueEvent = '' // 注册window事件 const setWindowEvent = (bool?: boolean) => { + // console.log("注册window事件",props,props.formData) if (props.formData.list.length > 0) { const formName = props.formData.form?.name if (!formName) { diff --git a/src/components/workflow/dialog/matrix.vue b/src/components/workflow/dialog/matrix.vue index 33de875a2..34bd90248 100644 --- a/src/components/workflow/dialog/matrix.vue +++ b/src/components/workflow/dialog/matrix.vue @@ -146,57 +146,62 @@ onMounted(()=>{ }) diff --git a/src/components/workflow/drwer/analysisForm.ts b/src/components/workflow/drwer/analysisForm.ts new file mode 100644 index 000000000..8c8ce1276 --- /dev/null +++ b/src/components/workflow/drwer/analysisForm.ts @@ -0,0 +1,46 @@ +import { formData } from '@/api/DesignForm/types' +/** +@ 作者: 秦东 +@ 时间: 2024-03-13 08:31:44 +@ 功能: 分析自定义表格数据 +*/ +export const AnalysisForm = (formData:formData) => { + let mastAry = new Array + console.log("组件---->", formData) + if(formData.list && formData.list.length > 0) { + formData.list.forEach((item:any) => { + switch(item.type) { + case "tabs": + break; + case "title": + break; + case "txt": + break; + case "table": + break; + case "grid": + break; + case "card": + break; + case "divider": + break; + case "div": + break; + case "flex": + break; + case "button": + break; + default: + console.log("组件", item) + mastAry.push( + { + name:item.name, + value:4 + } + ) + break; + } + }) + } + console.log("mastAry组件", mastAry) +} diff --git a/src/components/workflow/drwer/approverDrawer.vue b/src/components/workflow/drwer/approverDrawer.vue index e542136ef..d8777bc47 100644 --- a/src/components/workflow/drwer/approverDrawer.vue +++ b/src/components/workflow/drwer/approverDrawer.vue @@ -7,7 +7,7 @@ import $func from '@/utils/workflow/index' import { setTypes, selectModes, selectRanges } from '@/utils/workflow/const' import { useStore } from '@/store/workflow/index' -import { getAllParentNode,judgeOptionalNode } from '@/api/workflowapi/index' +import { getAllParentNode,judgeOptionalNode,analysisForm,setFlowFormKeyPower } from '@/api/workflowapi/index' import PositionDialog from '@/components/workflow/dialog/positionDialog.vue' import FormWord from '@/components/workflow/dialog/formWord.vue' @@ -33,6 +33,16 @@ let props = defineProps({ type:String, default:"" }, + formVersion:{ + type:String, + default:"" + }, + formData:{ + type:Object, + default(){ + return {} + } + } }); const isExecutor = ref(false) const nodeTitle = ref("审批人设置") @@ -51,6 +61,12 @@ let store = useStore() let { setApproverConfig, setApprover } = store let approverConfig1 = computed(():any=> store.approverConfig1) let approverDrawer = computed(():any=> store.approverDrawer) + +const emits = defineEmits<{ + (e: 'update:formData', val: any): void +}>() + + let visible = computed({ get(){ return approverDrawer.value @@ -59,12 +75,29 @@ let visible = computed({ closeDrawer() } }) -const matrixIsShow = ref(false) -watch(visible,(val:any)=>{ - // if(val) +const formData = computed({ + get() { + return props.formData + }, + set(val: formStruct) { + emits('update:formData', val) + } +}); + +const powerUnitAry = ref({ + nodeKey:"", + recUnitAry:{ + masterUnitList:[], + sunUnitList:[], + unitAllKey:[], + unitAllState:[] + } }) +const matrixIsShow = ref(false) + + watch(approverConfig1, (val:any)=>{ val.value.attribute = val.value.attribute*1 @@ -166,6 +199,55 @@ const saveApprover = ()=> { flag: true, id: approverConfig1.value.id }) + let powerAry = []; + if(powerUnitAry.value.recUnitAry.masterUnitList && powerUnitAry.value.recUnitAry.masterUnitList.length > 0){ + powerUnitAry.value.recUnitAry.masterUnitList.forEach((item:any)=>{ + powerAry.push(item) + }) + } + if(powerUnitAry.value.recUnitAry.sunUnitList && powerUnitAry.value.recUnitAry.sunUnitList.length > 0){ + powerUnitAry.value.recUnitAry.sunUnitList.forEach((item:any)=>{ + if(item.masterUnitList && item.masterUnitList.length > 0){ + item.masterUnitList.forEach((itemSun:any) => { + // powerAry.push(item) + if(!powerAry.includes(itemSun)){ + powerAry.push(itemSun) + } + }) + } + }); + } + console.log("正确",formData.value) + if(formData.value.purview){ + console.log("正确") + let isNew = true + formData.value.purview.forEach((item:any)=>{ + console.log("正确---->",item.nodeKey) + if(item.nodeKey == approverConfig1.value.value.nodeNumber){ + item.powerAry=powerAry + isNew = false + } + }); + if(isNew){ + formData.value.purview.push({ + nodeKey: approverConfig1.value.value.nodeNumber, + powerAry:powerAry + }) + } + }else{ + formData.value.purview = [{ + nodeKey: approverConfig1.value.value.nodeNumber, + powerAry:powerAry + }] + } + let sendInfo: any = { + formKey:props.customerFormKey.toString(), + formVersion:props.formVersion.toString(), + formData:JSON.stringify(formData.value), + formPower:JSON.stringify(formData.value.purview) + } + // console.log("sendInfo",sendInfo) + setFlowFormKeyPower(sendInfo) closeDrawer() } const closeDrawer = ()=> { @@ -196,10 +278,31 @@ const sureFormTableApprover = (data:any)=> { const updateMatrix = (val:any) =>{ approverConfig.value.matrix = val; } +/** +@ 作者: 秦东 +@ 时间: 2024-03-13 08:24:54 +@ 功能: 解析表单 +*/ +const jieForm = () => { + console.log("nodeKey:approverConfig1.nodeNumber",approverConfig1.value.value.nodeNumber +); + analysisForm({nodeKey:approverConfig1.value.value.nodeNumber,nodeJson:JSON.stringify(formData.value)}) + .then((data)=>{ + if(data.code == 0){ + powerUnitAry.value = data.data + } + }) +} + +watch(()=>visible.value,(val:boolean)=>{ + if(val){ + jieForm(); + } +}) + 发起人自选

该审批节点设置“发起人自己”后，审批人默认为发起人

+ 连续多级主管
-

审批终点

@@ -301,6 +408,7 @@ const updateMatrix = (val:any) =>{

+ 可选节点列表

可选节点列表

@@ -310,8 +418,8 @@ const updateMatrix = (val:any) =>{
+ 指定审批字段
-

指定审批字段

添加/修改审批字段

{{item.name}} @@ -324,40 +432,73 @@ const updateMatrix = (val:any) =>{ - -

+ + 多人审批时采用的审批方式
-

多人审批时采用的审批方式

依次审批 会签(须所有审批人同意) 或签(有一位审批人同意即可)
+ 审批人为空时
-

审批人为空时

自动审批通过/不允许发起
转交给审核管理员
- + 退回设置
-

退回设置

发起人 {{ item.nodeName }}（编号：{{ item.nodeNumber }}）
- + 操作权限 +
+
主表
+ + + + + + + + + + + {{item.name}}子表 + + + + + + + + + + + + +
@@ -416,7 +557,7 @@ const updateMatrix = (val:any) =>{ } } .approver_manager,.approver_self_select,.approver_some,.approver_self{ - border-top: 1px solid #f2f2f2; + border-top: 0px solid #f2f2f2; } .approver_self_select, .approver_content{ @@ -487,5 +628,7 @@ const updateMatrix = (val:any) =>{ margin-top: 15px; } } - +.info_box{ + padding: 0 20px; +} diff --git a/src/components/workflow/drwer/promoterDrawer.vue b/src/components/workflow/drwer/promoterDrawer.vue index e08228444..dfaf9d383 100644 --- a/src/components/workflow/drwer/promoterDrawer.vue +++ b/src/components/workflow/drwer/promoterDrawer.vue @@ -5,10 +5,45 @@ --> diff --git a/src/views/sysworkflow/lowcodepage/index.vue b/src/views/sysworkflow/lowcodepage/index.vue new file mode 100644 index 000000000..1029960d8 --- /dev/null +++ b/src/views/sysworkflow/lowcodepage/index.vue @@ -0,0 +1,92 @@ + + + + diff --git a/src/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue b/src/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue new file mode 100644 index 000000000..3c73a8d64 --- /dev/null +++ b/src/views/sysworkflow/lowcodepage/lowCodeFormGroupPage.vue @@ -0,0 +1,223 @@ + + + + + + diff --git a/src/views/sysworkflow/lowcodepage/lowCodeFormPage.vue b/src/views/sysworkflow/lowcodepage/lowCodeFormPage.vue new file mode 100644 index 000000000..fabb929de --- /dev/null +++ b/src/views/sysworkflow/lowcodepage/lowCodeFormPage.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/src/views/sysworkflow/lowcodepage/pageDesign.vue b/src/views/sysworkflow/lowcodepage/pageDesign.vue new file mode 100644 index 000000000..b35cf3599 --- /dev/null +++ b/src/views/sysworkflow/lowcodepage/pageDesign.vue @@ -0,0 +1,743 @@ + + + + diff --git a/src/views/sysworkflow/lowcodepage/pageDesignes.vue b/src/views/sysworkflow/lowcodepage/pageDesignes.vue new file mode 100644 index 000000000..0130f58ad --- /dev/null +++ b/src/views/sysworkflow/lowcodepage/pageDesignes.vue @@ -0,0 +1,637 @@ + + + + diff --git a/src/views/sysworkflow/lowcodepage/workFlow.vue b/src/views/sysworkflow/lowcodepage/workFlow.vue new file mode 100644 index 000000000..a45b51b58 --- /dev/null +++ b/src/views/sysworkflow/lowcodepage/workFlow.vue @@ -0,0 +1,635 @@ + + + + + diff --git a/vite.config.ts.timestamp-1709682894861-ae70bc75df1f3.mjs b/vite.config.ts.timestamp-1709682894861-ae70bc75df1f3.mjs new file mode 100644 index 000000000..32895ae81 --- /dev/null +++ b/vite.config.ts.timestamp-1709682894861-ae70bc75df1f3.mjs @@ -0,0 +1,160 @@ +// vite.config.ts +import vue from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/@vitejs/plugin-vue/dist/index.mjs"; +import { loadEnv, defineConfig } from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/vite/dist/node/index.js"; +import AutoImport from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-auto-import/dist/vite.js"; +import Components from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-vue-components/dist/vite.mjs"; +import { ElementPlusResolver } from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-vue-components/dist/resolvers.mjs"; +import Icons from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-icons/dist/vite.mjs"; +import IconsResolver from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unplugin-icons/dist/resolver.mjs"; +import { createSvgIconsPlugin } from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/vite-plugin-svg-icons/dist/index.mjs"; +import UnoCSS from "file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/node_modules/unocss/dist/vite.mjs"; +import path from "path"; +var __vite_injected_original_dirname = "E:\\f_pang\\object\\my_object_html\\gyhlwpt\\hxgksystemapp"; +var pathSrc = path.resolve(__vite_injected_original_dirname, "src"); +var vite_config_default = defineConfig(({ mode }) => { + const env = loadEnv(mode, process.cwd()); + return { + resolve: { + alias: { + "@": pathSrc + } + }, + css: { + // CSS 预处理器 + preprocessorOptions: { + //define global scss variable + scss: { + javascriptEnabled: true, + additionalData: ` + @use "@/styles/variables.scss" as *; + ` + } + } + }, + server: { + host: "0.0.0.0", + port: Number(env.VITE_APP_PORT), + open: true, + // 运行是否自动打开浏览器 + proxy: { + // 反向代理解决跨域 + [env.VITE_APP_BASE_API]: { + target: env.VITE_APP_BASE_URL, + // 线上接口地址 + // target: "http://vapi.youlai.tech", // 线上接口地址 + // target: 'http://localhost:8989', // 本地接口地址 , 后端工程仓库地址：https://gitee.com/youlaiorg/youlai-boot + changeOrigin: true, + rewrite: (path2) => path2.replace(new RegExp("^" + env.VITE_APP_BASE_API), "") + // 替换 /dev-api 为 target 接口地址 + } + } + }, + plugins: [ + vue(), + UnoCSS({ + /* options */ + }), + AutoImport({ + // 自动导入 Vue 相关函数，如：ref, reactive, toRef 等 + imports: ["vue", "@vueuse/core"], + //ignore: ['h'], // 自动添加 import { h } from '/node_modules/.vite/deps/vue.js 代码问题处理 + eslintrc: { + enabled: false, + // Default `false` + filepath: "./.eslintrc-auto-import.json", + // Default `./.eslintrc-auto-import.json` + globalsPropValue: true + // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable') + }, + resolvers: [ + // 自动导入 Element Plus 相关函数，如：ElMessage, ElMessageBox... (带样式) + ElementPlusResolver(), + // 自动导入图标组件 + IconsResolver({}) + ], + vueTemplate: true, + // 是否在 vue 模板中自动导入 + dts: path.resolve(pathSrc, "types", "auto-imports.d.ts") + // 自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成 + }), + Components({ + resolvers: [ + // 自动注册图标组件 + IconsResolver({ + enabledCollections: ["ep"] + //@iconify-json/ep 是 Element Plus 的图标库 + }), + // 自动导入 Element Plus 组件 + ElementPlusResolver() + ], + dts: path.resolve(pathSrc, "types", "components.d.ts") + // 自动导入组件类型声明文件位置，默认根目录; false 关闭自动生成 + }), + Icons({ + // 自动安装图标库 + autoInstall: true + }), + createSvgIconsPlugin({ + // 指定需要缓存的图标文件夹 + iconDirs: [path.resolve(pathSrc, "assets/icons")], + // 指定symbolId格式 + symbolId: "icon-[dir]-[name]" + }) + ], + optimizeDeps: { + include: [ + "vue", + "vue-router", + "pinia", + "axios", + "element-plus/es/components/form/style/css", + "element-plus/es/components/form-item/style/css", + "element-plus/es/components/button/style/css", + "element-plus/es/components/input/style/css", + "element-plus/es/components/input-number/style/css", + "element-plus/es/components/switch/style/css", + "element-plus/es/components/upload/style/css", + "element-plus/es/components/menu/style/css", + "element-plus/es/components/col/style/css", + "element-plus/es/components/icon/style/css", + "element-plus/es/components/row/style/css", + "element-plus/es/components/tag/style/css", + "element-plus/es/components/dialog/style/css", + "element-plus/es/components/loading/style/css", + "element-plus/es/components/radio/style/css", + "element-plus/es/components/radio-group/style/css", + "element-plus/es/components/popover/style/css", + "element-plus/es/components/scrollbar/style/css", + "element-plus/es/components/tooltip/style/css", + "element-plus/es/components/dropdown/style/css", + "element-plus/es/components/dropdown-menu/style/css", + "element-plus/es/components/dropdown-item/style/css", + "element-plus/es/components/sub-menu/style/css", + "element-plus/es/components/menu-item/style/css", + "element-plus/es/components/divider/style/css", + "element-plus/es/components/card/style/css", + "element-plus/es/components/link/style/css", + "element-plus/es/components/breadcrumb/style/css", + "element-plus/es/components/breadcrumb-item/style/css", + "element-plus/es/components/table/style/css", + "element-plus/es/components/tree-select/style/css", + "element-plus/es/components/table-column/style/css", + "element-plus/es/components/select/style/css", + "element-plus/es/components/option/style/css", + "element-plus/es/components/pagination/style/css", + "element-plus/es/components/tree/style/css", + "element-plus/es/components/alert/style/css", + "@vueuse/core", + "path-to-regexp", + "echarts", + "@wangeditor/editor", + "@wangeditor/editor-for-vue", + "vue-i18n" + ] + } + }; +}); +export { + vite_config_default as default +}; +//# sourceMappingURL=data:application/json;base64,{
  "version": 3,
  "sources": ["vite.config.ts"],
  "sourcesContent": ["const __vite_injected_original_dirname = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\gyhlwpt\\\\hxgksystemapp\";const __vite_injected_original_filename = \"E:\\\\f_pang\\\\object\\\\my_object_html\\\\gyhlwpt\\\\hxgksystemapp\\\\vite.config.ts\";const __vite_injected_original_import_meta_url = \"file:///E:/f_pang/object/my_object_html/gyhlwpt/hxgksystemapp/vite.config.ts\";import vue from \"@vitejs/plugin-vue\";\r\n\r\nimport { UserConfig, ConfigEnv, loadEnv, defineConfig } from \"vite\";\r\n\r\nimport AutoImport from \"unplugin-auto-import/vite\";\r\nimport Components from \"unplugin-vue-components/vite\";\r\nimport { ElementPlusResolver } from \"unplugin-vue-components/resolvers\";\r\n\r\nimport Icons from \"unplugin-icons/vite\";\r\nimport IconsResolver from \"unplugin-icons/resolver\";\r\n\r\nimport { createSvgIconsPlugin } from \"vite-plugin-svg-icons\";\r\n\r\nimport UnoCSS from \"unocss/vite\";\r\n\r\nimport path from \"path\";\r\nconst pathSrc = path.resolve(__dirname, \"src\");\r\n\r\nexport default defineConfig(({ mode }: ConfigEnv): UserConfig => {\r\n  const env = loadEnv(mode, process.cwd());\r\n  return {\r\n    resolve: {\r\n      alias: {\r\n        \"@\": pathSrc,\r\n      },\r\n    },\r\n    css: {\r\n      // CSS \u9884\u5904\u7406\u5668\r\n      preprocessorOptions: {\r\n        //define global scss variable\r\n        scss: {\r\n          javascriptEnabled: true,\r\n          additionalData: `\r\n            @use \"@/styles/variables.scss\" as *;\r\n          `,\r\n        },\r\n      },\r\n    },\r\n    server: {\r\n      host: \"0.0.0.0\",\r\n      port: Number(env.VITE_APP_PORT),\r\n      open: true, // \u8FD0\u884C\u662F\u5426\u81EA\u52A8\u6253\u5F00\u6D4F\u89C8\u5668\r\n      proxy: {\r\n        // \u53CD\u5411\u4EE3\u7406\u89E3\u51B3\u8DE8\u57DF\r\n        [env.VITE_APP_BASE_API]: {\r\n          target: env.VITE_APP_BASE_URL, // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\r\n          // target: \"http://vapi.youlai.tech\", // \u7EBF\u4E0A\u63A5\u53E3\u5730\u5740\r\n          // target: 'http://localhost:8989',  // \u672C\u5730\u63A5\u53E3\u5730\u5740 , \u540E\u7AEF\u5DE5\u7A0B\u4ED3\u5E93\u5730\u5740\uFF1Ahttps://gitee.com/youlaiorg/youlai-boot\r\n          changeOrigin: true,\r\n          rewrite: (path) =>\r\n            path.replace(new RegExp(\"^\" + env.VITE_APP_BASE_API), \"\"), // \u66FF\u6362 /dev-api \u4E3A target \u63A5\u53E3\u5730\u5740\r\n        },\r\n      },\r\n    },\r\n\t\t\r\n    plugins: [\r\n\t\t\t\r\n      vue(),\r\n      UnoCSS({\r\n        /* options */\r\n      }),\r\n      AutoImport({\r\n        // \u81EA\u52A8\u5BFC\u5165 Vue \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1Aref, reactive, toRef \u7B49\r\n        imports: [\"vue\", \"@vueuse/core\"],\r\n        //ignore: ['h'], // \u81EA\u52A8\u6DFB\u52A0 import { h } from '/node_modules/.vite/deps/vue.js \u4EE3\u7801\u95EE\u9898\u5904\u7406\r\n        eslintrc: {\r\n          enabled: false, //  Default `false`\r\n          filepath: \"./.eslintrc-auto-import.json\", // Default `./.eslintrc-auto-import.json`\r\n          globalsPropValue: true, // Default `true`, (true | false | 'readonly' | 'readable' | 'writable' | 'writeable')\r\n        },\r\n        resolvers: [\r\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u76F8\u5173\u51FD\u6570\uFF0C\u5982\uFF1AElMessage, ElMessageBox... (\u5E26\u6837\u5F0F)\r\n          ElementPlusResolver(),\r\n          // \u81EA\u52A8\u5BFC\u5165\u56FE\u6807\u7EC4\u4EF6\r\n          IconsResolver({}),\r\n        ],\r\n        vueTemplate: true, // \u662F\u5426\u5728 vue \u6A21\u677F\u4E2D\u81EA\u52A8\u5BFC\u5165\r\n        dts: path.resolve(pathSrc, \"types\", \"auto-imports.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\r\n      }),\r\n\r\n      Components({\r\n        resolvers: [\r\n          // \u81EA\u52A8\u6CE8\u518C\u56FE\u6807\u7EC4\u4EF6\r\n          IconsResolver({\r\n            enabledCollections: [\"ep\"], //@iconify-json/ep \u662F Element Plus \u7684\u56FE\u6807\u5E93\r\n          }),\r\n          // \u81EA\u52A8\u5BFC\u5165 Element Plus \u7EC4\u4EF6\r\n          ElementPlusResolver(),\r\n        ],\r\n        dts: path.resolve(pathSrc, \"types\", \"components.d.ts\"), //  \u81EA\u52A8\u5BFC\u5165\u7EC4\u4EF6\u7C7B\u578B\u58F0\u660E\u6587\u4EF6\u4F4D\u7F6E\uFF0C\u9ED8\u8BA4\u6839\u76EE\u5F55; false \u5173\u95ED\u81EA\u52A8\u751F\u6210\r\n      }),\r\n\r\n      Icons({\r\n        // \u81EA\u52A8\u5B89\u88C5\u56FE\u6807\u5E93\r\n        autoInstall: true,\r\n      }),\r\n\r\n      createSvgIconsPlugin({\r\n        // \u6307\u5B9A\u9700\u8981\u7F13\u5B58\u7684\u56FE\u6807\u6587\u4EF6\u5939\r\n        iconDirs: [path.resolve(pathSrc, \"assets/icons\")],\r\n        // \u6307\u5B9AsymbolId\u683C\u5F0F\r\n        symbolId: \"icon-[dir]-[name]\",\r\n      }),\r\n    ],\r\n\r\n    optimizeDeps: {\r\n      include: [\r\n        \"vue\",\r\n        \"vue-router\",\r\n        \"pinia\",\r\n        \"axios\",\r\n        \"element-plus/es/components/form/style/css\",\r\n        \"element-plus/es/components/form-item/style/css\",\r\n        \"element-plus/es/components/button/style/css\",\r\n        \"element-plus/es/components/input/style/css\",\r\n        \"element-plus/es/components/input-number/style/css\",\r\n        \"element-plus/es/components/switch/style/css\",\r\n        \"element-plus/es/components/upload/style/css\",\r\n        \"element-plus/es/components/menu/style/css\",\r\n        \"element-plus/es/components/col/style/css\",\r\n        \"element-plus/es/components/icon/style/css\",\r\n        \"element-plus/es/components/row/style/css\",\r\n        \"element-plus/es/components/tag/style/css\",\r\n        \"element-plus/es/components/dialog/style/css\",\r\n        \"element-plus/es/components/loading/style/css\",\r\n        \"element-plus/es/components/radio/style/css\",\r\n        \"element-plus/es/components/radio-group/style/css\",\r\n        \"element-plus/es/components/popover/style/css\",\r\n        \"element-plus/es/components/scrollbar/style/css\",\r\n        \"element-plus/es/components/tooltip/style/css\",\r\n        \"element-plus/es/components/dropdown/style/css\",\r\n        \"element-plus/es/components/dropdown-menu/style/css\",\r\n        \"element-plus/es/components/dropdown-item/style/css\",\r\n        \"element-plus/es/components/sub-menu/style/css\",\r\n        \"element-plus/es/components/menu-item/style/css\",\r\n        \"element-plus/es/components/divider/style/css\",\r\n        \"element-plus/es/components/card/style/css\",\r\n        \"element-plus/es/components/link/style/css\",\r\n        \"element-plus/es/components/breadcrumb/style/css\",\r\n        \"element-plus/es/components/breadcrumb-item/style/css\",\r\n        \"element-plus/es/components/table/style/css\",\r\n        \"element-plus/es/components/tree-select/style/css\",\r\n        \"element-plus/es/components/table-column/style/css\",\r\n        \"element-plus/es/components/select/style/css\",\r\n        \"element-plus/es/components/option/style/css\",\r\n        \"element-plus/es/components/pagination/style/css\",\r\n        \"element-plus/es/components/tree/style/css\",\r\n        \"element-plus/es/components/alert/style/css\",\r\n        \"@vueuse/core\",\r\n\r\n        \"path-to-regexp\",\r\n        \"echarts\",\r\n        \"@wangeditor/editor\",\r\n        \"@wangeditor/editor-for-vue\",\r\n        \"vue-i18n\",\r\n      ],\r\n    },\r\n  };\r\n});\r\n"],
  "mappings": ";AAA6V,OAAO,SAAS;AAE7W,SAAgC,SAAS,oBAAoB;AAE7D,OAAO,gBAAgB;AACvB,OAAO,gBAAgB;AACvB,SAAS,2BAA2B;AAEpC,OAAO,WAAW;AAClB,OAAO,mBAAmB;AAE1B,SAAS,4BAA4B;AAErC,OAAO,YAAY;AAEnB,OAAO,UAAU;AAfjB,IAAM,mCAAmC;AAgBzC,IAAM,UAAU,KAAK,QAAQ,kCAAW,KAAK;AAE7C,IAAO,sBAAQ,aAAa,CAAC,EAAE,KAAK,MAA6B;AAC/D,QAAM,MAAM,QAAQ,MAAM,QAAQ,IAAI,CAAC;AACvC,SAAO;AAAA,IACL,SAAS;AAAA,MACP,OAAO;AAAA,QACL,KAAK;AAAA,MACP;AAAA,IACF;AAAA,IACA,KAAK;AAAA;AAAA,MAEH,qBAAqB;AAAA;AAAA,QAEnB,MAAM;AAAA,UACJ,mBAAmB;AAAA,UACnB,gBAAgB;AAAA;AAAA;AAAA,QAGlB;AAAA,MACF;AAAA,IACF;AAAA,IACA,QAAQ;AAAA,MACN,MAAM;AAAA,MACN,MAAM,OAAO,IAAI,aAAa;AAAA,MAC9B,MAAM;AAAA;AAAA,MACN,OAAO;AAAA;AAAA,QAEL,CAAC,IAAI,iBAAiB,GAAG;AAAA,UACvB,QAAQ,IAAI;AAAA;AAAA;AAAA;AAAA,UAGZ,cAAc;AAAA,UACd,SAAS,CAACA,UACRA,MAAK,QAAQ,IAAI,OAAO,MAAM,IAAI,iBAAiB,GAAG,EAAE;AAAA;AAAA,QAC5D;AAAA,MACF;AAAA,IACF;AAAA,IAEA,SAAS;AAAA,MAEP,IAAI;AAAA,MACJ,OAAO;AAAA;AAAA,MAEP,CAAC;AAAA,MACD,WAAW;AAAA;AAAA,QAET,SAAS,CAAC,OAAO,cAAc;AAAA;AAAA,QAE/B,UAAU;AAAA,UACR,SAAS;AAAA;AAAA,UACT,UAAU;AAAA;AAAA,UACV,kBAAkB;AAAA;AAAA,QACpB;AAAA,QACA,WAAW;AAAA;AAAA,UAET,oBAAoB;AAAA;AAAA,UAEpB,cAAc,CAAC,CAAC;AAAA,QAClB;AAAA,QACA,aAAa;AAAA;AAAA,QACb,KAAK,KAAK,QAAQ,SAAS,SAAS,mBAAmB;AAAA;AAAA,MACzD,CAAC;AAAA,MAED,WAAW;AAAA,QACT,WAAW;AAAA;AAAA,UAET,cAAc;AAAA,YACZ,oBAAoB,CAAC,IAAI;AAAA;AAAA,UAC3B,CAAC;AAAA;AAAA,UAED,oBAAoB;AAAA,QACtB;AAAA,QACA,KAAK,KAAK,QAAQ,SAAS,SAAS,iBAAiB;AAAA;AAAA,MACvD,CAAC;AAAA,MAED,MAAM;AAAA;AAAA,QAEJ,aAAa;AAAA,MACf,CAAC;AAAA,MAED,qBAAqB;AAAA;AAAA,QAEnB,UAAU,CAAC,KAAK,QAAQ,SAAS,cAAc,CAAC;AAAA;AAAA,QAEhD,UAAU;AAAA,MACZ,CAAC;AAAA,IACH;AAAA,IAEA,cAAc;AAAA,MACZ,SAAS;AAAA,QACP;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QAEA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,QACA;AAAA,MACF;AAAA,IACF;AAAA,EACF;AACF,CAAC;",
  "names": ["path"]
}
