Merge branch 'develop' into release-test

lxs
Showing 1 changed file with 5 additions and 5 deletions
src/components/Form/index.vue
--- a/src/components/Form/index.vue
View file @343a5da
+++ b/src/components/Form/index.vue
View file @343a5da
@@ -1124,7 +1124,11 @@ const panelChange = (scope, row) => {
                  <el-form-item
                    v-if="index == (item.inputOptions?.index ?? (item.options.length - 1)) && (item.inputOptions?.visible ?? false)"
                    :prop="item.inputOptions?.field" :class="[item.inputOptions?.col]">
-                    <el-select v-if="item.inputOptions.type == 'select'" v-model="formInline[item.inputOptions?.field]"
+                    <el-input v-if="item.inputOptions.type == 'input'"
+                      v-model.trim="formInline[item.inputOptions?.field]" :placeholder="item.inputOptions?.placeholder"
+                      :disabled="item.inputOptions?.disabled || readonly" :clearable="item.inputOptions?.clearable"
+                      :maxlength="item.inputOptions?.maxlength ?? ''" />
+                    <el-select v-else-if="item.inputOptions.type == 'select'" v-model="formInline[item.inputOptions?.field]"
                      :placeholder="item.inputOptions?.placeholder" :clearable="item.inputOptions?.clearable ?? false"
                      :filterable="item.inputOptions?.filterable ?? false"
                      :disabled="item.inputOptions?.disabled || readonly"
@@ -1141,10 +1145,6 @@ const panelChange = (scope, row) => {
                      type="date" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                      :placeholder="item.inputOptions?.placeholder"
                      :disabled-date="item.inputOptions?.disabledDate ?? ((time) => { return false; })" />
-                    <el-input v-else-if="item.inputOptions.type == 'input'"
-                      v-model.trim="formInline[item.inputOptions?.field]" :placeholder="item.inputOptions?.placeholder"
-                      :disabled="item.inputOptions?.disabled || readonly" :clearable="item.inputOptions?.clearable"
-                      :maxlength="item.inputOptions?.maxlength ?? ''" />
                  </el-form-item>
                </span>
              </template>