three-trees-ui 1.0.83 → 1.0.84

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.83",
+  "version": "1.0.84",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/CustomDialog/src/customDialog.vue

@@ -1137,8 +1137,11 @@
         }
         const pInst = utils.getOnlineFormInstance(this)
         this.selectOrgs = this.convertComment2Field(str, field)
-        this.custdialog.custDialog.mappingConf.forEach((con) => {
-          var val = ''
+          this.custdialog.custDialog.mappingConf.forEach((con) => {
+          let val = ''
+          let bindValue = ''
+          //改造，绑定值，表单列表查询字段绑定对话框时，新增的绑定字段选项
+          const bindValueField = con.bindValue && con.bindValue.toLowerCase()
           str.forEach((item, index) => {
             // 此处添加url跳转参数保存逻辑
             if (
@@ -1159,6 +1162,10 @@
               },`
             } else {
               val += item[con.from] + ','
+              //绑定字段处理
+              if (bindValueField) {
+                bindValue += item[bindValueField] + ','
+              }
             }
           })
           if (this.modelName == 'data.' + con['target'][0]) {
@@ -1169,12 +1176,28 @@
               thisIndex
             )
           } else if (this.modelName == 'searchForm.' + con['target'][0]) {
-            utils.setValueByPath(
-              pInst,
-              'searchForm.' + con['target'][0],
-              val.substring(0, val.length - 1),
-              thisIndex
-            )
+            const bInst = pInst['searchForm'] ? pInst: pInst.data
+            const currentValue = val.substring(0, val.length - 1)
+            if (this.modelName && this.modelName.endsWith(con['target'][0])) {
+              this.$emit('updateInput', currentValue);
+            }
+            utils.setValueByPath(bInst, 'searchForm.' + con['target'][0], currentValue, thisIndex)
+            //绑定字段值处理，bindValue: {target: {id: xxx}}, bindKey: {target: id }
+            if (bindValue && bindValueField) {
+              const bindValueObj = {}
+              //显示value对象
+              bindValueObj[bindValueField] = bindValue.substring(0, bindValue.length - 1)
+
+              const anInst = pInst['searchForm'] ? pInst['searchForm'] : pInst.data.searchForm
+              //若bindKey不存在，则默认空对象，若存在，则取出bindKey
+              anInst.bindKey = anInst.bindKey || {}
+              //格式 {target: id }
+              anInst.bindKey[con['target'][0]] = bindValueField
+              //若bindValue不存在，则默认空对象，若存在，则取出bindValue
+              anInst.bindValue = anInst.bindValue || {}
+              //格式 {target: {id: xxx}}
+              anInst.bindValue[con['target'][0]] = bindValueObj
+            }
           } else {
             let configAttr = con['target'][0].split('.')
             let path = con['target'][0]
@@ -1199,10 +1222,26 @@
               }
               utils.setValueByPath(
                 pInst,
-                `${pInst.data ? 'data.' : 'model.'}${path}`,
+                `${pInst.data ? 'data.' : 'model.'}${this.modelName.includes('searchForm') ? `searchForm.${path}` : path}`,
                 _val,
                 thisIndex
               )
+              //绑定字段值处理，bindValue: {target: {id: xxx}}, bindKey: {target: id }
+              if (bindValue && bindValueField) {
+                const bindValueObj = {}
+                //显示value对象
+                bindValueObj[bindValueField] = bindValue.substring(0, bindValue.length - 1)
+
+                const anInst = pInst['searchForm'] ? pInst['searchForm'] : pInst.data.searchForm
+                //若bindKey不存在，则默认空对象，若存在，则取出bindKey
+                anInst.bindKey = anInst.bindKey || {}
+                //格式 {target: id }
+                anInst.bindKey[con['target'][0]] = bindValueField
+                //若bindValue不存在，则默认空对象，若存在，则取出bindValue
+                anInst.bindValue = anInst.bindValue || {}
+                //格式 {target: {id: xxx}}
+                anInst.bindValue[con['target'][0]] = bindValueObj
+              }
             }
           }
         })
@@ -1856,8 +1895,11 @@
         }
         const pInst = utils.getOnlineFormInstance(this)
         this.custdialog.custDialog.mappingConf.forEach((con) => {
-          var val = ''
-          var from = con.from.toLowerCase()
+          let val = ''
+          let bindValue = ''
+          const from = con.from.toLowerCase()
+          //改造，绑定值，表单列表查询字段绑定对话框时，新增的绑定字段选项
+          const bindValueField = con.bindValue && con.bindValue.toLowerCase()
           str.forEach((item) => {
             // 如果有绑定url跳转参数 需获取跳转参数的key
             if (item) {
@@ -1885,6 +1927,10 @@
                 )}¯${jumpParamKey}:${decodeURIComponent(item[returnMapKey])},`
               } else {
                 val += decodeURIComponent(item[from]) + ','
+                //绑定字段处理
+                if (bindValueField) {
+                  bindValue += decodeURIComponent(item[bindValueField]) + ','
+                }
               }
             }
           })
@@ -1900,13 +1946,28 @@
             this.modelName &&
             this.modelName.startsWith('searchForm.')
           ) {
+            const currentValue = val.substring(0, val.length - 1)
+            if (this.modelName && this.modelName.endsWith(con['target'][0])) {
+              this.$emit('updateInput', currentValue);
+            }
             let prePath = pInst['searchForm'] ? '' : 'data.'
-            utils.setValueByPath(
-              pInst,
-              prePath + 'searchForm.' + con['target'][0],
-              val.substring(0, val.length - 1),
-              thisIndex
-            )
+            utils.setValueByPath(pInst, prePath + 'searchForm.' + con['target'][0], currentValue, thisIndex)
+            //绑定字段值处理，bindValue: {target: {id: xxx}}, bindKey: {target: id }
+            if (bindValue && bindValueField) {
+              const bindValueObj = {}
+              //显示value对象
+              bindValueObj[bindValueField] = bindValue.substring(0, bindValue.length - 1)
+
+              const anInst = pInst['searchForm'] ? pInst['searchForm'] : pInst.data.searchForm
+              //若bindKey不存在，则默认空对象，若存在，则取出bindKey
+              anInst.bindKey = anInst.bindKey || {}
+              //格式 {target: id }
+              anInst.bindKey[con['target'][0]] = bindValueField
+              //若bindValue不存在，则默认空对象，若存在，则取出bindValue
+              anInst.bindValue = anInst.bindValue || {}
+              //格式 {target: {id: xxx}}
+              anInst.bindValue[con['target'][0]] = bindValueObj
+            }
           } else {
             let configAttr = con['target'][0].split('.')
             let path = con['target'][0]

package/packages/DataLists/src/main.vue

@@ -33,7 +33,7 @@
 </template>
 <script>
   import permission from '@/mixins/permission.js'
-export default {
+  export default {
     name: 'HtDataLists',
     mixins: [permission],
     props: {
@@ -56,7 +56,6 @@ export default {
     watch: {
       options: {
         handler(val) {
-          debugger
           if (val) {
             this.tabPaneList = JSON.parse(val)
             this.activeName = this.tabPaneList[0].dataTemplateKey
@@ -114,4 +113,4 @@ export default {
       margin-top: 24px;
     }
   }
-</style>
+</style>

package/packages/OrgPostDialog/src/main.vue

@@ -111,7 +111,7 @@
           ? 'id'
           : this.config && this.config.hasOwnProperty('code')
           ? 'code'
-          : this.selectLabel
+          : 'id'
       },
     },
     mounted() {

package/packages/OrgSelector/src/main.vue

@@ -196,7 +196,7 @@
           ? 'id'
           : this.config && this.config.hasOwnProperty('code')
           ? 'code'
-          : this.selectLabel
+          : 'id'
       },
     },
     watch: {

package/packages/QuerySqlPreview/src/QuerySqlPreview.vue

@@ -163,4 +163,46 @@ export default {
     font-weight: bold;
     color: #f56c6c;
   }
-</style>
+  ::v-deep .page-btn-count {
+    margin: 0 24px;
+    float: left;
+    padding: 10px 0;
+  }
+  ::v-deep .page-btn-total {
+    margin: 5px 0px;
+    float: left;
+    padding: 11px 0px;
+    color: #606266;
+    font-weight: normal;
+    font-size: 13px;
+  }
+  ::v-deep .pagination {
+    display: flex;
+    justify-content: flex-end;
+    padding: 10px 0;
+    float: right;
+    .el-select {
+      width: 100px;
+    }
+    .page-btn {
+      margin: 0 24px;
+    }
+    .target-page {
+      display: flex;
+      align-items: center;
+      color: #606266;
+      font-weight: normal;
+      font-size: 13px;
+      .el-input {
+        width: 50px;
+        margin: 0 3px;
+      }
+      //::v-deep input::-webkit-outer-spin-button, ::v-deep input::-webkit-inner-spin-button {
+      //  -webkit-appearance: none !important;
+      //}
+      //::v-deep input[type='number'] {
+      //  -moz-appearnce: textfield !important
+      //}
+    }
+  }
+</style>

package/packages/Subtable/src/SubPagination.vue

@@ -106,9 +106,9 @@
     mounted() {
       this.paginationChange()
     },
-    destroyed() {
-      SubPagination.clear(this.dataSubname, this)
-    },
+    // destroyed() {
+    //   SubPagination.clear(this.dataSubname, this)
+    // },
     methods: {
       paginationChange() {
         // 分页变化时，以dataPath为key设置到公共的js对象中

package/packages/Table/src/Table.vue

@@ -112,10 +112,10 @@
       :highlight-current-row="highlightCurrentRow"
       :row-class-name="rowClassName"
       :cell-class-name="cellClassName"
-      :style="{ height: `${tableMaxHeight ? tableMaxHeight : 400}` + 'px' }"
       :row-key="rowKey"
       :show-summary="showSummary"
       :summary-method="getSummaries"
+      v-bind="tableOptions"
       @row-click="handleRowClick"
       @select="handleTableSelect"
       @select-all="handleTableSelect"
@@ -447,6 +447,20 @@
       isLoading() {
         return this.loading && !this.noLoading
       },
+      tableOptions() {
+        if (this.showSummary) {
+          return {
+            height: `${this.tableMaxHeight ? this.tableMaxHeight : 400}`,
+          }
+        } else {
+          return {
+            style: {
+              height:
+                `${this.tableMaxHeight ? this.tableMaxHeight : 400}` + 'px',
+            },
+          }
+        }
+      },
     },
     watch: {
       justShowSearch: {
@@ -957,11 +971,11 @@
               const {
                 summaryMethod,
                 summaryType,
-                name,
                 tableName,
                 oldTableField,
                 fieldDesc,
               } = tableFieldItem
+              let name = tableFieldItem.fieldsAlias || tableFieldItem.name
               if (!summaryMethod) {
                 sums[index] = ''
                 return
@@ -1022,7 +1036,13 @@
         return hasValueList.length
       },
       getSum(data, field) {
-        const sumResult = data.reduce((pre, cur) => pre + Number(cur[field]), 0)
+        const sumResult = data.reduce((pre, cur) => {
+          if (!isNaN(Number(cur[field]))) {
+            return pre + Number(cur[field])
+          } else {
+            return pre
+          }
+        }, 0)
         return sumResult ? utils.thousandBit(sumResult) : sumResult
       },
       getPropTable(field, tableName, oldTableField) {

package/packages/TableSearchField/src/main.vue

@@ -15,6 +15,7 @@
       :class="{ 'is-align-right': isAlignRight }"
     >
       <label v-if="label" v-ellipsis :title="label" class="search-field-label">
+        <span v-if="isRequired" class="red-color">*</span>
         {{ label }}
       </label>
     </div>
@@ -167,6 +168,7 @@
         type: Boolean,
         default: false,
       },
+      isRequired: Boolean,
     },
     data() {
       return {
@@ -317,6 +319,9 @@
     display: inline-block;
     max-width: calc(100% - 10px);
     line-height: 100%;
+    .red-color {
+      color: #f56c6c;
+    }
 
     &::after {
       content: ':';

package/packages/TemplatePreview/src/TemplatePreview.vue

@@ -223,6 +223,49 @@
     margin: 0;
     padding: 0;
   }
+  ::v-deep .page-btn-count {
+    margin: 0 24px;
+    float: left;
+    padding: 10px 0;
+  }
+  ::v-deep .page-btn-total {
+    margin: 5px 0px;
+    float: left;
+    padding: 11px 0px;
+    color: #606266;
+    font-weight: normal;
+    font-size: 13px;
+  }
+  ::v-deep .pagination {
+    display: flex;
+    justify-content: flex-end;
+    padding: 10px 0;
+    float: right;
+    .el-select {
+      width: 100px;
+    }
+    .page-btn {
+      margin: 0 24px;
+    }
+
+    .target-page {
+      display: flex;
+      align-items: center;
+      color: #606266;
+      font-weight: normal;
+      font-size: 13px;
+      .el-input {
+        width: 50px;
+        margin: 0 3px;
+      }
+      //::v-deep input::-webkit-outer-spin-button, ::v-deep input::-webkit-inner-spin-button {
+      //  -webkit-appearance: none !important;
+      //}
+      //::v-deep input[type='number'] {
+      //  -moz-appearnce: textfield !important
+      //}
+    }
+  }
 </style>
 <style lang="scss">
   .template-dropdown {