t20-common-lib 0.15.20 → 0.15.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "t20-common-lib",
-  "version": "0.15.20",
+  "version": "0.15.22",
   "description": "T20",
   "private": false,
   "main": "dist/index.js",

package/packages/dynamic-form/mixins/fileUpload.js

@@ -18,7 +18,7 @@ export const fileUploadTableMixin = {
   data() {
     return {
       fileUploadTableData: [],
-      fileAction: () => {},
+      fileAction: '/api/neams/eamsbaserecord/save',
       seeTypes: /\.(jpg|png|gif|svg|pdf|swf|xlsx|xls|docx|doc)$/i,
       dataPorp: {
         fileAccept: '.rar,.zip,.doc,.docx,.pdf,image/*,.xls,.xlsx',
@@ -93,15 +93,16 @@ export const fileUploadTableMixin = {
       const { file } = options
       const data = new FormData()
       data.append('file', file)
+      const uploadParam = this.uploadParam || {}
       data.append(
         'data',
         JSON.stringify({
-          syscode: this.uploadParam.syscode,
-          appno: this.uploadParam.appno,
+          syscode: uploadParam.syscode,
+          appno: uploadParam.appno,
           bussValue: this.mapdata[row.type],
           attno: row.type,
           bussId:
-            this.uploadParam && this.uploadParam.paymentTemplate === 'REQUEST_PAYOUT' ? '' : this.uploadParam.bussId,
+            uploadParam && uploadParam.paymentTemplate === 'REQUEST_PAYOUT' ? '' : uploadParam.bussId,
           cltno: JSON.parse(sessionStorage.getItem('userInfo') || '{}').cltNo,
           memo: file.name,
           recordname: file.name,

package/packages/dynamic-form/src/components/Amount.vue

@@ -58,7 +58,7 @@ export default {
   watch: {},
   methods: {
     changeFn(val) {
-      this.$emit('change', val)
+      this.$emit('change')
     }
   }
 }

package/packages/dynamic-form/src/components/AmountRange.vue

@@ -51,9 +51,7 @@ export default {
         return "";
       },
       set(val) {
-        const nextValue = `${val},${this._value2 || this._value2===0?this._value2 : ''}`;
-        this.$emit("input", nextValue);
-        this.$emit("change", nextValue);
+        this.$emit("input", `${val},${this._value2 || this._value2===0?this._value2 : ''}`);
       },
     },
     _value2: {
@@ -64,9 +62,7 @@ export default {
         return "";
       },
       set(val) {
-        const nextValue = `${this._value1},${val || val===0?val : ''}`;
-        this.$emit("input", nextValue);
-        this.$emit("change", nextValue);
+        this.$emit("input", `${this._value1},${val || val===0?val : ''}`);
       },
     },
   },

package/packages/dynamic-form/src/components/CheckboxGroup.vue

@@ -51,7 +51,6 @@ export default {
       set(value) {
         this.changeTime(value);
         this.$emit("input", value || []);
-        this.$emit("change", value || []);
       },
     },
   },

package/packages/dynamic-form/src/components/DMY.vue

@@ -79,9 +79,7 @@ export default {
         return "";
       },
       set(val) {
-        const nextValue = `${val}${this.value2}`;
-        this.$emit("input", nextValue);
-        this.$emit("change", nextValue);
+        this.$emit("input", `${val}${this.value2}`);
       },
     },
     value2: {
@@ -94,9 +92,7 @@ export default {
         return "D";
       },
       set(val) {
-        const nextValue = `${this.value1}${val}`;
-        this.$emit("input", nextValue);
-        this.$emit("change", nextValue);
+        this.$emit("input", `${this.value1}${val}`);
       },
     },
   },

package/packages/dynamic-form/src/components/Date.vue

@@ -30,7 +30,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

package/packages/dynamic-form/src/components/DateRange.vue

@@ -38,7 +38,6 @@ export default {
   methods: {
     changeTime(val) {
       this.$emit("input", val ? `${val[0]},${val[1]}` : '');
-      this.$emit("change", val ? `${val[0]},${val[1]}` : '');
     },
   },
   watch: {

package/packages/dynamic-form/src/components/Input.vue

@@ -34,7 +34,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

package/packages/dynamic-form/src/components/InputNumber.vue

@@ -30,7 +30,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
     _dNum() {

package/packages/dynamic-form/src/components/InputNumberRange.vue

@@ -24,7 +24,6 @@ export default {
     changeTime() {
       this.$emit("update:label", this.startValue + "~" + this.endValue);
       this.$emit("input", [this.startValue, this.endValue]);
-      this.$emit("change", [this.startValue, this.endValue]);
     },
   },
   watch: {

package/packages/dynamic-form/src/components/RadioGroup.vue

@@ -41,7 +41,6 @@ export default {
         let res = (this.items.options || []).find(row => row.value == value)
         this.$emit(`update:label`, res?.label)
         this.$emit('input', value)
-        this.$emit('change', value)
       }
     },
     _options: {

package/packages/dynamic-form/src/components/Rate.vue

@@ -39,7 +39,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

package/packages/dynamic-form/src/components/Switch.vue

@@ -25,7 +25,6 @@ export default {
       set(value) {
         this.$emit(`update:label`, value==1? this.$l('是'): this.$l('否'));
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

package/packages/dynamic-form/src/components/Textarea.vue

@@ -42,7 +42,6 @@ export default {
       },
       set(value) {
         this.$emit("input", value);
-        this.$emit("change", value);
       },
     },
   },

package/packages/dynamic-form/src/main.vue

@@ -78,8 +78,8 @@
       </N20-anchor-item>
     </N20-anchor>
     <div slot="footer">
-      <el-button type="primary" @click="submit('submit')">{{ $lc('提交') }}</el-button>
-      <el-button @click="submit('save')">{{ $lc('保存') }}</el-button>
+      <el-button type="primary" @click="submit('SUBMIT')">{{ $lc('提交') }}</el-button>
+      <el-button @click="submit('SAVE')">{{ $lc('保存') }}</el-button>
     </div>
   </T20-Form-Page>
 </template>
@@ -95,6 +95,7 @@ const context = require.context('./components/', true, /\.vue$/)
 const demoComponents = {}
 context.keys().forEach(key => {
   const component = context(key).default
+  if (!component || !component.name) return
   demoComponents[component.name] = component
 })
 
@@ -445,10 +446,10 @@ export default {
       })
     },
     // 第一步仅做模板渲染校验，提交逻辑后续步骤再扩展
-    async submit() {
+    async submit(operate) {
       const valid = await this.$refs.dynamicForms.validate()
       if (!valid) return
-      const payload = { formData: this.formData }
+      const payload = { formData: this.formData, operate }
       if (this.needFile) {
         payload.fileUploadTableData = (this.fileUploadTableData || []).filter(t => t.beid)
       }