@logwire/logwire-wms-pda-ui 1.1.19 → 1.2.0

package/src/components/ui/CellPopupDate/index.vue

@@ -1,167 +1,212 @@
-<!--
-  单元行加时间选择器
-  @author: 张文
-  @date: 2022-03-30
--->
-<template>
-  <div>
-    <lw-cell
-      v-model="val"
-      :title="title || $lwLanguage.get('wms_project.pda.component.cellPopupDate.date','日期')"
-      :is-edit="!disabled"
-      :is-link="!disabled"
-      :placeholder="placeholder"
-      :required="required"
-      :name="name"
-      :border="border"
-      @click="cellClick"
-      @clear="$emit('clear')"
-    />
-
-    <lw-popup
-      v-model="show"
-      height="auto"
-      :title="dateTitle || (title || $lwLanguage.get('wms_project.pda.component.cellPopupDate.date','日期'))"
-    >
-
-      <van-datetime-picker
-        ref="date"
-        v-model="dateValue"
-        :type="type"
-        :show-toolbar="false"
-        :filter="filter"
-        :min-hour="minHour"
-        :max-hour="maxHour"
-        :min-minute="minMinute"
-        :max-minute="maxMinute"
-        visible-item-count="3"
-        @confirm="dateConfirm"
-      />
-
-      <template #button>
-        <lw-button
-          @click="confirm"
-        >{{ $lwLanguage.get('wms_project.pda.common.confirm', '确定') }}</lw-button>
-      </template>
-    </lw-popup>
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "lwCellPopupDate",
-  props:{
-    // 标题
-    title: String,
-    // 是否可禁用
-    disabled:{
-      type: Boolean,
-      default: false
-    },
-    // 绑定的值
-    value:{
-      type: String,
-      default: ''
-    },
-    // 占位提示
-    placeholder:String,
-    // 是否显示必填星号
-    required: Boolean,
-    // 表单提交时的键值
-    name: String,
-    // 是否显示下边框
-    border: {
-      type: Boolean,
-      default: true
-    },
-
-    // 时间类型
-    type:{
-      type: String,
-      default: 'date'
-    },
-    // 时间选择器弹出框标题
-    dateTitle: String,
-    // 时间回显的格式
-    format: String,
-
-    // type=time时生效
-    minHour:{
-      type: [String,Number],
-      default: 0
-    },
-    maxHour:{
-      type: [String,Number],
-      default: 23
-    },
-    minMinute:{
-      type: [String,Number],
-      default: 0
-    },
-    maxMinute:{
-      type: [String,Number],
-      default: 59
-    },
-    // 选项过滤函数
-    filter: {
-      type: Function,
-      default: (type, val) =>{
-        return val
-      }
-    }
-
-  },
-  computed:{
-    val:{
-      get(){
-        return this.value
-      },
-      set(v){
-        this.$emit('input', v)
-      }
-    }
-  },
-  data() {
-    return {
-      show: false,
-      dateValue:'',
-      formatInit:{
-        'date': 'yyyy-MM-dd',
-        'year-month': 'yyyy-MM',
-        'month-day': 'MM-dd',
-        'datehour': 'yyyy-MM-dd hh',
-        'datetime': 'yyyy-MM-dd hh:mm'
-      }
-    }
-  },
-  methods: {
-    // 行点击
-    cellClick(){
-      this.show = true
-
-      if (this.type === 'time'){
-        this.dateValue = this.val
-      }else {
-        this.dateValue = this.val ? new Date(this.val) : new Date()
-      }
-    },
-
-    // 弹窗口确定按钮
-    confirm(){
-      this.$refs.date.getPicker().confirm()
-    },
-    // 获取当前选中的值
-    dateConfirm(v){
-      const date = this.type === 'time' ? v : this.$lwDate.format(v, this.format || this.formatInit[this.type])
-      this.val = date
-      this.$emit('confirm', date, v)
-      this.show = false
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  单元行加时间选择器
+  @author: 张文
+  @date: 2022-03-30
+-->
+<template>
+  <div>
+    <lw-cell
+      v-model="showVal"
+      :title="title || $lwLanguage.get('wms_project.pda.component.cellPopupDate.date','日期')"
+      :is-edit="!disabled"
+      :is-link="!disabled"
+      :placeholder="placeholder"
+      :required="required"
+      :name="name"
+      :border="border"
+      @click="cellClick"
+      @clear="$emit('clear')"
+    />
+
+    <lw-popup
+      v-model="show"
+      height="auto"
+      :title="dateTitle || (title || $lwLanguage.get('wms_project.pda.component.cellPopupDate.date','日期'))"
+    >
+
+      <van-datetime-picker
+        ref="date"
+        v-model="dateValue"
+        :type="type"
+        :show-toolbar="false"
+        :filter="filter"
+        :min-hour="minHour"
+        :max-hour="maxHour"
+        :min-minute="minMinute"
+        :max-minute="maxMinute"
+        visible-item-count="3"
+        @confirm="dateConfirm"
+      />
+
+      <template #button>
+        <lw-button
+          @click="confirm"
+        >{{ $lwLanguage.get('wms_project.pda.common.confirm', '确定') }}</lw-button>
+      </template>
+    </lw-popup>
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwCellPopupDate",
+  props:{
+    // 标题
+    title: String,
+    // 是否可禁用
+    disabled:{
+      type: Boolean,
+      default: false
+    },
+    // 绑定的值
+    value:{
+      type: String,
+      default: ''
+    },
+    // 占位提示
+    placeholder:String,
+    // 是否显示必填星号
+    required: Boolean,
+    // 表单提交时的键值
+    name: String,
+    // 是否显示下边框
+    border: {
+      type: Boolean,
+      default: true
+    },
+
+    // 时间类型
+    type:{
+      type: String,
+      default: 'date'
+    },
+    // 时间选择器弹出框标题
+    dateTitle: String,
+    // 时间回显的格式
+    format: String,
+
+    // type=time时生效
+    minHour:{
+      type: [String,Number],
+      default: 0
+    },
+    maxHour:{
+      type: [String,Number],
+      default: 23
+    },
+    minMinute:{
+      type: [String,Number],
+      default: 0
+    },
+    maxMinute:{
+      type: [String,Number],
+      default: 59
+    },
+    // 选项过滤函数
+    filter: {
+      type: Function,
+      default: (type, val) =>{
+        return val
+      }
+    },
+
+  },
+  computed:{
+    val:{
+      get(){
+        return this.value
+      },
+      set(v){
+        this.$emit('input', v)
+      }
+    },
+    showVal(){
+      if (this.val){
+
+        return this.$lwTimezone.UTCToTimezone({
+          date: this.val,
+          format: this.format || this.formatInit[this.formatType]
+        })
+      }
+
+      return ''
+
+    }
+  },
+  data() {
+    return {
+      show: false,
+      dateValue:'',
+      formatInit:{
+        'date': 'yyyy-MM-dd',
+        /*'year-month': 'yyyy-MM',
+        'month-day': 'MM-dd',*/
+        'datehour': 'yyyy-MM-dd hh',
+        'datetime': 'yyyy-MM-dd hh:mm',
+        time: 'hh:mm'
+      },
+      formatType: ''
+    }
+  },
+  mounted() {
+    if (!this.formatInit[this.type]){
+      console.error('使用【时间选择组件】时，传入的type类型为组件不支持的类型，请修改！！！为保证组件的正常加载已默认将类型修改为【date】')
+      this.formatType = 'date'
+    }else {
+      this.formatType = this.type
+    }
+  },
+  methods: {
+    // 行点击
+    cellClick(){
+
+      this.show = true
+
+      if (this.formatType === 'time'){
+        this.dateValue = this.showVal
+        return
+      }
+
+      this.dateValue = this.showVal ? new Date(this.showVal) : new Date()
+    },
+
+    // 弹窗口确定按钮
+    confirm(){
+      this.$refs.date.getPicker().confirm()
+    },
+    // 获取当前选中的值
+    dateConfirm(val){
+
+      let v = val
+      if (this.formatType === 'time'){
+        v = this.$lwDate.format(new Date()) + ' ' + v + ':00'
+      }else {
+        v = this.$lwDate.format(val,this.formatInit[this.formatType])
+
+
+        if (this.formatType === 'datehour'){
+          v = v + ':00:00'
+        }
+
+        if (this.formatType === 'date'){
+          v = v + ' 00:00:00'
+        }
+      }
+
+      const date = this.$lwTimezone.timezoneToUTC({
+        date: v
+      })
+      this.val = date
+
+
+      this.$emit('confirm', date, v)
+      this.show = false
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/ui/CellPopupRadio/index.vue

@@ -1,136 +1,136 @@
-<!--
-  行加单选弹出框
-  @author: 张文
-  @date: 2022-03-09
--->
-<template>
-  <div>
-    <lw-cell
-      :title="title"
-      v-model="label"
-      :form-value.sync="val"
-      :submit-value="false"
-      :placeholder="placeholder"
-      :is-link="!disabled"
-      :required="required"
-      :name="name"
-      :is-edit="!disabled"
-      :border="border"
-      @click="showPopup = true"
-      @clear="$emit('clear')"
-    />
-
-    <lw-popup-radio
-      v-model="showPopup"
-      :title="popupTitle || title"
-      :columns="columns"
-      :dict-key="dictKey"
-      :label-key="labelKey"
-      :value-key="valueKey"
-      @confirm="popupConfirm"
-    />
-  </div>
-</template>
-
-<script>
-
-export default {
-  name: "lwCellPopupRadio",
-  props:{
-    // 递交的初始数据
-    value: String,
-    // 行的title
-    title: String,
-    // 行占位提示文字
-    placeholder: String,
-    // 是否禁用
-    disabled:{
-      type: Boolean,
-      default: false
-    },
-    // 是否显示必填星号
-    required:{
-      type: Boolean,
-      default: false
-    },
-    // 表单提交时的key
-    name:String,
-    // 是否显示下边框
-    border:{
-      type:Boolean,
-      default: true
-    },
-
-
-
-    // 弹框的title
-    popupTitle: String,
-    // 提供选择的数据
-    columns: Array,
-    // 取值字典时的key
-    dictKey: String,
-    // 单选显示的值的key
-    labelKey: {
-      type:String,
-      default: 'label'
-    },
-    // 单选选中的值的key
-    valueKey: {
-      type: String,
-      default: 'value'
-    },
-  },
-  computed:{
-    val:{
-      get(){
-        return this.value
-      },
-      set(v){
-        this.$emit('input', v)
-      }
-    },
-    // 右侧显示的数据
-    label:{
-      get(){
-        if (!this.val) return ''
-
-        if (this.columns) return this.getLabel(this.columns)
-
-        const list = this.dictKey && this.$lwDict.get(this.dictKey)
-        if (Array.isArray(list)) return this.getLabel(list)
-
-        return this.val
-      },
-      set() {}
-    }
-  },
-  data() {
-    return {
-      // 显示弹出层
-      showPopup: false,
-    }
-  },
-  methods: {
-    // 获取label的显示值
-    getLabel(arr=[]){
-      for (let i = 0; i < arr.length; i++) {
-        if(arr[i][this.valueKey] === this.val){
-          return arr[i][this.labelKey]
-        }
-      }
-      return ''
-    },
-
-    // 弹出层点击确定
-    popupConfirm(item){
-      this.label = item[this.labelKey]
-      this.val = item[this.valueKey]
-      this.$emit('confirm', item)
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-
-</style>
+<!--
+  行加单选弹出框
+  @author: 张文
+  @date: 2022-03-09
+-->
+<template>
+  <div>
+    <lw-cell
+      :title="title"
+      v-model="label"
+      :form-value.sync="val"
+      :submit-value="false"
+      :placeholder="placeholder"
+      :is-link="!disabled"
+      :required="required"
+      :name="name"
+      :is-edit="!disabled"
+      :border="border"
+      @click="showPopup = true"
+      @clear="$emit('clear')"
+    />
+
+    <lw-popup-radio
+      v-model="showPopup"
+      :title="popupTitle || title"
+      :columns="columns"
+      :dict-key="dictKey"
+      :label-key="labelKey"
+      :value-key="valueKey"
+      @confirm="popupConfirm"
+    />
+  </div>
+</template>
+
+<script>
+
+export default {
+  name: "lwCellPopupRadio",
+  props:{
+    // 递交的初始数据
+    value: String,
+    // 行的title
+    title: String,
+    // 行占位提示文字
+    placeholder: String,
+    // 是否禁用
+    disabled:{
+      type: Boolean,
+      default: false
+    },
+    // 是否显示必填星号
+    required:{
+      type: Boolean,
+      default: false
+    },
+    // 表单提交时的key
+    name:String,
+    // 是否显示下边框
+    border:{
+      type:Boolean,
+      default: true
+    },
+
+
+
+    // 弹框的title
+    popupTitle: String,
+    // 提供选择的数据
+    columns: Array,
+    // 取值字典时的key
+    dictKey: String,
+    // 单选显示的值的key
+    labelKey: {
+      type:String,
+      default: 'label'
+    },
+    // 单选选中的值的key
+    valueKey: {
+      type: String,
+      default: 'value'
+    },
+  },
+  computed:{
+    val:{
+      get(){
+        return this.value
+      },
+      set(v){
+        this.$emit('input', v)
+      }
+    },
+    // 右侧显示的数据
+    label:{
+      get(){
+        if (!this.val) return ''
+
+        if (this.columns) return this.getLabel(this.columns)
+
+        const list = this.dictKey && this.$lwDict.get(this.dictKey)
+        if (Array.isArray(list)) return this.getLabel(list)
+
+        return this.val
+      },
+      set() {}
+    }
+  },
+  data() {
+    return {
+      // 显示弹出层
+      showPopup: false,
+    }
+  },
+  methods: {
+    // 获取label的显示值
+    getLabel(arr=[]){
+      for (let i = 0; i < arr.length; i++) {
+        if(arr[i][this.valueKey] === this.val){
+          return arr[i][this.labelKey]
+        }
+      }
+      return ''
+    },
+
+    // 弹出层点击确定
+    popupConfirm(item){
+      this.label = item[this.labelKey]
+      this.val = item[this.valueKey]
+      this.$emit('confirm', item)
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+
+</style>

package/src/components/ui/CutCard/index.vue

@@ -65,6 +65,17 @@ export default {
       }
     }
   },
+  watch:{
+    length:{
+      handler(n){
+        if (n < (this.index + 1)) this.index = n-1
+        if (n === 0) this.index = 0
+        this.cutEnd()
+      },
+      immediate:true,
+      deep:true
+    }
+  },
   data() {
     return {}
   },