xs-common-plugins 1.3.2 → 1.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/package.json +1 -1
  2. package/src/common/common.js +1 -1
  3. package/src/components/Search/index.vue +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "xs-common-plugins",
3
- "version": "1.3.2",
3
+ "version": "1.3.4",
4
4
  "private": false,
5
5
  "description": "向上公共代码部分",
6
6
  "author": "祝玲云 <1902733517@qq.com>",
package/src/common/common.js CHANGED
@@ -321,7 +321,7 @@ common.popup = (options) => {
321
321
  <div>
322
322
  <el-dialog :title="title" v-el-drag-dialog :visible.sync="visible" :width="width" :before-close="beforeClose" v-bind="dialogCfg" append-to-body>
323
323
  <child ref="child" :srcData="srcData" v-bind="props" @close="close" @cancel="cancel"/>
324
- <div v-if="showButton" style="text-align: right;">
324
+ <div v-if="showButton" style="text-align: right;margin-top: 10px">
325
325
  <el-button size="medium" type="primary" @click="confirm">确认</el-button>
326
326
  <el-button size="medium" @click="cancel">取消</el-button>
327
327
  </div>
package/src/components/Search/index.vue CHANGED
@@ -93,7 +93,7 @@
93
93
  <!--单选联级选择-->
94
94
  <el-form-item :label="optionItem.displayName" v-if="optionItem.conditionType === $enum.conditionType.datePicker" :style="{ width: optionItem.itemWidth }" class="dateRange">
95
95
  <el-date-picker clearable v-model="inputValue[optionItem.fieldName]" v-if="optionItem.dataSourceType == 0" type="date" align="right" unlink-panels :placeholder="optionItem.defaultValue" value-format="yyyy-MM-dd"></el-date-picker>
96
- <el-date-picker clearable v-model="inputValue[optionItem.fieldName]" v-else-if="optionItem.dataSourceType == 'month'" type="month" align="right" unlink-panels :placeholder="optionItem.defaultValue" value-format="yyyy-MM"></el-date-picker>
96
+ <el-date-picker clearable v-model="inputValue[optionItem.fieldName]" v-else-if="optionItem.dataSourceType == 'month'" type="month" align="right" unlink-panels :placeholder="optionItem.defaultValue" value-format="yyyy-MM-dd"></el-date-picker>
97
97
  <!-- 时间选择器-->
98
98
  <el-date-picker v-else clearable v-model="inputValue[optionItem.fieldName]" type="daterange" align="right" unlink-panels range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" value-format="yyyy-MM-dd" style="position:relative;top:-1px"></el-date-picker>
99
99
  <!-- :value-format="optionItem.config?optionItem.config.timeFrom:'yyyy-MM-DD'" -->