@zscreate/zhxy-app-component 1.0.330 → 1.0.332

package/components/evan-form-item/evan-form-item.vue

@@ -1680,7 +1680,25 @@ export default {
         [this.widget.model]: null
       }
       let options = this.widget.options
-      if (this.widget.options.dictCode || this.widget.options.dictName) {
+      if(options.remoteNumber == '4') { 
+        global.dictData[this.widget.model] =  options.designDataList.map(item => {
+            return {
+              value: item.value,
+              label: item.label,
+              text: item.label
+            }
+          })
+          let str = ''
+          let newArr = []
+          options.designDataList.forEach(item => {
+            newArr = Array.isArray(this.dataModel) ? this.dataModel : this.dataModel.split(',')
+            if(newArr.includes(item.value)) {
+              str += ',' + item.label
+            }
+          })
+          this.dataModelShow = str.substring(1)
+      } else {
+        if (this.widget.options.dictCode || this.widget.options.dictName) {
         //根据字典Code, 初始化字典数组
         await this.$u.get(
           `/sys/dict/getDictItems/${this.widget.options.dictCode ? this.widget.options.dictCode : this.widget.options.dictName}`,
@@ -1739,6 +1757,7 @@ export default {
         }
 
       }
+      }
     },
     //处理下拉框接口地址数据
     getSelectUrl(url, params) {
@@ -2118,8 +2137,8 @@ export default {
       if (this.widget.options.disabled) {
         return false
       } else {
-        const { multiple, dictName, dictUrl, dictTable, options, linkage } = this.widget.options
-        var optionsData = JSON.stringify({ dictName, dictUrl, dictTable, options, linkage })
+        const { multiple, dictName, dictUrl, dictTable, options, linkage, designDataList,remoteNumber } = this.widget.options
+        var optionsData = JSON.stringify({ dictName, dictUrl, dictTable, options, linkage,designDataList, remoteNumber })
         var PubsubSign = String(Math.random()).split('.')[1];
         Pubsub.subscribe(PubsubSign, (msg, data) => {
           console.log(data)
@@ -2161,7 +2180,15 @@ export default {
           id = this.linkage[model]
         }
         console.log(this.models);
-        if(this.zjfmFormDesign) {
+        // 代表自定义选择
+        if(this.widget.options.remoteNumber == '4') {
+          uni.setStorageSync('designDataList',designDataList)
+          uni.navigateTo({
+          url: '/pages/picker/service?sign=' + PubsubSign + '&multiple=' + flag + '&optionsData=' +
+            encodeURIComponent(optionsData) + '&dataModel=' + JSON.stringify(this.dataModel) + '&id=' + id + '&applyId=' + this.applyId +'&dictLabelAnalysis=' + this.widget.options.dictLabelAnalysis
+        });
+        } else {
+          if(this.zjfmFormDesign) {
           uni.setStorageSync('zjfmFormDesignModels', this.models)
           uni.navigateTo({
           url: '/pages/picker/service?sign=' + PubsubSign + '&zjfmFormDesign=true'
@@ -2173,6 +2200,7 @@ export default {
             encodeURIComponent(optionsData) + '&dataModel=' + JSON.stringify(this.dataModel) + '&id=' + id + '&applyId=' + this.applyId +'&dictLabelAnalysis=' + this.widget.options.dictLabelAnalysis
         });
         }
+        }
         
       }
     },

package/components/form-container/form-container.vue

@@ -38,10 +38,12 @@
                                     </view>
                                 </view>
                             </view>
+                            <!-- #ifdef H5 -->
                             <page-pagination v-if="tablePageInfo[item.model]&&tablePageInfo[item.model].total" :total="tablePageInfo[item.model]&&tablePageInfo[item.model].total" 
                               :currentPage="tablePageInfo[item.model]&&tablePageInfo[item.model].current"
                               @change="(...args) => tablePageChange(item,...args)"
                               :numAround="true" :showBorder="false"></page-pagination>
+			<!-- #endif  -->
                           </template>
                           <template v-else>
                             <view class="table-item" v-for="(table, tableCIndex) in tableData[item.model]"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zscreate/zhxy-app-component",
-	"version": "1.0.330",
+	"version": "1.0.332",
 	"private": false,
 	"description": "zhxy-app-component",
 	"main": "index.js",