n20-common-lib 3.3.10 → 3.3.12

package/package.json

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

package/src/components/AdvancedFilter/formItemRender.vue

@@ -104,8 +104,8 @@ export default {
     let typeEnum = (type) => {
       switch (type) {
         case 'text':
+        case 'input':
         case 'number':
-        case 'text':
         case 'numberrange':
           return $lc('请输入')
         case 'select':
@@ -369,6 +369,7 @@ export default {
     switch (item.type) {
       case 'search':
       case 'text':
+      case 'input':
         elementDom = h(
           'el-input',
           {
@@ -802,8 +803,9 @@ export default {
         elementDom = h('el-input', {
           attrs: {
             style: {
-              width: calcTextWidth(item.label, form[item.value])
+              width: calcTextWidth(item, form[item.value])
             },
+            title: form[item.value],
             ruleField: true,
             'rule-form': 'ruleValidate',
             rules: item.rules,
@@ -812,32 +814,28 @@ export default {
             maxlength: item.props && item.props.maxlength,
             minlength: item.props && item.props.minlength
           },
-          on: {
-            blur: this.handleBlur,
-            clear: this.handleClear
-          },
           directives: [
             {
               name: 'rule-key'
             }
           ],
           props: {
-            rules: item.rules,
-            clearable: (item.props && item.props.clearable) ?? true
-          },
-          domProps: {
-            value: form[item.value]
+            clearable: (item.props && item.props.clearable) ?? true,
+            ...item.props
           },
           model: {
             value: form[item.value],
             callback: (value) => {
               this.$set(form, item.value, value)
+              this.handleChange(value)
             }
           },
+          on: {
+            blur: this.handleBlur,
+            clear: this.handleClear,
+            ...item.on
+          },
           nativeOn: {
-            input: (event) => {
-              form[item.value] = event.target.value
-            },
             keyup
           }
         })

package/src/components/AdvancedFilter/index.vue

@@ -464,6 +464,7 @@ export default {
           this.$set(this.model, item.value, item.multiple ? [] : null)
           break
         case 'text':
+        case 'input':
         case 'search':
         case 'number':
         case 'date':

package/src/components/Filters/form-item-input.vue

@@ -1,6 +1,6 @@
 <template>
   <el-input
-    v-if="item.type === 'text' || item.type === undefined"
+    v-if="item.type === 'text' || item.type === 'input' || item.type === undefined"
     v-model="form[item.value]"
     :clearable="item | clearableF"
     style="width: 100%"

package/src/utils/auth.js

@@ -52,7 +52,15 @@ const auth = {
     }
   },
   setReqLang() {
-    let langMap = { 'zh-cn': 'zh_CN', en: 'en_US', 'zh-hk': 'zh_TW', th: 'th_TH', vi: 'vi_VI', ja: 'ja_JP', es: 'es_ES' }
+    let langMap = {
+      'zh-cn': 'zh_CN',
+      en: 'en_US',
+      'zh-hk': 'zh_TW',
+      th: 'th_TH',
+      vi: 'vi_VN',
+      ja: 'ja_JP',
+      es: 'es_ES'
+    }
     let langKey = window.localStorage.getItem('pageLang') || 'zh-cn'
     reqLang = langMap[langKey]
   },