diff --git a/public/huichuang_logo.png b/public/huichuang_logo.png new file mode 100644 index 00000000..a8fb5011 Binary files /dev/null and b/public/huichuang_logo.png differ diff --git a/public/iocn/text-indent-left.svg b/public/iocn/text-indent-left.svg new file mode 100644 index 00000000..5a607af0 --- /dev/null +++ b/public/iocn/text-indent-left.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/public/iocn/text-indent-right.svg b/public/iocn/text-indent-right.svg new file mode 100644 index 00000000..de91d9e4 --- /dev/null +++ b/public/iocn/text-indent-right.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/views/demo/form-design/components/VFormDesign/index.vue b/src/views/demo/form-design/components/VFormDesign/index.vue index a421cf66..de47f4a2 100644 --- a/src/views/demo/form-design/components/VFormDesign/index.vue +++ b/src/views/demo/form-design/components/VFormDesign/index.vue @@ -4,15 +4,21 @@ :class="`left ${prefixCls}-sider`" collapsible collapsedWidth="0" - width="300" + width="345" :zeroWidthTriggerStyle="{ 'margin-top': '-70px', - 'background-color': 'gray', + 'background-color': 'white', + width: '35px', + height: '35px', + 'background-image': `url(/iocn/text-indent-right.svg)`, + 'background-position': 'center', + 'background-repeat': 'no-repeat', + 'border-radius:': '15px', }" breakpoint="md" >
- + @@ -433,7 +448,7 @@ } .collapseItem-box { - height: calc(100vh - 60px); + height: calc(100vh - 55px); overflow: auto; } diff --git a/src/views/demo/form-design/components/VFormDesign/modules/Toolbar.vue b/src/views/demo/form-design/components/VFormDesign/modules/Toolbar.vue index 3bf74bdc..0bca6dd6 100644 --- a/src/views/demo/form-design/components/VFormDesign/modules/Toolbar.vue +++ b/src/views/demo/form-design/components/VFormDesign/modules/Toolbar.vue @@ -5,21 +5,21 @@
-
+ @@ -80,7 +80,7 @@ title: '生成代码', type: 'exportCode', event: 'handleOpenCodeModal', - icon: 'ant-design:code-filled', + icon: 'bi:code-slash', }, { title: '清空', diff --git a/src/views/demo/form-design/core/formItemConfig.ts b/src/views/demo/form-design/core/formItemConfig.ts index 9e4f34d5..01d78423 100644 --- a/src/views/demo/form-design/core/formItemConfig.ts +++ b/src/views/demo/form-design/core/formItemConfig.ts @@ -5,7 +5,7 @@ import { IVFormComponent } from '../typings/v-form-component'; import { isArray } from 'lodash-es'; import { componentMap as VbenCmp, add } from '@/components/Form/src/componentMap'; import { ComponentType } from '@/components/Form/src/types'; -import { uploadApi,fileUploadApi } from '@/api/sys/upload'; +import { uploadApi, fileUploadApi } from '@/api/sys/upload'; import { componentMap as Cmp } from '../components'; import { Component } from 'vue'; import { getDeptList, getAccountList, getPosGroupList } from '@/api/demo/system'; @@ -106,7 +106,7 @@ export const customComponents: IVFormComponent[] = [ { component: 'InputGuid', label: 'GUID主键', - icon: 'bi:input-cursor-text', + icon: 'bi:braces-asterisk', field: '', colProps: { span: 24 }, componentProps: {}, @@ -114,7 +114,7 @@ export const customComponents: IVFormComponent[] = [ { component: 'TreeSelect', label: '职级选择', - icon: 'gg:select', + icon: 'bi:list-stars', field: '', colProps: { span: 24 }, componentProps: { @@ -129,7 +129,7 @@ export const customComponents: IVFormComponent[] = [ { component: 'TreeSelect', label: '部门选择', - icon: 'clarity:tree-view-line', + icon: 'bi:people', field: '', colProps: { span: 24 }, componentProps: { @@ -144,7 +144,7 @@ export const customComponents: IVFormComponent[] = [ { component: 'Select', label: '人员选择', - icon: 'gg:select', + icon: 'bi:person', field: '', colProps: { span: 24 }, componentProps: { @@ -158,7 +158,7 @@ export const customComponents: IVFormComponent[] = [ { component: 'MapGeom', label: '图斑', - icon: 'ant-design:heat-map-outlined', + icon: 'bi:box-arrow-in-up-left', field: 'MapGeom', colProps: { span: 24 }, componentProps: {}, @@ -167,7 +167,7 @@ export const customComponents: IVFormComponent[] = [ field: '', component: 'Grid', label: '设计子表', - icon: 'ant-design:snippets-outlined', + icon: 'bi:list-ul', type: 'subTable', componentProps: {}, columns: [ @@ -190,7 +190,7 @@ export const baseComponents: IVFormComponent[] = [ { component: 'InputCountDown', label: '倒计时输入', - icon: 'line-md:iconify2', + icon: 'ant-design:hourglass-outlined', colProps: { span: 24 }, field: '', componentProps: {}, @@ -198,7 +198,7 @@ export const baseComponents: IVFormComponent[] = [ { component: 'IconPicker', label: '图标选择器', - icon: 'line-md:iconify2', + icon: 'bi:grid', colProps: { span: 24 }, field: '', componentProps: {}, @@ -214,7 +214,7 @@ export const baseComponents: IVFormComponent[] = [ { component: 'AutoComplete', label: '自动完成', - icon: 'wpf:password1', + icon: 'bi:check2-circle', colProps: { span: 24 }, field: '', componentProps: { @@ -242,36 +242,10 @@ export const baseComponents: IVFormComponent[] = [ dashed: true, }, }, - { - component: 'Checkbox', - label: '复选框', - icon: 'ant-design:check-circle-outlined', - colProps: { span: 24 }, - field: '', - }, - { - component: 'CheckboxGroup', - label: '复选框-组', - icon: 'ant-design:check-circle-filled', - field: '', - colProps: { span: 24 }, - componentProps: { - options: [ - { - label: '选项1', - value: '1', - }, - { - label: '选项2', - value: '2', - }, - ], - }, - }, { component: 'Input', label: '输入框', - icon: 'bi:input-cursor-text', + icon: 'bi:braces', field: '', colProps: { span: 24 }, componentProps: { @@ -289,15 +263,23 @@ export const baseComponents: IVFormComponent[] = [ { component: 'InputTextArea', label: '文本域', - icon: 'ant-design:file-text-filled', + icon: 'ant-design:file-text-outlined', field: '', colProps: { span: 24 }, componentProps: {}, }, { - component: 'Select', - label: '下拉选择', - icon: 'gg:select', + component: 'Radio', + label: '单选框', + icon: 'carbon:radio-button-checked', + field: '', + colProps: { span: 24 }, + componentProps: {}, + }, + { + component: 'RadioGroup', + label: '单选框-组', + icon: 'bi:ui-radios-grid', field: '', colProps: { span: 24 }, componentProps: { @@ -313,19 +295,17 @@ export const baseComponents: IVFormComponent[] = [ ], }, }, - { - component: 'Radio', - label: '单选框', - icon: 'ant-design:check-circle-outlined', - field: '', + component: 'Checkbox', + label: '复选框', + icon: 'bi:check-square', colProps: { span: 24 }, - componentProps: {}, + field: '', }, { - component: 'RadioGroup', - label: '单选框-组', - icon: 'carbon:radio-button-checked', + component: 'CheckboxGroup', + label: '复选框-组', + icon: 'bi:ui-checks-grid', field: '', colProps: { span: 24 }, componentProps: { @@ -396,11 +376,45 @@ export const baseComponents: IVFormComponent[] = [ { component: 'Switch', label: '开关', - icon: 'entypo:switch', + icon: 'bi:toggle-off', field: '', colProps: { span: 24 }, componentProps: {}, }, + { + component: 'Button', + label: '按钮组件', + icon: 'ant-design:build-outlined', + field: '', + colProps: { span: 24 }, + hiddenLabel: true, + componentProps: { + type: 'default', + shape: 'default', + size: 'middle', + icon: '', + clickCode: '', + }, + }, + { + component: 'Select', + label: '下拉选择', + icon: 'gg:select', + field: '', + colProps: { span: 24 }, + componentProps: { + options: [ + { + label: '选项1', + value: '1', + }, + { + label: '选项2', + value: '2', + }, + ], + }, + }, { component: 'TreeSelect', label: '树形选择', @@ -461,21 +475,6 @@ export const baseComponents: IVFormComponent[] = [ ], }, }, - { - component: 'Button', - label: '按钮组件', - icon: 'ant-design:build-outlined', - field: '', - colProps: { span: 24 }, - hiddenLabel: true, - componentProps: { - type: 'default', - shape: 'default', - size: 'middle', - icon: '', - clickCode: '', - }, - }, // { // component: 'ColorPicker', // label: '颜色选择器', @@ -490,7 +489,7 @@ export const baseComponents: IVFormComponent[] = [ { component: 'slot', label: '插槽', - icon: 'vs:timeslot-question', + icon: 'bi:inboxes', field: '', colProps: { span: 24 }, componentProps: { @@ -498,7 +497,7 @@ export const baseComponents: IVFormComponent[] = [ }, }, { - component:'CreateUser', + component: 'CreateUser', type: 'createuser', label: '创建人员', icon: 'mdi:account-check', @@ -507,7 +506,7 @@ export const baseComponents: IVFormComponent[] = [ componentProps: {}, }, { - component:'ModifyUser', + component: 'ModifyUser', type: 'modifyuser', label: '修改人员', icon: 'mdi:account-edit', @@ -516,7 +515,7 @@ export const baseComponents: IVFormComponent[] = [ componentProps: {}, }, { - component:'CreateTime', + component: 'CreateTime', type: 'createtime', label: '创建时间', icon: 'ic:outline-event-available', @@ -525,70 +524,74 @@ export const baseComponents: IVFormComponent[] = [ componentProps: {}, }, { - component:'ModifyTime', + component: 'ModifyTime', type: 'modifytime', label: '修改时间', icon: 'ic:outline-event', colProps: { span: 24 }, field: '', componentProps: {}, - },{ + }, + { component: 'FileUpload', label: '文件上传', icon: 'ant-design:file-add-outlined', field: '', colProps: { span: 24 }, componentProps: { - api:fileUploadApi, - maxNumber:10, + api: fileUploadApi, + maxNumber: 10, maxSize: 2, - name:"files", - action:"/api/Files/Upload", - server:"http://192.168.10.102:9023" + name: 'files', + action: '/api/Files/Upload', + server: 'http://192.168.10.102:9023', }, - },{ + }, + { component: 'ImageUpload', label: '图片上传', icon: 'ant-design:file-image-outlined', field: '', colProps: { span: 24 }, componentProps: { - api:fileUploadApi, - maxNumber:10, + api: fileUploadApi, + maxNumber: 10, accept: ['png', 'jpeg', 'jpg'], maxSize: 2, - name:"files", - action:"/api/Files/Upload", - server:"http://192.168.10.102:9023" + name: 'files', + action: '/api/Files/Upload', + server: 'http://192.168.10.102:9023', }, - },{ + }, + { component: 'VideoUpload', label: '视频上传', icon: 'ant-design:video-camera-outlined', field: '', colProps: { span: 24 }, componentProps: { - api:fileUploadApi, - maxNumber:10, + api: fileUploadApi, + maxNumber: 10, accept: ['mp4', 'mov', 'avi'], maxSize: 100, - name:"files", - action:"/api/Files/Upload", - server:"http://192.168.10.102:9023" + name: 'files', + action: '/api/Files/Upload', + server: 'http://192.168.10.102:9023', }, - },{ + }, + { component: 'Location', label: '获取位置', icon: 'ant-design:environment-outlined', field: '', colProps: { span: 24 }, componentProps: { - api:()=>1, - maxNumber:10, + api: () => 1, + maxNumber: 10, accept: ['mp4', 'mov', 'avi'], maxSize: 100, }, - } + }, ]; // https://next.antdv.com/components/transfer-cn @@ -632,7 +635,7 @@ export const layoutComponents: IVFormComponent[] = [ field: '', component: 'Grid', label: '栅格布局', - icon: 'icon-grid', + icon: 'bi:border-all', componentProps: {}, columns: [ { @@ -649,7 +652,7 @@ export const layoutComponents: IVFormComponent[] = [ field: '', component: 'Card', label: '卡片布局', - icon: 'ant-design:tags-outlined', + icon: 'bi:card-text', componentProps: {}, columns: [ { @@ -665,7 +668,7 @@ export const layoutComponents: IVFormComponent[] = [ { component: 'CardGroup', label: '卡片组', - icon: 'ic:round-auto-awesome-motion', + icon: 'bi:card-list', colProps: { span: 24 }, field: '', componentProps: { @@ -673,12 +676,12 @@ export const layoutComponents: IVFormComponent[] = [ { label: '卡片1', value: '1', - field:`use_card_1`, + field: 'use_card_1', children: [], }, { label: '卡片2', - field:`use_card_2`, + field: 'use_card_2', value: '2', children: [], }, diff --git a/src/views/demo/onlineform/formdesign/FormModal.vue b/src/views/demo/onlineform/formdesign/FormModal.vue index 9ed1d1b9..340b3b4a 100644 --- a/src/views/demo/onlineform/formdesign/FormModal.vue +++ b/src/views/demo/onlineform/formdesign/FormModal.vue @@ -11,7 +11,9 @@ >
-
慧创 表单设计
+
+ 慧创科技 表单设计 +