diff --git a/package.json b/package.json index f0a69e9..5ba8cef 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "dependencies": { "@crazydos/vue-markdown": "^1.1.4", "@dnd-kit/core": "^6.1.0", - "@element-plus/icons-vue": "^2.3.1", + "@element-plus/icons-vue": "^2.3.2", "@onlyoffice/document-editor-vue": "^1.5.0", "@sv-print/vue3": "^0.2.2", "@tinymce/tinymce-vue": "^5.1.1", diff --git a/src/api/DesignForm/types.ts b/src/api/DesignForm/types.ts index 3081a6e..40bf9f7 100644 --- a/src/api/DesignForm/types.ts +++ b/src/api/DesignForm/types.ts @@ -36,6 +36,7 @@ export interface FormData { list: FormList[] form: any // form所有props config: { + groupKey: any style?: string // 表单css样式,相当于scope hideField?: string[] // 使用v-if隐藏的字段,用于交互 requestUrl?: string // 表单数据请求url @@ -160,7 +161,7 @@ export interface formStruct{ designType: any; // 当前页面设计类型,有效值search formDict: any; formOtherData:formOtherData; - echatsViews:echatsViews[]; + echatsViews:echatsViewStruct[]; } export interface DrawerStruct{ @@ -234,7 +235,7 @@ export interface appSetUpContent{ appdescribe?:string; } //图标结构 -export interface echatsViews { +export interface echatsViewStruct { widthBox: number styles: any uuid:string; diff --git a/src/api/hr/org/type.ts b/src/api/hr/org/type.ts index 01dec8a..b1b3a6c 100644 --- a/src/api/hr/org/type.ts +++ b/src/api/hr/org/type.ts @@ -162,6 +162,7 @@ export interface searchCriteriaForPeople extends PageQuery{ } export interface criteriaForPeopleList{ + noedit: any; id: number userkey: string number: string diff --git a/src/assets/icons/caogaoxiang.svg b/src/assets/icons/caogaoxiang.svg index 918d62a..d0ab871 100644 --- a/src/assets/icons/caogaoxiang.svg +++ b/src/assets/icons/caogaoxiang.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/assets/icons/csr.svg b/src/assets/icons/csr.svg new file mode 100644 index 0000000..30e6bc0 --- /dev/null +++ b/src/assets/icons/csr.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/faqiren.svg b/src/assets/icons/faqiren.svg new file mode 100644 index 0000000..63a18ea --- /dev/null +++ b/src/assets/icons/faqiren.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/shenpi.svg b/src/assets/icons/shenpi.svg new file mode 100644 index 0000000..45bd97d --- /dev/null +++ b/src/assets/icons/shenpi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/icons/spr.svg b/src/assets/icons/spr.svg new file mode 100644 index 0000000..820f948 --- /dev/null +++ b/src/assets/icons/spr.svg @@ -0,0 +1 @@ + diff --git a/src/assets/icons/zxr.svg b/src/assets/icons/zxr.svg new file mode 100644 index 0000000..e880b0b --- /dev/null +++ b/src/assets/icons/zxr.svg @@ -0,0 +1 @@ + diff --git a/src/components/DesignForm/app/index.vue b/src/components/DesignForm/app/index.vue index e3f3e8c..c3cc434 100644 --- a/src/components/DesignForm/app/index.vue +++ b/src/components/DesignForm/app/index.vue @@ -6,11 +6,9 @@