vue2-client 1.10.10 → 1.10.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.10.10",
+  "version": "1.10.11",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/Upload/Upload.vue

@@ -1,17 +1,24 @@
 <template>
   <div>
-    <a-upload
-      v-if="uploadStyle === 'simple'"
-      :accept="model.accept?.join('')"
-      :customRequest="uploadFiles"
-      :multiple="model.acceptCount && model.acceptCount>1"
-      :file-list="uploadedFileList"
-      :remove="deleteFileItem">
-      <a-button style="margin-top: 2%">
-        <a-icon type="upload"/>
-        上传
-      </a-button>
-    </a-upload>
+    <template v-if="uploadStyle === 'simple'">
+      <a-space>
+        <a-upload
+          :accept="model.accept?.join('')"
+          :customRequest="uploadFiles"
+          :multiple="model.acceptCount && model.acceptCount>1"
+          :file-list="uploadedFileList"
+          :remove="deleteFileItem">
+          <a-button style="margin-top: 2%">
+            <a-icon type="upload"/>
+            上传
+          </a-button>
+        </a-upload>
+        <!-- <a-button style="margin-top: 2%">
+          <a-icon type="upload"/>
+          高拍仪
+        </a-button> -->
+      </a-space>
+    </template>
     <a-upload-dragger
       v-else-if="model.type === 'file'"
       :accept="model.accept?.join('')"
@@ -104,6 +111,7 @@ export default {
   created () {
     const list = this.model.type === 'file' ? [...this.files] : [...this.images]
     if (this.model.useType) {
+      // {uid,url,name,f_use_type?,f_form_type?}
       this.uploadedFileList = list.filter(item => item.f_use_type === this.model.useType)
     } else {
       this.uploadedFileList = list

package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue

@@ -155,6 +155,9 @@ export default {
   inject: {
     inXFormGroup: {
       default: false
+    },
+    formGroupContext: {
+      default: null
     }
   },
   props: {},
@@ -205,8 +208,7 @@ export default {
       // 提交按钮名称
       btnName: '提交',
       // 提交按钮位置 start / center / end
-      btnPlace: 'center',
-      activeTab: 0
+      btnPlace: 'center'
     }
   },
   computed: {
@@ -244,6 +246,12 @@ export default {
         }]
       }
     },
+    // 拥有自定义校验函数得表单项
+    customValidateItems: function () {
+      return this.formItems.filter((item) => {
+        return item?.rule?.type === 'customJs'
+      })
+    },
     // 过滤出用于新增/修改场景的表单项
     groupJsonData: function () {
       return this.formItems.filter((item) => {
@@ -316,6 +324,42 @@ export default {
       getSelf: () => this,
     }
   },
+  /** //todo 本来想要实现 配置 自定义函数时，表单项得红星提示，根据自定义校验函数得返回值来判断
+   * 但是监听不到父组件formgorup得其他form得变化，所以暂时不实现
+  */
+  //
+  // watch: {
+  //   form: {
+  //     handler (val) {
+  //        // 遍历表单配置
+  //       if (this.customValidateItems.length > 0) {
+  //         for (const item of this.customValidateItems) {
+  //           const itemIndex = this.formItems.findIndex(formItem => formItem.model === item.model)
+  //           if (itemIndex < 0) {
+  //             continue
+  //           }
+  //           try {
+  //             this.customJsValidate(null, val[item.model], (res) => {
+  //               // 如果返回error则设置错误信息
+  //               if (res instanceof Error) {
+  //                   // 设置表单项的错误状态
+  //                   this.$set(this.formItems[itemIndex], 'tempRequired', true)
+  //                 } else {
+  //                   // 清除错误状态
+  //                   this.$set(this.formItems[itemIndex], 'tempRequired', true)
+  //                 }
+  //             }, item)
+  //           } catch (e) {
+  //             console.error(e)
+  //             this.$set(this.formItems[itemIndex], 'tempRequired', true)
+  //           }
+  //         }
+  //         console.log('customValidateItems', JSON.stringify(this.customValidateItems))
+  //       }
+  //     },
+  //     deep: true
+  //   }
+  // },
   methods: {
     runLogic,
     getConfigByNameAsync,

package/src/base-client/components/common/XFormGroup/XFormGroup.vue

@@ -77,7 +77,8 @@ export default {
   },
   provide () {
     return {
-      inXFormGroup: true
+      inXFormGroup: true,
+      formGroupContext: this
     }
   },
   methods: {
@@ -135,6 +136,10 @@ export default {
         }
       }).filter(ref => ref !== null)
     },
+    getNativeForm (group) {
+      const formref = this.getNativeFormRef(group)
+      return formref.length ? formref[0].form : null
+    },
     initData (index) {
       // 定义当前表单配置
       const res = this.groups[index]

package/src/base-client/components/common/XTable/XTable.vue

@@ -617,7 +617,7 @@ export default {
         } else if (item.model === model && item.editRow) {
           acc = item
         }
-        return acc
+        return Object.assign(acc, { tableContext: this, tableIndex: index })
       }, null)
       if (aa) {
         const tempConfig = JSON.parse(JSON.stringify(aa))

package/src/router/async/router.map.js

@@ -84,9 +84,9 @@ routerResource.example = {
           path: 'default',
           name: '示例页面',
           // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
-          // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
+          component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-          component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+          // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
           // component: () => import('@vue2-client/base-client/components/common/XReportGrid/XReportDemo.vue'),

package/vue.config.js

@@ -57,8 +57,8 @@ module.exports = {
         changeOrigin: true
       },
       '/api/af-revenue': {
-        pathRewrite: { '^/api/af-revenue/': '/' },
-        target: 'http://127.0.0.1:9026',
+        // pathRewrite: { '^/api/af-revenue/': '/' },
+        target: revenue,
         changeOrigin: true
       },
       '/api/af-liuli': {
@@ -83,7 +83,7 @@ module.exports = {
       '/devApi': {
         // v3用
         // pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
-        pathRewrite: { '^/api/': '/' },
+        // pathRewrite: { '^/api/': '/' },
         target: revenue,
         changeOrigin: true
       },