herenshan112
/
ShutongInterconnectedChemicalCloudPlatform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改样式

lwx_v4
超级管理员 1 year ago
parent
16072c7fb4
commit
161d209466
9 changed files with 283 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/assets/scss/form.css
  2. 2
      src/assets/scss/form.min.css
  3. 14
      src/assets/scss/form.scss
  4. 344
      src/components/DesignForm/assembly/index.ts
  5. 3
      src/components/DesignForm/formControlPropertiNew.vue
  6. 6
      src/components/DesignForm/public/form/formItem.vue
  7. 2
      src/views/sysworkflow/codepage/page_black20240318.vue
  8. 4
      src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
  9. 2
      src/widget/digitpage/index.vue

6
src/assets/scss/form.css
View File

@ -450,10 +450,7 @@
.design-form .group { .design-form .group {
border: 1px dashed #ddd; border: 1px dashed #ddd;
margin: 2px 0px 10px 0px;
padding: 5px;
position: relative; position: relative;
min-height: 50px;
} }
.design-form .group.active { .design-form .group.active {
@ -591,10 +588,7 @@
.detail-form .group { .detail-form .group {
border: 0px dashed #ddd; border: 0px dashed #ddd;
margin: 2px 0px 10px 0px;
padding: 5px;
position: relative; position: relative;
min-height: 50px;
} }
.detail-form .group > div { .detail-form .group > div {

2
src/assets/scss/form.min.css
View File

File diff suppressed because one or more lines are too long

14
src/assets/scss/form.scss
View File

@ -161,7 +161,12 @@ $mainColor: #66b1ff;
padding: 0; padding: 0;
width: 100%; width: 100%;
} }
.group {border: 1px dashed #ddd;margin: 2px 0px 10px 0px;padding: 5px;position: relative;min-height: 50px; .group {
border: 1px dashed #ddd;
// margin: 2px 0px 10px 0px;
// padding: 5px;
position: relative;
// min-height: 50px;
&.active {border: 3px solid $mainColor;position: relative; &.active {border: 3px solid $mainColor;position: relative;
> .drag-control {display: block} > .drag-control {display: block}
> .tooltip {display: block;} > .tooltip {display: block;}
@ -209,7 +214,12 @@ $mainColor: #66b1ff;
padding: 0; padding: 0;
width: 100%; width: 100%;
} }
.group {border: 0px dashed #ddd;margin: 2px 0px 10px 0px;padding: 5px;position: relative;min-height: 50px; .group {
border: 0px dashed #ddd;
// margin: 2px 0px 10px 0px;
// padding: 5px;
position: relative;
// min-height: 50px;
> div {margin-bottom: 0} > div {margin-bottom: 0}

344
src/components/DesignForm/assembly/index.ts
View File

@ -31,8 +31,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -56,8 +60,12 @@ export default [
config: {}, // 其他配置信息 config: {}, // 其他配置信息
selectvalue: "default", selectvalue: "default",
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -73,8 +81,12 @@ export default [
}, },
config: {}, // 其他配置信息 config: {}, // 其他配置信息
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -90,8 +102,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -110,8 +126,12 @@ export default [
options: selectOption, // 下拉选项数据集合 options: selectOption, // 下拉选项数据集合
config: config, config: config,
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -130,8 +150,12 @@ export default [
options: selectOption, options: selectOption,
config: config, config: config,
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -151,8 +175,12 @@ export default [
options: selectOption, options: selectOption,
config: config, config: config,
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -168,8 +196,12 @@ export default [
options: [], options: [],
config: config, config: config,
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -185,8 +217,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -201,8 +237,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -217,8 +257,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -232,8 +276,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -260,8 +308,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -277,8 +329,12 @@ export default [
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -293,8 +349,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -309,8 +369,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -348,8 +412,12 @@ export default [
control: {}, control: {},
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -364,8 +432,12 @@ export default [
config: {}, config: {},
item: {}, // label标题相关 item: {}, // label标题相关
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -382,8 +454,12 @@ export default [
addBtnText: '添加一行' addBtnText: '添加一行'
}, },
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -397,8 +473,12 @@ export default [
config: {}, config: {},
list: [], list: [],
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -418,8 +498,12 @@ export default [
control: {}, control: {},
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -433,8 +517,12 @@ export default [
control: {}, control: {},
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -510,8 +598,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -527,8 +619,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
@ -543,8 +639,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -563,8 +663,12 @@ export default [
addBtnText: '添加一行' addBtnText: '添加一行'
}, },
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -578,8 +682,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -594,8 +702,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -610,8 +722,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -626,8 +742,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -655,8 +775,12 @@ export default [
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -671,8 +795,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -718,8 +846,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -738,8 +870,12 @@ export default [
optionsType: 0 optionsType: 0
}, },
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -789,8 +925,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
/*template: '', // 组件模板名称 /*template: '', // 组件模板名称
@ -822,8 +962,12 @@ export default [
automatic: false automatic: false
}, },
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -839,8 +983,12 @@ export default [
}, },
config: {}, // 其他配置信息 config: {}, // 其他配置信息
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -854,8 +1002,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -870,8 +1022,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -886,8 +1042,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -902,8 +1062,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -918,8 +1082,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },
@ -934,8 +1102,12 @@ export default [
}, },
config: {}, config: {},
styles: { styles: {
divStyle: {}, divStyle: {
labelStyle: {}, marginBot: "10"
},
labelStyle: {
paddingLeft: "7",
},
inputStyle: {} inputStyle: {}
} }
}, },

3
src/components/DesignForm/formControlPropertiNew.vue
View File

@ -278,7 +278,8 @@ const attrList = computed(() => {
'datePicker', 'datePicker',
'tinymce', 'tinymce',
'timePicker', 'timePicker',
'treeSelect' 'treeSelect',
'digitpage'
] ]
}, },
{ {

6
src/components/DesignForm/public/form/formItem.vue
View File

@ -548,6 +548,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
:style="getFormItemInputStyle(configStyle,2)" :style="getFormItemInputStyle(configStyle,2)"
:input-style="getFormItemInputStyle(configStyle,3)" :input-style="getFormItemInputStyle(configStyle,3)"
v-if="['input', 'password'].includes(data.type)" v-if="['input', 'password'].includes(data.type)"
:placeholder="data.control.placeholder?data.control.placeholder:'请输入'+getLabel(data.item)"
> >
<template #prepend v-if="config.prepend"> <template #prepend v-if="config.prepend">
<div v-if="getInputSlot('p')"> <div v-if="getInputSlot('p')">
@ -579,6 +580,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
v-model="value" v-model="value"
:disabled="editDisabled" :disabled="editDisabled"
type="textarea" type="textarea"
:placeholder="data.control.placeholder?data.control.placeholder:'请输入'+getLabel(data.item)"
:style="getFormItemInputStyle(configStyle,2)" :style="getFormItemInputStyle(configStyle,2)"
:input-style="getFormItemInputStyle(configStyle,3)" :input-style="getFormItemInputStyle(configStyle,3)"
v-if="data.type === 'textarea'" v-if="data.type === 'textarea'"
@ -624,6 +626,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
:options="props.data.options" :options="props.data.options"
:remote-method="getAxiosOptions" :remote-method="getAxiosOptions"
:transformOption="transformOption" :transformOption="transformOption"
:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
/> />
<el-upload <el-upload
class="upload-style" class="upload-style"
@ -656,7 +659,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
:options="options" :options="options"
v-model="value" v-model="value"
/> />
<el-time-picker v-if="data.type=='timePicker'" v-model="value" value-format="x" /> <el-time-picker v-if="data.type=='timePicker'" v-model="value" value-format="x" :placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)" />
<component <component
v-if=" v-if="
[ [
@ -674,6 +677,7 @@ const imgUploadApiUrl = import.meta.env.VITE_APP_BASE_API+"/api/upordown"
:is="currentComponent" :is="currentComponent"
v-bind="control" v-bind="control"
:disabled="editDisabled" :disabled="editDisabled"
:placeholder="data.control.placeholder?data.control.placeholder:'请选择'+getLabel(data.item)"
v-model="value" v-model="value"
/> />

2
src/views/sysworkflow/codepage/page_black20240318.vue
View File

@ -40,7 +40,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
formEl.resetFields() formEl.resetFields()
} }
const inline = ref(false) const inline = ref(false)
const labelWidth = ref<any>("") const labelWidth = ref<any>(75)
const labelSuffix = ref<any>("") const labelSuffix = ref<any>("")
const hideRequiredAsterisk = ref(false) const hideRequiredAsterisk = ref(false)
const requireAsteriskPosition = ref('right') const requireAsteriskPosition = ref('right')

4
src/views/sysworkflow/lowcodepage/appPage/createAppFormPage.vue
View File

@ -74,7 +74,9 @@ const state = reactive<formStruct>({
size: 'default', size: 'default',
name:'', name:'',
formName: formConfigCont.formName, formName: formConfigCont.formName,
dataTitle: [] dataTitle: [],
labelWidth: "75",
labelPosition: "left"
}, },
config: { config: {
groupKey:props.groupKey groupKey:props.groupKey

2
src/widget/digitpage/index.vue
View File

@ -20,7 +20,7 @@
</template> </template>
<div v-if="type === 4" class="form-value" v-html="value"></div> <div v-if="type === 4" class="form-value" v-html="value"></div>
<template v-else> <template v-else>
<el-input v-model="value" :style="getFormItemInputStyle(configStyle,2)" :input-style="getFormItemInputStyle(configStyle,3)" oninput ="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^\./g, '')" placeholder="请输入"></el-input> <el-input v-model="value" :style="getFormItemInputStyle(configStyle,2)" :input-style="getFormItemInputStyle(configStyle,3)" oninput ="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^\./g, '')" :placeholder="data.control.placeholder?data.control.placeholder:'请输入'+getLabel(data.item)"></el-input>
</template> </template>
</el-form-item> </el-form-item>
</template> </template>

Write Preview
Loading…
Cancel
Save