feat: 补充按钮类型选择

BoBoooooo · Jun 4, 2021 · 1ff2f2e · 1ff2f2e
1 parent 2969875
commit 1ff2f2e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 2 deletions.
diff --git a/src/component/form-designer/src/WidgetConfig.vue b/src/component/form-designer/src/WidgetConfig.vue
@@ -25,6 +25,16 @@
       <el-form-item label="显示文本" v-if="Object.keys(elementConfig.options).indexOf('text') >= 0">
         <el-input size="mini" v-model="elementConfig.options.text"></el-input>
       </el-form-item>
+      <el-form-item label="按钮类型" v-if="Object.keys(elementConfig.options).indexOf('btnType') >= 0">
+        <el-select size="mini" v-model="elementConfig.options.btnType">
+          <el-option value="primary" label="primary" />
+          <el-option value="sussess" label="sussess" />
+          <el-option value="warning" label="warning" />
+          <el-option value="danger" label="danger" />
+          <el-option value="info" label="info" />
+          <el-option value="text" label="text" />
+        </el-select>
+      </el-form-item>
       <el-form-item :label="elementConfig.type === 'html' ? 'HTML' : '图表数据'" v-if="elementConfig.type === 'html' || elementConfig.type.includes('chart-')">
         <el-button style="float: right" icon="el-icon-check" size="mini" @click="saveJson">保存修改</el-button>
         <div id="jsoneditor2" ref="jsoneditor2" style="height: 300px; width: 100%"></div>

diff --git a/src/component/form-designer/src/WidgetFormItem.vue b/src/component/form-designer/src/WidgetFormItem.vue
@@ -58,7 +58,7 @@
       <el-divider :content-position="element.options.align">{{ element.name }}</el-divider>
     </template>
     <template v-if="element.type === 'button'">
-      <el-button type="primary">{{ element.options.text }}</el-button>
+      <el-button :type="element.options.btnType">{{ element.options.text }}</el-button>
     </template>
     <template v-if="element.type === 'textarea'">
       <el-input

diff --git a/src/component/form-designer/src/componentsConfig.ts b/src/component/form-designer/src/componentsConfig.ts
@@ -437,6 +437,7 @@ export const advanceComponents = [
     options: {
       text: '确认',
       eventName: 'btnCallback',
+      btnType: 'primary',
       hiddenLabel: true,
     },
   },

diff --git a/src/component/pro-form/src/ProFormItem.vue b/src/component/pro-form/src/ProFormItem.vue
@@ -71,7 +71,7 @@
       </el-input>
     </template>
     <template v-if="widget.type == 'button'">
-      <el-button type="primary" @click="btnOnClick(widget)">{{ widget.options.text }}</el-button>
+      <el-button :type="widget.options.btnType" @click="btnOnClick(widget)">{{ widget.options.text }}</el-button>
     </template>
     <template v-if="widget.type == 'text'">
       <h3