meixioacomponent 0.3.44 → 0.3.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.3.44",
+  "version": "0.3.45",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/proPageTable/oa_pro_table.vue

@@ -244,6 +244,9 @@ export default {
       borderRow: true,
       // 倒计时
       triggerDown: null,
+
+      // 组件销毁时重置的class 配合 LinkViewClass使用
+      _linkViewClassSubs: null,
     }
   },
   created() {
@@ -256,6 +259,9 @@ export default {
   beforeDestroy() {
     componentConfig.eventBus.$off('handleTableBorder', this.handleTableBorder)
     clearTimeout(this.triggerDown)
+    if (this._linkViewClassSubs) {
+      this._linkViewClassSubs.init()
+    }
   },
   computed: {
     config() {
@@ -638,7 +644,22 @@ export default {
 
       let screenResult = this.returnProScreenResult()
       this.$props.httpRequire(screenResult).then((res) => {
-        this.setTableData(res)
+        let isArray = res instanceof Array
+        if (isArray) {
+          this.setTableData(res)
+        } else {
+          const tableData = res.tableData
+          if (
+            res._class.__proto__.__proto__.constructor.name ==
+              'LinkViewClass' &&
+            !this._linkViewClassSubs
+          ) {
+            this._linkViewClassSubs = res._class
+          }
+          if (tableData) {
+            this.setTableData(tableData)
+          }
+        }
       })
     },
     // 设置表格数据
@@ -787,7 +808,6 @@ export default {
       })
     },
     sortChange(column) {
-      console.log('sort')
       this.tableData = this.tableData.sort(
         this.sortFun(
           column.prop,
@@ -823,7 +843,6 @@ export default {
       return index == tableConfig.length - 1
     },
   },
-  watch: {},
 }
 </script>
 

package/src/component/test.vue

@@ -311,8 +311,8 @@ export default {
 }
 </style> -->
 
-<!-- <template>
-  <div class="page-table-wrap" ref="pageTableWrap">
+<template>
+  <div class="page-table-wrap" ref="pageTableWrap" v-if="show">
     <base-pro-table
       :align="`left`"
       v-model="keyWords"
@@ -326,9 +326,9 @@ export default {
       :headerConfig="headerConfig"
       :totalPropsList="totalPropsList"
       :proScreenConfig="proScreenConfig"
-    > -->
-<!-- 表格头部插槽 -->
-<!-- <template>
+    >
+      <!-- 表格头部插槽 -->
+      <template>
         <base-icon
           :color="`m`"
           :event="true"
@@ -357,17 +357,19 @@ export default {
             <el-dropdown-item>蚵仔煎</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-      </template> -->
+      </template>
 
-<!-- 自定义模板列 -->
-<!-- <template v-slot:name="data">template-{{ data.scope }}</template>
+      <!-- 自定义模板列 -->
+      <template v-slot:name="data">template-{{ data.scope }}</template>
       <template v-slot:address="data">template-{{ data.scope }}</template>
     </base-pro-table>
   </div>
-</template> -->
-<!-- 
+</template>
+
 <script>
 import tableTable from '../test'
+import companyInfoConfig from '../config/CompanyInfoConfig'
+import componentConfig from '../../packages/config/componentConfig'
 export default {
   data() {
     return {
@@ -424,19 +426,9 @@ export default {
         },
       ],
 
-      // 分页属性
-      /* 分页属性 */
-      pageProps: {
-        pageSize: 15,
-        pageNum: 1,
-        total: 100,
-      },
-      //  分页配置
-      pageConfig: {
-        size: 'pageSize',
-        page: 'pageNum',
-        total: 'total',
-      },
+      show: true,
+
+      one: true,
     }
   },
   created() {
@@ -521,13 +513,25 @@ export default {
   mounted() {
     this.pageHeight = this.$refs.pageTableWrap.clientHeight
   },
+  computed: {
+    pageProps() {
+      return companyInfoConfig.getPageProps()
+    },
+    pageConfig() {
+      return companyInfoConfig.getPageConfig()
+    },
+  },
   components: {},
   methods: {
     async httpRequire(screenCofig) {
-      let result = null
+      companyInfoConfig.setTable()
       try {
-        // result = await test(screenCofig)
-        this.pageProps.total = 20
+        // result = await test(screenCofig);
+        if (this.one) {
+          this.pageProps.total = 100
+        } else {
+          this.pageProps.total = 20
+        }
       } catch (error) {
         return new Promise((resolve, reject) => {
           this.pageProps.total = 0
@@ -535,7 +539,7 @@ export default {
         })
       }
       return new Promise((resolve, reject) => {
-        resolve(tableTable)
+        resolve(companyInfoConfig.getTableData())
       })
     },
     rowClick(row) {
@@ -551,174 +555,9 @@ export default {
   height: 100%;
   background: inherit;
 }
-</style> -->
+</style>
 
 <!-- 普通表单 -->
-<template>
-  <div class="add-company-step-two-wrap">
-    <base-form
-      :footer="false"
-      :rules="rules"
-      :rowNumber="1"
-      @onCancel="onCancel"
-      v-model="formList"
-      :labelWidth="`200px`"
-      :labelPosition="`right`"
-      @formSubmit="formSubmit"
-    >
-      <template v-slot:form-businessLicense="data">
-        <div class="upload-wrap">
-          <base-upload-item
-            :shape="`pro`"
-            :fileType="`img`"
-            @uploadEd="uploadEd"
-            :uploadType="`single`"
-            v-model="data.scope[3].value"
-          ></base-upload-item>
-        </div>
-      </template>
-      <template v-slot:form-idPositive="data">
-        <div class="upload-wrap">
-          <base-upload-item
-            :shape="`pro`"
-            :fileType="`img`"
-            @uploadEd="uploadEd"
-            :uploadType="`single`"
-            v-model="data.scope[4].value"
-          ></base-upload-item>
-        </div>
-      </template>
-      <template v-slot:form-idBack="data">
-        <div class="upload-wrap">
-          <base-upload-item
-            :shape="`pro`"
-            :fileType="`img`"
-            @uploadEd="uploadEd"
-            :uploadType="`single`"
-            v-model="data.scope[5].value"
-          ></base-upload-item>
-        </div>
-      </template>
-    </base-form>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      formList: [
-        {
-          value: '',
-          key: 'companyName',
-          type: 'input',
-          label: '企业名称',
-        },
-        {
-          value: '',
-          key: 'companyAddress',
-          type: 'area',
-          label: '通讯地址',
-        },
-        {
-          value: '',
-          key: 'companyDetail',
-          type: 'textarea',
-          label: '详细地址',
-        },
-        {
-          value: [],
-          key: 'businessLicense',
-          type: 'template',
-          label: '营业执照正面彩照',
-        },
-        {
-          value: [],
-          key: 'idPositive',
-          type: 'template',
-          label: '法人身份证人像照',
-        },
-        {
-          value: [],
-          key: 'idBack',
-          type: 'template',
-          label: '法人身份证国徽照',
-        },
-      ],
-      rules: {
-        companyName: [
-          {
-            required: true,
-            message: '请输入企业名称',
-            trigger: 'blur',
-          },
-        ],
-        companyAddress: [
-          {
-            required: true,
-            message: '请输入通讯地址',
-            trigger: 'blur',
-          },
-        ],
-        companyDetail: [
-          {
-            required: true,
-            message: '请输入详细地址',
-            trigger: 'blur',
-          },
-        ],
-        businessLicense: [
-          {
-            required: true,
-            message: '请上传营业彩照',
-            trigger: 'blur',
-          },
-        ],
-        idPositive: [
-          {
-            required: true,
-            message: '请上传法人身份证人像照',
-            trigger: 'blur',
-          },
-        ],
-        idBack: [
-          {
-            required: true,
-            message: '请上传法人身份证国徽照',
-            trigger: 'blur',
-          },
-        ],
-      },
-    }
-  },
-  methods: {
-    onCancel() {},
-    formSubmit() {},
-    uploadEd(value) {
-      console.log(value)
-      console.log(this.formList)
-    },
-  },
-}
-</script>
-
-<style lang="less" scoped>
-.add-company-step-two-wrap {
-  width: 60%;
-  height: 100%;
-  overflow-y: auto;
-  .upload-wrap {
-    width: 100%;
-    height: 170px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    /deep/ .base-upload-item-wrap {
-      margin: 0px;
-    }
-  }
-}
-</style>
 
 <!-- 上传表单 -->
 <!-- <template>

package/src/config/CompanyInfoConfig.js

@@ -0,0 +1,26 @@
+import { reactive } from 'vue'
+import LinkViewClass from './linkViewClass'
+
+class CompanyInfoConfig extends LinkViewClass {
+  constructor() {
+    super()
+    this.dynamicMount = null
+    this.drawerContent = null
+
+    this.tableData = []
+  }
+  setTable() {
+    this.tableData = [
+      { firmName: 1 },
+      { firmName: '这是一段八个字的文字' },
+      { firmName: 3 },
+      { firmName: 4 },
+      { firmName: 5 },
+      { firmName: 6 },
+      { firmName: 7 },
+    ]
+  }
+}
+
+const companyInfoConfig = reactive(new CompanyInfoConfig())
+export default companyInfoConfig

package/src/config/linkViewClass.js

@@ -0,0 +1,71 @@
+class LinkViewClass {
+  constructor(params) {
+    this.tableData = []
+    this.refreshTableData = null
+    this.pageProps = {}
+    this.pageConfig = {}
+    this.activeIndex = 0
+    this.init()
+  }
+
+  init() {
+    this.tableData = []
+    this.activeIndex = 0
+    this.refreshTableData = null
+    this.pageProps = {
+      size: 15,
+      total: 100,
+      current: 1,
+    }
+    this.pageConfig = {
+      size: 'size',
+      page: 'current',
+      total: 'total',
+    }
+  }
+  onHandNextData() {
+    if (this.hasNextTableData()) {
+      this.activeIndex += 1
+      return
+    }
+    this.activeIndex = this.tableData.length - 1
+  }
+
+  onHandPreData() {
+    if (this.hasPreTableData()) {
+      this.activeIndex -= 1
+    }
+    this.activeIndex = 0
+  }
+
+  hasNextTableData() {
+    return this.tableData.length > 0
+      ? this.activeIndex == this.tableData.length - 1
+        ? false
+        : true
+      : false
+  }
+  hasPreTableData() {
+    return this.activeIndex <= 0 ? false : true
+  }
+  getTableDataForActiveIndex() {
+    return this.tableData[this.activeIndex]
+  }
+
+  getPageProps() {
+    return this.pageProps
+  }
+
+  getTableData() {
+    this.activeIndex = 0
+    return {
+      _class: this,
+      tableData: this.tableData,
+    }
+  }
+  getPageConfig() {
+    return this.pageConfig
+  }
+}
+
+export default LinkViewClass