소스 검색

vite 升级

tongshangming 2 년 전
부모
커밋
e619e097f8

+ 5 - 5
package.json

@@ -17,6 +17,8 @@
     "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^1.2.6",
     "dayjs": "^1.11.7",
+    "echarts": "^5.4.2",
+    "echarts-wordcloud": "^2.1.0",
     "element-plus": "^2.2.28",
     "nprogress": "^0.2.0",
     "pinia": "^2.0.29",
@@ -24,12 +26,10 @@
     "vue": "^3.2.45",
     "vue-cropper": "^1.0.5",
     "vue-router": "^4.1.6",
+    "vue3-count-to": "^1.1.2",
     "vuedraggable": "^4.1.0",
     "vxe-table": "^4.3.9",
-    "xe-utils": "^3.5.7",
-    "echarts": "^5.4.2",
-    "echarts-wordcloud": "^2.1.0",
-    "vue3-count-to": "^1.1.2"
+    "xe-utils": "^3.5.7"
   },
   "devDependencies": {
     "@iconify-json/ep": "^1.1.8",
@@ -53,7 +53,7 @@
     "unplugin-icons": "^0.14.15",
     "unplugin-vue-components": "^0.22.12",
     "unplugin-vue-define-options": "^0.11.2",
-    "vite": "^4.0.4",
+    "vite": "^4.3.5",
     "vite-plugin-style-import": "^2.0.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-tsc": "^0.39.5"

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 423 - 330
pnpm-lock.yaml


+ 0 - 1
src/auto-import.d.ts

@@ -115,7 +115,6 @@ declare global {
   const useArrayFilter: typeof import('@vueuse/core')['useArrayFilter']
   const useArrayFind: typeof import('@vueuse/core')['useArrayFind']
   const useArrayFindIndex: typeof import('@vueuse/core')['useArrayFindIndex']
-  const useArrayFindLast: typeof import('@vueuse/core')['useArrayFindLast']
   const useArrayJoin: typeof import('@vueuse/core')['useArrayJoin']
   const useArrayMap: typeof import('@vueuse/core')['useArrayMap']
   const useArrayReduce: typeof import('@vueuse/core')['useArrayReduce']

+ 4 - 5
src/components.d.ts

@@ -7,7 +7,7 @@ export {}
 
 declare module '@vue/runtime-core' {
   export interface GlobalComponents {
-    AddNode: typeof import('./components/workflow/addNode.vue')['default']
+    AddNode: typeof import('./components/workflow/AddNode.vue')['default']
     AdvancedForm: typeof import('./components/form/AdvancedForm.vue')['default']
     ApproverDrawer: typeof import('./components/workflow/drawer/approverDrawer.vue')['default']
     BasicForm: typeof import('./components/form/BasicForm.vue')['default']
@@ -20,7 +20,6 @@ declare module '@vue/runtime-core' {
     DesignerSetting: typeof import('./components/designer/DesignerSetting.vue')['default']
     DialogForm: typeof import('./components/form/DialogForm.vue')['default']
     DynamicFormEdit: typeof import('./components/DynamicFormEdit.vue')['default']
-    Eccharts: typeof import('./components/echarts/Eccharts.vue')['default']
     Echarts: typeof import('./components/echarts/Echarts.vue')['default']
     ElDict: typeof import('./components/ElDict.vue')['default']
     ElEditor: typeof import('./components/ElEditor.vue')['default']
@@ -39,7 +38,7 @@ declare module '@vue/runtime-core' {
     GlobalSubMenu: typeof import('./components/GlobalSubMenu.vue')['default']
     GlobalTabs: typeof import('./components/GlobalTabs.vue')['default']
     ImageUpload: typeof import('./components/ImageUpload.vue')['default']
-    NodeWrap: typeof import('./components/workflow/nodeWrap.vue')['default']
+    NodeWrap: typeof import('./components/workflow/NodeWrap.vue')['default']
     OrgLayout: typeof import('./components/org/OrgLayout.vue')['default']
     OrgList: typeof import('./components/org/OrgList.vue')['default']
     PaneModel: typeof import('./components/splitpanes/PaneModel.vue')['default']
@@ -48,8 +47,8 @@ declare module '@vue/runtime-core' {
     ProTable: typeof import('./components/ProTable.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    SelectBox: typeof import('./components/workflow/selectBox.vue')['default']
-    SelectResult: typeof import('./components/workflow/selectResult.vue')['default']
+    SelectBox: typeof import('./components/workflow/SelectBox.vue')['default']
+    SelectResult: typeof import('./components/workflow/SelectResult.vue')['default']
     SelIcon: typeof import('./components/SelIcon.vue')['default']
     SvgIcon: typeof import('./components/SvgIcon.vue')['default']
     WorkflowEdit: typeof import('./components/workflow/WorkflowEdit.vue')['default']

+ 3 - 3
src/components/DynamicFormEdit.vue

@@ -9,8 +9,8 @@ const emits = defineEmits(['click-change'])
 const dialogFormVisible = ref<boolean>(false)
 const active = ref<number>(0)
 const ruleFormRef = ref<any>()
-let workflowEdit = ref<any>(null)
-let workflowState = ref<number>(1)
+const workflowEdit = ref<any>(null)
+const workflowState = ref<number>(1)
 const formDesignerStore = useFormDesignerStore()
 const formConfig = computed(() => {
   return {
@@ -19,7 +19,7 @@ const formConfig = computed(() => {
     span: formDesignerStore.formSpan
   }
 })
-let ruleForm = ref<any>({
+const ruleForm = ref<any>({
   workflowName: ''
 })
 const init = (row: any) => {

+ 14 - 20
src/components/designer/DesignerHeader.vue

@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useFormDesignerStore,designerType } from '@/stores/designer'
+import { useFormDesignerStore, designerType } from '@/stores/designer'
 const formDesignerStore = useFormDesignerStore()
 const designerHeaderType = designerType()
 const formConfig = computed(() => {
@@ -18,8 +18,8 @@ const handleRemove = () => {
 const handlePreview = () => {
   dialogVisible.value = true
 }
-const handleChanging =(e) =>{
-    designerHeaderType.type = e
+const handleChanging = e => {
+  designerHeaderType.type = e
 }
 
 const formData = computed(() => {
@@ -29,13 +29,8 @@ const formData = computed(() => {
   })
   return res
 })
-const create = (data:any) =>{
-   
-}
-const update = () =>{
-
-}
-
+const create = (data: any) => {}
+const update = () => {}
 </script>
 
 <template>
@@ -46,15 +41,14 @@ const update = () =>{
     <el-button plain round type="primary" @click="handlePreview">预览</el-button>
   </div>
   <dialog-form
-      v-model="dialogVisible"
-      :formConfig="formConfig"
-      :formData="formData"
-      :create="create"
-      :update="update"
-      v-if="dialogVisible"
-    >
-    </dialog-form>
+    v-model="dialogVisible"
+    :formConfig="formConfig"
+    :formData="formData"
+    :create="create"
+    :update="update"
+    v-if="dialogVisible"
+  >
+  </dialog-form>
 </template>
 
-<style lang="scss">
-</style>
+<style lang="scss"></style>

+ 0 - 3
src/components/designer/DesignerSetting.vue

@@ -295,15 +295,12 @@ watch(
           </template>
           <!-- 字典属性 end -->
 
-
           <!-- <template v-if="compData.type === 'trends-select'">
             <el-form-item label="远端方法">
               <el-input v-model="compData.props.request"></el-input>
             </el-form-item>
 
           </template> -->
-
-
         </el-form>
       </el-tab-pane>
       <el-tab-pane label="表单属性" name="form">

+ 5 - 9
src/components/designer/FormDesigner.vue

@@ -1,11 +1,7 @@
-<script lang="ts" setup>
-
-
-
-</script>
+<script lang="ts" setup></script>
 
 <template>
-  <el-container class="layout-container el-dialog-div" >
+  <el-container class="layout-container el-dialog-div">
     <el-aside width="300px">
       <designer-comp></designer-comp>
     </el-aside>
@@ -13,8 +9,8 @@
       <el-header>
         <designer-header></designer-header>
       </el-header>
-      <el-main style="padding-bottom: 0;" >
-        <designer-render ></designer-render>
+      <el-main style="padding-bottom: 0">
+        <designer-render></designer-render>
       </el-main>
     </el-container>
     <el-aside width="350px">
@@ -27,7 +23,7 @@
 .layout-container {
   height: 100%;
 }
-.el-dialog-div{
+.el-dialog-div {
   height: 700px;
 }
 </style>

+ 3 - 4
src/components/designer/constant.ts

@@ -1,4 +1,3 @@
-
 export const comps = [
   {
     label: '输入型',
@@ -12,7 +11,7 @@ export const comps = [
         icon: 'icon-add-text-two',
         name: '数字输入',
         type: 'input-number'
-      },
+      }
     ]
   },
   {
@@ -62,7 +61,7 @@ export const comps = [
         type: 'switch'
       }
     ]
-  },
+  }
 ]
 
 export const typeMap = {
@@ -70,7 +69,7 @@ export const typeMap = {
   checkbox: '多选',
   select: '下拉',
   input: '单行文本',
-  textarea: '多行文本',
+  textarea: '多行文本'
 }
 
 export const configMap = {

+ 11 - 11
src/components/workflow/WorkflowEdit.vue

@@ -5,10 +5,10 @@ import { useWorkflow } from '@/stores/workflow'
 const workFlow = useWorkflow()
 const emits = defineEmits(['click-change', 'previous-step'])
 const tipList = ref<any>([])
-let tipVisible = ref(false)
-let islook = ref(false)
-let nowVal = ref(100)
-let processConfig = ref<any>({
+const tipVisible = ref(false)
+const islook = ref(false)
+const nowVal = ref(100)
+const processConfig = ref<any>({
   nodeConfig: {
     nodeName: '流程发起',
     nodeType: 0,
@@ -30,16 +30,16 @@ let processConfig = ref<any>({
     conditionNodes: []
   }
 })
-let nodeConfig = ref({})
+const nodeConfig = ref({})
 let workflowId = ref('')
 let state = ref<any>('')
-let operateShow = ref(false)
+const operateShow = ref(false)
 const init = (row: any) => {
   workflowId = row.id
   state = row.state
   if (row.state == 1 || !row.state) {
     // 新增流程
-    let { nodeConfig: nodes } = processConfig.value
+    const { nodeConfig: nodes } = processConfig.value
     nodeConfig.value = nodes
   } else if (row.state == 2) {
     operateShow.value = row.operateShow
@@ -48,7 +48,7 @@ const init = (row: any) => {
       workflowId: workflowId
     }).then((res: any) => {
       processConfig.value = JSON.parse(res.flowExpr)
-      let { nodeConfig: nodes } = JSON.parse(res.flowExpr)
+      const { nodeConfig: nodes } = JSON.parse(res.flowExpr)
       nodeConfig.value = nodes
     })
   } else if (row.state == 3) {
@@ -58,14 +58,14 @@ const init = (row: any) => {
       workflowExecuteId: workflowId
     }).then((res: any) => {
       processConfig.value = JSON.parse(res.flowExpr)
-      let { nodeConfig: nodes } = JSON.parse(res.flowExpr)
+      const { nodeConfig: nodes } = JSON.parse(res.flowExpr)
       nodeConfig.value = nodes
     })
   }
 }
 const reErr = (childNode: any) => {
   if (childNode) {
-    let { nodeType, error, nodeName, conditionNodes } = childNode
+    const { nodeType, error, nodeName, conditionNodes } = childNode
     if (nodeType == 1 || nodeType == 4) {
       if (error) {
         tipList.value.push({
@@ -78,7 +78,7 @@ const reErr = (childNode: any) => {
       reErr(childNode)
     } else if (nodeType == 2) {
       reErr(childNode)
-      for (var i = 0; i < conditionNodes.length; i++) {
+      for (let i = 0; i < conditionNodes.length; i++) {
         if (conditionNodes[i].error) {
           tipList.value.push({ name: conditionNodes[i].nodeName, type: '条件' })
         }

+ 5 - 5
src/components/workflow/addNode.vue

@@ -31,9 +31,9 @@
     </div>
   </div>
 </template>
-<script setup>
+<script lang="ts" setup>
 import { ref } from 'vue'
-let props = defineProps({
+const props = defineProps({
   childNodeP: {
     type: Object,
     default: () => ({})
@@ -43,12 +43,12 @@ let props = defineProps({
     default: false
   }
 })
-let emits = defineEmits(['update:childNodeP'])
-let visible = ref(false)
+const emits = defineEmits(['update:childNodeP'])
+const visible = ref(false)
 const addType = type => {
   visible.value = false
   if (type != 2) {
-    var data
+    let data
     if (type == 1) {
       data = {
         nodeName: '',

+ 15 - 15
src/components/workflow/dialog/employeesRoleDialog.vue

@@ -21,7 +21,7 @@
 <script setup lang="ts">
 import $func from '@/utils/preload.js'
 import { getTangent } from '@/api/workflow'
-let props = defineProps({
+const props = defineProps({
   visible: {
     type: Boolean,
     default: false
@@ -35,9 +35,9 @@ let props = defineProps({
     default: false
   }
 })
-let searchVal = ref<any>('')
-let emits = defineEmits(['update:visible', 'change'])
-let visibleDialog = computed({
+const searchVal = ref<any>('')
+const emits = defineEmits(['update:visible', 'change'])
+const visibleDialog = computed({
   get() {
     return props.visible
   },
@@ -45,16 +45,16 @@ let visibleDialog = computed({
     closeDialog()
   }
 })
-let departments = ref<any>({
+const departments = ref<any>({
   titleDepartments: [],
   childDepartments: [],
   employees: []
 })
-let checkedRoleList = ref<any>([])
-let checkedEmployessList = ref<any>([])
-let checkedDepartmentList = ref<any>([])
-let activeName = ref<any>('3')
-let list = computed(() => {
+const checkedRoleList = ref<any>([])
+const checkedEmployessList = ref<any>([])
+const checkedDepartmentList = ref<any>([])
+const activeName = ref<any>('3')
+const list = computed(() => {
   return [
     {
       type: 'employee',
@@ -64,7 +64,7 @@ let list = computed(() => {
     }
   ]
 })
-let searchlist = computed(() => {
+const searchlist = computed(() => {
   return [
     {
       type: 'employee',
@@ -84,8 +84,8 @@ const getDebounceData = (e: any) => {
     }
   })
 }
-let resList = computed(() => {
-  let data = [
+const resList = computed(() => {
+  const data = [
     {
       type: 'employee',
       data: checkedEmployessList.value,
@@ -114,7 +114,7 @@ watch(
     }
   }
 )
-let total = computed(() => {
+const total = computed(() => {
   return checkedEmployessList.value.length + checkedRoleList.value.length + checkedDepartmentList.value.length
 })
 
@@ -122,7 +122,7 @@ const handleClick = () => {
   searchVal.value = ''
 }
 const saveDialog = () => {
-  let checkedList = [...checkedRoleList.value, ...checkedEmployessList.value, ...checkedDepartmentList.value].map(
+  const checkedList = [...checkedRoleList.value, ...checkedEmployessList.value, ...checkedDepartmentList.value].map(
     (item: any) => ({
       type: item.employeeName ? 1 : item.roleName ? 2 : 3,
       subjectId: item.id || item.roleId,

+ 3 - 3
src/components/workflow/dialog/errorDialog.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script setup lang="ts">
-let props = defineProps({
+const props = defineProps({
   list: {
     type: Array,
     default: () => []
@@ -39,9 +39,9 @@ let props = defineProps({
     default: false
   }
 })
-let emits = defineEmits(['update:visible'])
+const emits = defineEmits(['update:visible'])
 
-let visibleDialog = computed({
+const visibleDialog = computed({
   get() {
     return props.visible
   },

+ 6 - 6
src/components/workflow/drawer/approverDrawer.vue

@@ -76,18 +76,18 @@ import { ElMessage } from 'element-plus'
 import type { FormInstance } from 'element-plus'
 import { useWorkflow } from '@/stores/workflow'
 const workFlow = useWorkflow()
-let props = defineProps({
+const props = defineProps({
   operateShow: {
     type: Boolean,
     default: false
   }
 })
-let emits = defineEmits(['update:nodeConfig'])
-let approverConfig = ref<any>({})
-let approverVisible = ref<any>(false)
+const emits = defineEmits(['update:nodeConfig'])
+const approverConfig = ref<any>({})
+const approverVisible = ref<any>(false)
 
-let checkedList = ref<any>([])
-let visible = computed({
+const checkedList = ref<any>([])
+const visible = computed({
   get() {
     return workFlow.approverDrawer
   },

+ 8 - 8
src/components/workflow/drawer/conditionDrawer.vue

@@ -99,19 +99,19 @@ import $func from '@/utils/preload'
 import { getFormField, getExecuteFormField } from '@/api/workflow'
 import { useWorkflow } from '@/stores/workflow'
 const workFlow = useWorkflow()
-let conditionsConfig = ref<any>({
+const conditionsConfig = ref<any>({
   conditionNodes: []
 })
 let fieldList = ref<any>([])
-let conditionConfig = ref<any>({})
-let PriorityLevel = ref<any>('')
+const conditionConfig = ref<any>({})
+const PriorityLevel = ref<any>('')
 
-let condGroup = ref({
+const condGroup = ref({
   type: 'and',
   items: []
 })
 
-let props = defineProps({
+const props = defineProps({
   workflowId: {
     type: String,
     default: ''
@@ -126,7 +126,7 @@ let props = defineProps({
   }
 })
 
-let visible = computed({
+const visible = computed({
   get() {
     return workFlow.conditionDrawer
   },
@@ -177,12 +177,12 @@ const addCondition = async () => {
 const saveCondition = () => {
   closeDrawer()
 
-  var a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1) //截取旧下标
+  const a = conditionsConfig.value.conditionNodes.splice(PriorityLevel.value - 1, 1) //截取旧下标
   conditionsConfig.value.conditionNodes.splice(conditionConfig.value.priorityLevel - 1, 0, a[0]) //填充新下标
   conditionsConfig.value.conditionNodes.map((item: any, index: any) => {
     item.priorityLevel = index + 1
   })
-  for (var i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
+  for (let i = 0; i < conditionsConfig.value.conditionNodes.length; i++) {
     conditionsConfig.value.conditionNodes[i].error =
       $func.conditionStr(conditionsConfig.value, i) == '请设置条件' &&
       i != conditionsConfig.value.conditionNodes.length - 1

+ 6 - 6
src/components/workflow/drawer/copyerDrawer.vue

@@ -48,11 +48,11 @@
 import $func from '@/utils/preload'
 import { useWorkflow } from '@/stores/workflow'
 const workFlow = useWorkflow()
-let copyerConfig = ref<any>({})
-let ccSelfSelectFlag = ref<any>([])
-let copyerVisible = ref<any>(false)
-let checkedList = ref<any>([])
-let visible = computed({
+const copyerConfig = ref<any>({})
+const ccSelfSelectFlag = ref<any>([])
+const copyerVisible = ref<any>(false)
+const checkedList = ref<any>([])
+const visible = computed({
   get() {
     return workFlow.copyerDrawer
   },
@@ -60,7 +60,7 @@ let visible = computed({
     closeDrawer()
   }
 })
-let props = defineProps({
+const props = defineProps({
   operateShow: {
     type: Boolean,
     default: false

+ 17 - 18
src/components/workflow/nodeWrap.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="node-wrap" v-if="nodeConfig.nodeType == 0">
     <el-button type="primary">流程开始</el-button>
-    <addNode v-model:childNodeP="nodeConfig.childNode" :operateShow="operateShow" />
+    <add-node v-model:childNodeP="nodeConfig.childNode" :operateShow="operateShow" />
   </div>
   <div class="node-wrap" v-if="(nodeConfig.nodeType == 1 || nodeConfig.nodeType == 4) && nodeConfig.nodeType != 0">
     <div class="node-wrap-box" :class="isTried && nodeConfig.error ? 'active error' : ''">
@@ -39,7 +39,7 @@
         <i class="anticon anticon-exclamation-circle"></i>
       </div>
     </div>
-    <addNode v-model:childNodeP="nodeConfig.childNode" :operateShow="operateShow" />
+    <add-node v-model:childNodeP="nodeConfig.childNode" :operateShow="operateShow" />
   </div>
   <div class="branch-wrap" v-if="nodeConfig.nodeType == 2">
     <div class="branch-box-wrap">
@@ -81,7 +81,7 @@
                   <i class="anticon anticon-exclamation-circle"></i>
                 </div>
               </div>
-              <addNode v-model:childNodeP="item.childNode" :operateShow="operateShow" />
+              <add-node v-model:childNodeP="item.childNode" :operateShow="operateShow" />
             </div>
           </div>
           <nodeWrap v-if="item.childNode" v-model:nodeConfig="item.childNode" :operateShow="operateShow" />
@@ -95,20 +95,19 @@
           </template>
         </div>
       </div>
-      <addNode v-model:childNodeP="nodeConfig.childNode" :operateShow="operateShow" />
+      <add-node v-model:childNodeP="nodeConfig.childNode" :operateShow="operateShow" />
     </div>
   </div>
   <nodeWrap v-if="nodeConfig.childNode" v-model:nodeConfig="nodeConfig.childNode" :operateShow="operateShow" />
 </template>
-<script setup>
+<script lang="ts" setup>
 import $func from '@/utils/preload'
-import addNode from './addNode.vue'
 import { useWorkflow } from '@/stores/workflow'
 const workFlow = useWorkflow()
-let _uid = getCurrentInstance().uid
-let bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
-let placeholderList = ['发起人', '', '抄送人']
-let props = defineProps({
+const _uid = getCurrentInstance().uid
+const bgColors = ['87, 106, 149', '255, 148, 62', '50, 150, 250']
+const placeholderList = ['发起人', '', '抄送人']
+const props = defineProps({
   nodeConfig: {
     type: Object,
     default: () => ({})
@@ -119,18 +118,18 @@ let props = defineProps({
   }
 })
 
-let defaultText = computed(() => {
+const defaultText = computed(() => {
   return placeholderList[props.nodeConfig.nodeType]
 })
-let showText = computed(() => {
+const showText = computed(() => {
   if (props.nodeConfig.nodeType == 1) return $func.setApproverStr(props.nodeConfig)
   return $func.copyerStr(props.nodeConfig)
 })
 
-let isInputList = ref([])
-let isInput = ref(false)
+const isInputList = ref([])
+const isInput = ref(false)
 const resetConditionNodesErr = () => {
-  for (var i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
+  for (let i = 0; i < props.nodeConfig.conditionNodes.length; i++) {
     props.nodeConfig.conditionNodes[i].error =
       $func.conditionStr(props.nodeConfig, i) == '请设置条件' && i != props.nodeConfig.conditionNodes.length - 1
   }
@@ -144,7 +143,7 @@ onMounted(() => {
     resetConditionNodesErr()
   }
 })
-let emits = defineEmits(['update:nodeConfig'])
+const emits = defineEmits(['update:nodeConfig'])
 
 watch(workFlow, val => {
   if (val.approverConfig1.flag && val.approverConfig1.id === _uid) {
@@ -178,7 +177,7 @@ const delNode = () => {
   emits('update:nodeConfig', props.nodeConfig.childNode)
 }
 const addTerm = () => {
-  let len = props.nodeConfig.conditionNodes.length + 1
+  const len = props.nodeConfig.conditionNodes.length + 1
   props.nodeConfig.conditionNodes.push({
     nodeName: '条件' + len,
     nodeType: 3,
@@ -220,7 +219,7 @@ const reData = (data, addData) => {
   }
 }
 const setPerson = priorityLevel => {
-  var { nodeType } = props.nodeConfig
+  const { nodeType } = props.nodeConfig
   if (nodeType == 1) {
     workFlow.approverDrawer = true
     workFlow.setApproverConfig({

+ 13 - 5
src/components/workflow/selectBox.vue

@@ -17,13 +17,21 @@
   </ul>
 </template>
 <script setup lang="ts">
-defineProps({
-  list: {
-    type: Array,
-    default: () => []
-  }
+interface Props {
+  list: Array<{
+    data: Array<{
+      id: string
+    }>
+    isActive: Function
+    change: Function
+  }>
+}
+
+withDefaults(defineProps<Props>(), {
+  list: () => []
 })
 </script>
+
 <style lang="scss">
 .select-box {
   height: 420px;

+ 21 - 17
src/components/workflow/selectResult.vue

@@ -1,9 +1,3 @@
-<!--
- * @Date: 2022-08-26 16:29:24
- * @LastEditors: StavinLi 495727881@qq.com
- * @LastEditTime: 2022-09-21 14:36:30
- * @FilePath: /Workflow-Vue3/src/components/selectResult.vue
--->
 <template>
   <div class="select-result l">
     <p class="clear">
@@ -38,19 +32,29 @@
     </ul>
   </div>
 </template>
-<script setup>
+
+<script lang="ts" setup>
 import { CloseOne as iconCloseOne } from '@icon-park/vue-next'
-defineProps({
-  total: {
-    type: Number,
-    default: 0
-  },
-  list: {
-    type: Array,
-    default: () => [{ type: 'role', data, cancel }]
-  }
+
+interface List {
+  type: string
+  data?: Array<{
+    name: string
+    id: string
+  }>
+  cancel?: Function
+}
+
+interface Props {
+  total: number
+  list: Array<List>
+}
+
+withDefaults(defineProps<Props>(), {
+  total: 0,
+  list: () => []
 })
-let emits = defineEmits(['del'])
+const emits = defineEmits(['del'])
 </script>
 
 <style lang="scss">

+ 2 - 4
src/stores/designer.ts

@@ -14,7 +14,6 @@ export const useFormDesignerStore = defineStore({
     curFormItem: <any>{}
   }),
   getters: {
-    tableItems: state => state.formItems.filter(item => item.list),
     downloadFormItems: state => {
       return state.formItems.map(item => {
         const element = JSON.parse(JSON.stringify(item))
@@ -42,12 +41,11 @@ export const useFormDesignerStore = defineStore({
   }
 })
 
-
 export const designerType = defineStore({
   id: 'Type',
   state: () => ({
-    type:0
+    type: 0
   }),
   getters: {},
   actions: {}
-})
+})

+ 12 - 12
src/stores/workflow.ts

@@ -8,36 +8,36 @@ export const useWorkflow = defineStore({
     approverConfig: {},
     copyerDrawer: false,
     copyerConfig1: {},
-    copyerConfig:{},
+    copyerConfig: {},
     conditionDrawer: false,
     conditionsConfig1: {
-      conditionNodes: [],
-    },
+      conditionNodes: []
+    }
   }),
   actions: {
-    setIsTried(isTried:any) {
+    setIsTried(isTried: any) {
       this.isTried = isTried
     },
-    setPromoter(promoterDrawer:any) {
+    setPromoter(promoterDrawer: any) {
       this.promoterDrawer = promoterDrawer
     },
-    setApprover(approverDrawer:any) {
+    setApprover(approverDrawer: any) {
       this.approverDrawer = approverDrawer
     },
-    setApproverConfig(approverConfig1:any) {
+    setApproverConfig(approverConfig1: any) {
       this.approverConfig1 = approverConfig1
     },
-    setCopyer(copyerDrawer:any) {
+    setCopyer(copyerDrawer: any) {
       this.copyerDrawer = copyerDrawer
     },
-    setCopyerConfig(copyerConfig1:any) {
+    setCopyerConfig(copyerConfig1: any) {
       this.copyerConfig1 = copyerConfig1
     },
-    setCondition(conditionDrawer:any) {
+    setCondition(conditionDrawer: any) {
       this.conditionDrawer = conditionDrawer
     },
-    setConditionsConfig(conditionsConfig1:any) {
+    setConditionsConfig(conditionsConfig1: any) {
       this.conditionsConfig1 = conditionsConfig1
-    },
+    }
   }
 })

+ 1 - 0
src/types/form.ts

@@ -6,6 +6,7 @@ export type formSlot = {
 }
 
 export type BasicFormItem = {
+  id?: string
   label: string
   value: any
   name: string

+ 8 - 8
src/utils/preload.ts

@@ -16,11 +16,11 @@ All.prototype = {
     })
   },
   toChecked(arr: any, elem: any, key = 'id') {
-    var isIncludes = this.toggleClass(arr, elem, key)
+    const isIncludes = this.toggleClass(arr, elem, key)
     !isIncludes ? arr.push(elem) : this.removeEle(arr, elem, key)
   },
   removeEle(arr: any, elem: any, key = 'id') {
-    var includesIndex
+    let includesIndex
     arr.map((item: any, index: any) => {
       if (item[key] == elem[key]) {
         includesIndex = index
@@ -40,7 +40,7 @@ All.prototype = {
         }
       }
     } else if (nodeConfig.settype == 2) {
-      let level = nodeConfig.directorLevel == 1 ? '直接主管' : '第' + nodeConfig.directorLevel + '级主管'
+      const level = nodeConfig.directorLevel == 1 ? '直接主管' : '第' + nodeConfig.directorLevel + '级主管'
       if (nodeConfig.examineMode == 1) {
         return level
       } else if (nodeConfig.examineMode == 2) {
@@ -65,8 +65,8 @@ All.prototype = {
     }
   },
   dealStr(str: any, obj: any) {
-    let arr = ref<any>([])
-    let list = str.split(',')
+    const arr = ref<any>([])
+    const list = str.split(',')
     for (var elem in obj) {
       list.map((item: any) => {
         if (item == elem) {
@@ -77,13 +77,13 @@ All.prototype = {
     return arr.join('或')
   },
   conditionStr(nodeConfig: any, index: any) {
-    var { condGroup, subjects } = nodeConfig.conditionNodes[index]
+    const { condGroup, subjects } = nodeConfig.conditionNodes[index]
     if (condGroup.items.length == 0) {
       return index == nodeConfig.conditionNodes.length - 1 && nodeConfig.conditionNodes[0].condGroup.items.length != 0
         ? '其他条件进入此流程'
         : '请设置条件'
     } else {
-      let str = '已设置条件'
+      const str = '已设置条件'
 
       return str ? str : '请设置条件'
     }
@@ -98,7 +98,7 @@ All.prototype = {
     }
   },
   toggleStrClass(item: any, key: any) {
-    let a = item.zdy1 ? item.zdy1.split(',') : []
+    const a = item.zdy1 ? item.zdy1.split(',') : []
     return a.some((item: any) => {
       return item == key
     })

+ 3 - 6
src/utils/utils.ts

@@ -10,7 +10,6 @@ export const isAbsolutePath = (path: string) => {
   return path.startsWith('http')
 }
 
-
 export const uuid = (len = 16) => {
   const chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split('')
   const uuid = []
@@ -38,8 +37,7 @@ export const uuid = (len = 16) => {
 export const compToFormItem = (comp: any) => {
   const id = uuid(8)
   const formDesignerStore = useFormDesignerStore()
-  console.log("comp",comp);
-  
+
   const formItem: BasicFormItem = {
     id,
     label: comp.name,
@@ -49,13 +47,12 @@ export const compToFormItem = (comp: any) => {
     children: [],
     options: [],
     search: false,
-    list: true,
     required: false,
     rules: [],
     props: comp.props || {},
     span: formDesignerStore.formSpan,
     slots: comp.slots,
-    request:comp.request
+    request: comp.request
   }
   if (['editor'].includes(comp.type)) {
     formItem.span = 24
@@ -78,4 +75,4 @@ export const placeholder = (item: BasicFormItem) => {
   } else {
     return '请输入' + item.label
   }
-}
+}

+ 1 - 1
src/views/monitor/MessageNotif.vue

@@ -31,7 +31,7 @@ const CRUD: ICRUD = {
             attachment: '',
             status: '已读',
             publisher: '超管'
-          },
+          }
         ],
         total: 2
       })

+ 2 - 2
src/views/system/Area.vue

@@ -22,7 +22,7 @@ const defaultProps = {
   label: 'label'
 }
 
-let data = ref<any>([])
+const data = ref<any>([])
 getAreaList().then((res: any) => {
   data.value = res.fields
 })
@@ -83,7 +83,7 @@ const formConfig = reactive<BasicForm>({
   ]
 })
 const ruleFormRef = ref()
-let ruleForm = ref({
+const ruleForm = ref({
   id: '',
   type: 1,
   encoded: '',

+ 9 - 9
src/views/system/Configure.vue

@@ -55,7 +55,7 @@ const formConfig = reactive<BasicForm>({
       name: 'messageTemplate',
       type: 'input',
       rules: [{ required: true, message: '请输入短信模版', trigger: 'blur' }]
-    },
+    }
   ]
 })
 const handleSaveMessage = () => {
@@ -100,7 +100,7 @@ const formEmailConfig = reactive<BasicForm>({
       name: 'mailPassword',
       type: 'input',
       rules: [{ required: true, message: '请输入系统邮箱密码', trigger: 'blur' }]
-    },
+    }
   ]
 })
 const handleSaveEmail = () => {
@@ -114,13 +114,13 @@ const handleSaveEmail = () => {
     <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
       <el-tab-pane label="登录" name="login">
         <el-card class="box-card">
-          <div  class="login-container">
+          <div class="login-container">
             <div class="title">单一登录配置</div>
             <div>
               <el-checkbox v-model="isSingleLogin" @change="handleChange">单一登录</el-checkbox>
             </div>
             <div>
-              <el-radio-group v-model="singleLoginType"  :disabled="!isSingleLogin">
+              <el-radio-group v-model="singleLoginType" :disabled="!isSingleLogin">
                 <el-radio label="1" size="large">后登录踢出先登录</el-radio>
                 <el-radio label="2" size="large">已登录禁止再登录</el-radio>
               </el-radio-group>
@@ -135,8 +135,7 @@ const handleSaveEmail = () => {
         <el-card class="box-card">
           <div class="message-container">
             <div class="title">短信配置</div>
-            <pro-form :formConfig="formConfig" :formData="formData" ref="proFormRef">
-            </pro-form>
+            <pro-form :formConfig="formConfig" :formData="formData" ref="proFormRef"> </pro-form>
             <div class="btn">
               <el-button type="primary" @click="handleSaveMessage">保存</el-button>
             </div>
@@ -147,8 +146,7 @@ const handleSaveEmail = () => {
         <el-card class="box-card">
           <div class="mail-container">
             <div class="title">发件人账户</div>
-            <pro-form :formConfig="formEmailConfig" :formData="formEmailData" ref="proFormEmailRef">
-            </pro-form>
+            <pro-form :formConfig="formEmailConfig" :formData="formEmailData" ref="proFormEmailRef"> </pro-form>
             <div class="btn">
               <el-button type="primary" @click="handleSaveEmail">保存</el-button>
             </div>
@@ -168,7 +166,9 @@ const handleSaveEmail = () => {
         margin-top: 20px;
       }
     }
-    .message-container, .mail-container, .login-container {
+    .message-container,
+    .mail-container,
+    .login-container {
       .title {
         font-size: 17px;
         font-weight: bold;

+ 1 - 1
src/views/workflow/Workflow.vue

@@ -3,7 +3,7 @@ import type { BasicForm, ICRUD } from '@/types/form'
 import { getForm, getWorkflows } from '@/api/workflow'
 import { useFormDesignerStore } from '@/stores/designer'
 import DynamicFormEdit from '@/components/DynamicFormEdit.vue'
-let dynamicFormEdit = ref<any>(null)
+const dynamicFormEdit = ref<any>(null)
 const tableRef = ref<any>(null)
 const selection = ref(false)
 const showToolbar = ref(false)

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.