Merge pull request #18 from lanyulei/dev

feat: 表单设计器的input支持密码类型输入。Issue #37

src/components/VueFormMaking/components/GenerateFormItem.vue

@@ -60,6 +60,9 @@
           </span>
           </span>
         </el-divider>
         </el-divider>
       </template>
       </template>
+      <template v-if="widget.type === 'input' && widget.options.showPassword">
+        <input :value="dataModel" type="password" style="border: none; background-color: #ffffff; color: #303133" disabled="disabled">
+      </template>
       <template v-else>
       <template v-else>
         <div>
         <div>
           {{ dataModel }}
           {{ dataModel }}
@@ -75,6 +78,7 @@
           :placeholder="widget.options.placeholder"
           :placeholder="widget.options.placeholder"
           :style="{width: widget.options.width}"
           :style="{width: widget.options.width}"
           :disabled="widget.options.disabled"
           :disabled="widget.options.disabled"
+          :show-password="widget.options.showPassword"
         />
         />
         <el-input
         <el-input
           v-else
           v-else
@@ -83,6 +87,7 @@
           :disabled="widget.options.disabled"
           :disabled="widget.options.disabled"
           :placeholder="widget.options.placeholder"
           :placeholder="widget.options.placeholder"
           :style="{width: widget.options.width}"
           :style="{width: widget.options.width}"
+          :show-password="widget.options.showPassword"
         />
         />
       </template>
       </template>
 
 

src/components/VueFormMaking/components/WidgetConfig.vue

@@ -390,6 +390,7 @@
         <el-form-item :label="$t('fm.config.widget.attribute')">
         <el-form-item :label="$t('fm.config.widget.attribute')">
           <el-checkbox v-if="Object.keys(data.options).indexOf('readonly')>=0" v-model="data.options.readonly">{{ $t('fm.config.widget.readonly') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('readonly')>=0" v-model="data.options.readonly">{{ $t('fm.config.widget.readonly') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('disabled')>=0" v-model="data.options.disabled">{{ $t('fm.config.widget.disabled') }}	</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('disabled')>=0" v-model="data.options.disabled">{{ $t('fm.config.widget.disabled') }}	</el-checkbox>
+          <el-checkbox v-if="Object.keys(data.options).indexOf('showPassword')>=0" v-model="data.options.showPassword">{{ $t('fm.config.widget.showPassword') }}	</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('editable')>=0" v-model="data.options.editable">{{ $t('fm.config.widget.editable') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('editable')>=0" v-model="data.options.editable">{{ $t('fm.config.widget.editable') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('clearable')>=0" v-model="data.options.clearable">{{ $t('fm.config.widget.clearable') }} </el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('clearable')>=0" v-model="data.options.clearable">{{ $t('fm.config.widget.clearable') }} </el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('arrowControl')>=0" v-model="data.options.arrowControl">{{ $t('fm.config.widget.arrowControl') }}</el-checkbox>
           <el-checkbox v-if="Object.keys(data.options).indexOf('arrowControl')>=0" v-model="data.options.arrowControl">{{ $t('fm.config.widget.arrowControl') }}</el-checkbox>

src/components/VueFormMaking/components/componentsConfig.js

@@ -10,6 +10,7 @@ export const basicComponents = [
       pattern: '',
       pattern: '',
       placeholder: '',
       placeholder: '',
       disabled: false,
       disabled: false,
+      showPassword: false,
       labelWidth: 100,
       labelWidth: 100,
       labelWidthDisabled: false,
       labelWidthDisabled: false,
       labelWidthStatus: true
       labelWidthStatus: true

src/components/VueFormMaking/lang/zh-CN.js

@@ -166,7 +166,7 @@ export default {
         arrowControl: '使用箭头进行时间选择',
         arrowControl: '使用箭头进行时间选择',
         isDelete: '删除',
         isDelete: '删除',
         isEdit: '编辑',
         isEdit: '编辑',
-        showPassword: '显示密码',
+        showPassword: '密码',
         validate: '校验',
         validate: '校验',
         required: '必填',
         required: '必填',
         patternPlaceholder: '填写正则表达式',
         patternPlaceholder: '填写正则表达式',

src/views/process/list/handle.vue

@@ -64,7 +64,7 @@
           <fm-generate-form
           <fm-generate-form
             v-show="currentNode.hideTpls===undefined ||
             v-show="currentNode.hideTpls===undefined ||
               currentNode.hideTpls===null ||
               currentNode.hideTpls===null ||
-              currentNode.hideTpls.indexOf(tplItem.id)===-1"
+              currentNode.hideTpls.indexOf(tplItem.form_structure.id)===-1"
             :key="tplIndex"
             :key="tplIndex"
             :ref="'generateForm-'+tplItem.id"
             :ref="'generateForm-'+tplItem.id"
             :preview="currentNode.writeTpls===undefined ||
             :preview="currentNode.writeTpls===undefined ||