diff --git a/index.html b/index.html index abfd9e55a..7241f24b2 100644 --- a/index.html +++ b/index.html @@ -7,6 +7,7 @@ + 数通智联化工云平台 diff --git a/src/components/DesignForm/assembly/index.ts b/src/components/DesignForm/assembly/index.ts index 6e3ceb591..b8861bbe3 100644 --- a/src/components/DesignForm/assembly/index.ts +++ b/src/components/DesignForm/assembly/index.ts @@ -23,6 +23,7 @@ const selectOption: any = [ type: 'input', label: '单行文本', icon: 'input', + iconFont: 'fa-text-width', control: { // 组件所有属性 modelValue: '' @@ -33,6 +34,7 @@ const selectOption: any = [ type: 'textarea', label: '多行文本', icon: 'textarea', + iconFont: 'fa-text-height', control: { modelValue: '' }, @@ -42,6 +44,7 @@ const selectOption: any = [ type: 'radio', label: '单选框组', icon: 'radio', + iconFont: 'fa-dot-circle-o', control: { modelValue: '' }, @@ -52,6 +55,7 @@ const selectOption: any = [ type: 'checkbox', label: '多选框组', icon: 'checkbox', + iconFont: 'fa-check-square-o', control: { modelValue: [] }, @@ -62,6 +66,7 @@ const selectOption: any = [ type: 'select', label: '下拉选择框', icon: 'select', + iconFont: 'fa-toggle-down', control: { modelValue: '', appendToBody: true @@ -72,7 +77,8 @@ const selectOption: any = [ { type: 'datePicker', label: '日期选择器', - icon: 'date', + icon: 'todo', + iconFont: 'fa-calendar', control: { modelValue: '', type: 'date' @@ -83,6 +89,7 @@ const selectOption: any = [ type: 'timePicker', label: '时间选择器', icon: 'time', + iconFont: 'fa-clock-o', control: { modelValue: '' }, @@ -92,6 +99,7 @@ const selectOption: any = [ type: 'colorPicker', label: '取色器', icon: 'color', + iconFont: '', control: { modelValue: '' }, @@ -101,6 +109,7 @@ const selectOption: any = [ type: 'switch', label: '开关', icon: 'switch', + iconFont: 'fa-toggle-on', control: { modelValue: false }, @@ -110,6 +119,7 @@ const selectOption: any = [ type: 'inputNumber', label: '计数器', icon: 'number', + iconFont: 'fa-sort-numeric-asc', control: { modelValue: 0 }, @@ -119,6 +129,7 @@ const selectOption: any = [ type: 'cascader', label: '级联选择器', icon: 'cascader', + iconFont: 'fa-sitemap', control: { modelValue: [] }, @@ -129,6 +140,7 @@ const selectOption: any = [ type: 'rate', label: '评分', icon: 'rate', + iconFont: 'fa-star-o', control: { modelValue: 0 }, @@ -138,6 +150,7 @@ const selectOption: any = [ type: 'slider', label: '滑块', icon: 'slider', + iconFont: 'fa-sliders', control: { modelValue: 0 }, @@ -147,6 +160,7 @@ const selectOption: any = [ type: 'treeSelect', label: '树形控件', icon: 'tree2', + iconFont: '', control: { modelValue: '', data: [], @@ -160,6 +174,7 @@ const selectOption: any = [ type: 'txt', label: '文字', icon: 'text', + iconFont: 'fa-file-word-o', control: { modelValue: '' }, @@ -169,6 +184,7 @@ const selectOption: any = [ type: 'title', label: '标题', icon: 'title', + iconFont: 'fa-header', control: { modelValue: '标题' }, @@ -178,6 +194,7 @@ const selectOption: any = [ type: 'button', label: '按钮', icon: 'button', + iconFont: 'fa-square-o', control: { label: '保存' }, @@ -192,6 +209,7 @@ const selectOption: any = [ type: 'table', label: '子表', icon: 'table', + iconFont: 'fa-table', list: [], tableData: [], // 子表表格列表数据集合 control: { @@ -205,6 +223,7 @@ const selectOption: any = [ type: 'component', label: '自定义组件', icon: 'component', + iconFont: 'fa-cubes', control: { modelValue: '' }, @@ -216,6 +235,7 @@ const selectOption: any = [ type: 'upload', label: '图片/文件', icon: 'image', + iconFont: 'fa-photo', control: { modelValue: '' // 也可以是[{name:'',url:''}]形式 }, @@ -225,6 +245,7 @@ const selectOption: any = [ type: 'tinymce', label: '富文本', icon: 'tinymce', + iconFont: '', control: { modelValue: '' }, @@ -239,6 +260,7 @@ const selectOption: any = [ type: 'grid', label: '格栅布局', icon: 'grid', + iconFont: 'fa-th-large', columns: [ // 格栅列数据 { @@ -257,6 +279,7 @@ const selectOption: any = [ type: 'tabs', label: '标签页', icon: 'tabs', + iconFont: 'fa-folder-o', columns: [ { label: 'Tab1', @@ -270,6 +293,7 @@ const selectOption: any = [ type: 'card', label: '卡片布局', icon: 'card', + iconFont: 'fa-credit-card', list: [], control: {}, config: {}, @@ -279,6 +303,7 @@ const selectOption: any = [ type: 'flex', label: '弹性布局', icon: 'flex', + iconFont: 'fa-file-text-o', list: [], tableData: [], // 值集合 control: {}, @@ -290,6 +315,7 @@ const selectOption: any = [ type: 'divider', label: '分割线', icon: 'divider', + iconFont: '', control: {}, config: {} }, @@ -297,6 +323,7 @@ const selectOption: any = [ type: 'div', label: '容器', icon: 'div', + iconFont: '', control: {}, config: {}, list: [] @@ -310,6 +337,7 @@ const selectOption: any = [ type: 'expand-user', label: '选择用户', icon: 'user', + iconFont: 'fa-user-o', control: { // 组件所有属性 modelValue: '' diff --git a/src/components/DesignForm/dragControl.vue b/src/components/DesignForm/dragControl.vue index e13503b37..8f610b1c7 100644 --- a/src/components/DesignForm/dragControl.vue +++ b/src/components/DesignForm/dragControl.vue @@ -16,6 +16,8 @@ import UseTemplate from './template.vue' import { customerFormVersionCont } from '@/api/DesignForm/type' +import '@/assets/iconfont/iconfont.css' + const props = withDefaults( defineProps<{ // eslint-disable-next-line vue/require-default-prop @@ -122,13 +124,13 @@ const forEachGetData = (data: FormList[]) => { const activeName = ref(6) //切换版本 const handleTabsClick = (val:any) =>{ - console.log("切换版本",val) + // console.log("切换版本",val) emits("update:versionid",val) } watch(()=>props.versioncont,(val: any)=>{ - console.log("versioncont---版本-->",val) + // console.log("versioncont---版本-->",val) if(val.length>0){ val.forEach((item:any,index:number) => { if(item.status == 1){ @@ -137,7 +139,7 @@ watch(()=>props.versioncont,(val: any)=>{ }); } - console.log("选定版本------->",activeName.value) + // console.log("选定版本------->",activeName.value) }) //编辑状态 const setupStatus = (val:any) =>{ @@ -163,25 +165,27 @@ const setupStatus = (val:any) =>{
{{ list.title }}
使用模板
+ @@ -201,11 +205,98 @@ const setupStatus = (val:any) =>{ - +
+ + + + + +
+ + + + + + +
+ + + + + + +
+ + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + +
+ + + + + + + + + + + + +
+ + + + + + + + + + +
+ + + + + + + + +