Merge branch 'develop' into release-test

lxs
Showing 1 changed file with 7 additions and 8 deletions
src/components/Form/index.vue
--- a/src/components/Form/index.vue
View file @c5c8095
+++ b/src/components/Form/index.vue
View file @c5c8095
@@ -1119,16 +1119,11 @@ const panelChange = (scope, row) => {
            <el-radio v-for="(radio, index) in item.options" :label="radio.value">
              <template #default>
                <span :style="{ 'line-height': '32px' }">{{ radio.label }}</span>
-                <span
+                <span :style="{ display: 'inline-flex', width: (index == (item.inputOptions?.index ?? (item.options.length - 1)) && item.inputOptions) ? (item.inputOptions.width ?? '230px') : '0px' }">
-                  :style="{ display: 'inline-flex', width: (index == (item.inputOptions?.index ?? (item.options.length - 1)) && item.inputOptions) ? (item.inputOptions.width ?? '230px') : '0px' }">
                  <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-input v-if="item.inputOptions.type == 'input'"
+                    <el-select v-if="item.inputOptions?.type == 'select'" v-model="formInline[item.inputOptions?.field]"
-                      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"
@@ -1140,11 +1135,15 @@ const panelChange = (scope, row) => {
                        :value="item.inputOptions?.props?.value ? opts[item.inputOptions.props.value] : opts.value"
                        :disabled="opts.disabled" />
                    </el-select>
-                    <el-date-picker v-else-if="item.ipnutOptions.type == 'date'"
+                    <el-date-picker v-else-if="item.ipnutOptions?.type == 'date'"
                      :disabled="item.inputOptions?.disabled || readonly" v-model="formInline[item.inputOptions?.field]"
                      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>