n20-common-lib 3.2.37 → 3.2.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "3.2.37",
+  "version": "3.2.39",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/assets/css/secondary-tab.scss

@@ -11,6 +11,7 @@
     height: 27px;
     line-height: 26px;
     padding: 0 10px;
+
     &.is-active {
       font-weight: 500;
       &::after {

package/src/assets/css/v3/footer.scss

@@ -6,17 +6,23 @@
   background: $--color-white;
   justify-content: space-between;
 
+  .n20-page-footer-left,
+  .n20-page-footer-center,
+  .n20-page-footer-right {
+    flex: 1 1 auto;
+    min-width: 0;
+    display: flex;
+  }
+
   .n20-page-footer-left {
-    flex: 1;
+    justify-content: flex-start;
   }
 
   .n20-page-footer-center {
+    justify-content: center;
   }
 
   .n20-page-footer-right {
-    flex: 1;
-    width: 0;
-    display: flex;
     justify-content: flex-end;
   }
 }

package/src/assets/css/v3/secondary-tab.scss

@@ -20,11 +20,11 @@
     }
     .el-tabs__item {
       font-weight: 400;
+      color: $--color-text-regular;
       // height: 27px;
       font-family: 'PingFang SC';
       font-size: 14px;
       font-style: normal;
-      font-weight: 500;
       line-height: 26px;
       padding: 9px 16px;
 
@@ -35,7 +35,7 @@
           height: 2px;
           background-color: $--color-primary;
           display: block;
-          margin-top: 4px;
+          margin-top: 2px;
         }
       }
       &.is-disabled {
@@ -104,7 +104,9 @@
   line-height: 22px !important;
   padding: 8px 12px !important;
   border-radius: 4px !important;
-  box-shadow: 0 6px 16px -8px rgba(0, 0, 0, 0.08), 0 9px 28px 0 rgba(0, 0, 0, 0.05),
+  box-shadow:
+    0 6px 16px -8px rgba(0, 0, 0, 0.08),
+    0 9px 28px 0 rgba(0, 0, 0, 0.05),
     0 12px 48px 16px rgba(0, 0, 0, 0.03) !important;
   border: none !important;
 

package/src/components/MdmSelect/index.vue

@@ -0,0 +1,179 @@
+<template>
+  <el-select
+    :value="value"
+    v-bind="computedAttrs"
+    :loading="loading"
+    v-on="computedListeners"
+    @input="handleInput"
+    @change="handleChange"
+  >
+    <el-option
+      v-for="option in options"
+      :key="`${type}-${option.code}`"
+      :label="getOptionLabel(option)"
+      :value="option.code"
+    />
+  </el-select>
+</template>
+
+<script>
+import { $lc } from '../../utils/i18n/index'
+
+const TYPE_CASH_FLOW_DIRECTION = 'cashFlowDirection'
+const TYPE_PAYMENT_CATEGORY = 'paymentCategory'
+const TYPE_PAY_BANK = 'payBank'
+const VALID_TYPES = [TYPE_CASH_FLOW_DIRECTION, TYPE_PAYMENT_CATEGORY, TYPE_PAY_BANK]
+const VALID_LABEL_MODES = ['value', 'code-value']
+
+export default {
+  name: 'MdmSelect',
+  inheritAttrs: false,
+  props: {
+    value: {
+      type: [String, Number],
+      default: undefined
+    },
+    type: {
+      type: String,
+      required: true,
+      validator(value) {
+        return VALID_TYPES.includes(value)
+      }
+    },
+    labelMode: {
+      type: String,
+      default: 'value',
+      validator(value) {
+        return VALID_LABEL_MODES.includes(value)
+      }
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      options: [],
+      requestSequence: 0
+    }
+  },
+  computed: {
+    computedAttrs() {
+      const attrs = Object.assign({}, this.$attrs)
+      delete attrs.loading
+      delete attrs.multiple
+      return Object.assign(
+        {
+          clearable: true,
+          filterable: true,
+          placeholder: $lc('请选择')
+        },
+        attrs
+      )
+    },
+    computedListeners() {
+      const listeners = Object.assign({}, this.$listeners)
+      delete listeners.input
+      delete listeners.change
+      delete listeners['load-error']
+      return listeners
+    }
+  },
+  watch: {
+    type(newValue, oldValue) {
+      if (newValue === oldValue) return
+      this.$emit('input', undefined)
+      this.$emit('change', undefined)
+      this.loadOptions()
+    }
+  },
+  created() {
+    this.loadOptions()
+  },
+  beforeDestroy() {
+    this.requestSequence += 1
+  },
+  methods: {
+    handleInput(value) {
+      this.$emit('input', value)
+    },
+    handleChange(value) {
+      this.$emit('change', value)
+    },
+    getOptionLabel(option) {
+      if (this.labelMode === 'code-value') {
+        if (this.type === TYPE_CASH_FLOW_DIRECTION) {
+          return `${option.label}（${option.code}）`
+        }
+        return `${option.code} - ${option.label}`
+      }
+      return option.label
+    },
+    getPaymentCategoryOptions() {
+      return [
+        { code: 1, label: $lc('收入'), raw: { label: '收入', value: 1 } },
+        { code: 0, label: $lc('支出'), raw: { label: '支出', value: 0 } },
+        { code: 2, label: $lc('净额'), raw: { label: '净额', value: 2 } }
+      ]
+    },
+    normalizeResponse(response) {
+      if (Array.isArray(response)) return response
+      if (response && Array.isArray(response.data)) return response.data
+      if (response && response.data && Array.isArray(response.data.list)) {
+        return response.data.list
+      }
+      if (response && Array.isArray(response.list)) return response.list
+      return []
+    },
+    normalizeOptions(list, codeKey, labelKey) {
+      return list
+        .filter((item) => item && item[codeKey] !== undefined && item[codeKey] !== null)
+        .map((item) => ({
+          code: item[codeKey],
+          label: item[labelKey] === undefined || item[labelKey] === null ? '' : item[labelKey],
+          raw: item
+        }))
+    },
+    async loadOptions() {
+      const requestSequence = ++this.requestSequence
+      this.options = []
+
+      if (this.type === TYPE_PAYMENT_CATEGORY) {
+        this.loading = false
+        this.options = this.getPaymentCategoryOptions()
+        return
+      }
+
+      this.loading = true
+      try {
+        let response
+        let codeKey
+        let labelKey
+
+        if (this.type === TYPE_CASH_FLOW_DIRECTION) {
+          response = await this.$axios.get(
+            '/bems/1.0/cashflow/fieldinfo/MDM_G_CASHFLOWflowDir',
+            {},
+            { loading: false, noMsg: true }
+          )
+          codeKey = 'dbdata'
+          labelKey = 'otherdata'
+        } else if (this.type === TYPE_PAY_BANK) {
+          response = await this.$axios.get('/bems/1.0/bank', { isEnable: 1 }, { loading: false, noMsg: true })
+          codeKey = 'bankNo'
+          labelKey = 'bankName'
+        }
+
+        if (requestSequence !== this.requestSequence) return
+        this.options = this.normalizeOptions(this.normalizeResponse(response), codeKey, labelKey)
+      } catch (error) {
+        if (requestSequence !== this.requestSequence) return
+        this.options = []
+        this.$emit('load-error', error)
+      } finally {
+        if (requestSequence === this.requestSequence) {
+          this.loading = false
+        }
+      }
+    }
+  }
+}
+</script>

package/src/i18n.json

@@ -3550,6 +3550,27 @@
     "th": "ไม่ทำการรีรันด้วยขั้นตอนเดิม",
     "vi": "Không làm lại quy trình"
   },
+  "收入": {
+    "en": "Inflow",
+    "th": "ไหลเข้า",
+    "vi": "Dòng vào",
+    "ja": "流入",
+    "zh-hk": "收入"
+  },
+  "支出": {
+    "en": "Outflow",
+    "th": "ไหลออก",
+    "vi": "Dòng chảy ra",
+    "ja": "流出",
+    "zh-hk": "支出"
+  },
+  "净额": {
+    "en": "Net Amount",
+    "th": "จำนวนเงินสุทธิ",
+    "vi": "Số tiền ròng",
+    "ja": "正味金額",
+    "zh-hk": "淨額"
+  },
   "此模式下被回退节点提交后将绕过中间已办节点，造成流程不严谨，谨慎使用！": {
     "en": "This mode will bypass the middle nodes that have been completed after the node is returned, causing the process to be non-standard. Use with caution!",
     "th": "เมื่อมีการย้อนกลับไปยังโครงการที่มีการเสร็จสิ้นแล้ว จะทำให้โครงการไม่สมบูรณ์ โปรดใช้ด้วยระวัง!",

package/src/index.js

@@ -85,6 +85,7 @@ import InputAccount from './components/InputAccount/index.vue'
 import InputNumber from './components/InputNumber/index.vue'
 import InputNumberRange from './components/InputNumber/numberRange.vue'
 import InputSearch from './components/InputSearch/index.vue'
+import MdmSelect from './components/MdmSelect/index.vue'
 import NavMenu from './components/NavMenu/index.vue'
 import operatingStatus from './components/operatingStatus/index.vue'
 import PageHeader from './components/PageHeader/index.vue'
@@ -202,6 +203,7 @@ const components = [
   InputAccount,
   InputNumber,
   InputNumberRange,
+  MdmSelect,
   TimePicker,
   DatePicker,
   DatePickerPor,
@@ -400,6 +402,7 @@ export {
   InputNumber,
   InputNumberRange,
   InputSearch,
+  MdmSelect,
   ViewToggle,
   N,
   NavMenu,