doway-coms 2.0.2 → 2.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/index.vue

@@ -281,6 +281,30 @@
           />
         </div>
       </template>
+      <template #treeSelect_edit="scope">
+        <div class="interceptor-class">
+          <BaseTreeSelect
+            v-model="scope.row[scope.column.property]"
+            :field="scope.column.property"
+            :formRow="formRow"
+            :edit="scope.column.params.controlEdit === true"
+            :showLabel="false"
+            :row="scope.row"
+            class="inner-cell-control"
+            :api="scope.column.params.api"
+            :columns="scope.column.params.columns"
+            :allowClear="scope.column.params.allowClear"
+            :linkedField="scope.column.params.linkedField"
+            :showSearch="scope.column.params.showSearch"
+            :linkedTitle="scope.column.params.linkedTitle"
+            :method="scope.column.params.method"
+            @selectChanged="cellValueChange(scope)"
+            :replaceFields="scope.column.params.replaceFields"
+            @preSearch="(searchInfo) => preSearch(searchInfo, scope)"
+          >
+          </BaseTreeSelect>
+        </div>
+      </template>
 
       <template #expandContent="{ row, column, $table }">
         <slot name="expandContent" :item="{ row, column, $table }"></slot>
@@ -1654,6 +1678,10 @@ export default {
           case controlType.pulldown:
             tempAutoFocus = '.inner-cell-control>input'
             break
+          case controlType.treeSelect:
+            tempAutoFocus = '.ant-select-dropdown-search-input'
+            tempAutoSelect = false
+            break
           case controlType.date:
             tempAutoFocus = '.ant-calendar-picker-input'
             break
@@ -1700,7 +1728,19 @@ export default {
         colParams['isMultiSelect'] = originCol.isMultiSelect
         colParams['contrasts'] = originCol.contrasts || []
         colParams['controlEdit'] = true
-        colParams['allowAutoClear']=originCol.allowAutoClear
+        colParams['allowAutoClear'] = originCol.allowAutoClear
+      }
+      if (originCol.controlType === controlType.treeSelect) {
+        colParams['api'] = originCol.api
+        colParams['columns'] = originCol.columns
+        colParams['controlEdit'] = true
+        colParams['allowClear'] = originCol.allowClear
+        colParams['linkedField'] = originCol.linkedField
+        colParams['showSearch'] = originCol.showSearch
+        colParams['linkedTitle'] = originCol.linkedTitle
+        colParams['method'] = originCol.method
+        colParams['replaceFields'] = originCol.replaceFields
+        colParams['field'] = originCol.field
       }
       if (originCol.controlType === controlType.text) {
         colParams['controlEdit'] = true
@@ -1739,6 +1779,10 @@ export default {
           colParams['filterControlType'] = originCol.filterControlType
           filterTypeName = `${originCol.filterControlType}_filter`
         }
+        if (originCol.controlType === controlType.treeSelect) {
+          filterTypeName = 'text_filter'
+        }
+
         //网格筛选
         colInfo['filters'] = [
           {

package/packages/BaseTreeSelect/src/index.vue

@@ -13,12 +13,7 @@
         <img src="../../styles/icon/help.png" alt="" style="width: 14px" />
       </Tooltip>
     </div>
-    <div
-      :class="{
-        'd-control': showLabel === true,
-        'd-grid-control': showLabel === false,
-      }"
-    >
+    <div class="d-control">
       <ValidationProvider
         v-if="edit === true"
         :name="label"
@@ -29,14 +24,13 @@
           ref="treeSelectView"
           v-model="currentValue"
           :treeData="treeData"
-          tree-data-simple-mode
           :showSearch="showSearch"
           :replaceFields="replaceFields"
           :dropdownMatchSelectWidth="dropdownMatchSelectWidth"
           :treeDefaultExpandAll="treeDefaultExpandAll"
           :treeDefaultExpandedKeys="treeDefaultExpandedKeys"
           @change="changeData"
-          :size="size"
+          size="small"
           :allowClear="allowClear"
           @focus="searchData"
           @select="selectData"
@@ -47,7 +41,7 @@
           }"
           treeNodeFilterProp="title"
           :style="{
-            width: width + 'px',
+            width: '100%',
           }"
           :placeholder="placeholder"
         ></TreeSelect>
@@ -294,7 +288,6 @@ export default {
      * 查询数据
      */
     searchData() {
-      console.log(this.$refs.treeSelectView)
       let tempExp = {
         operator: 'or',
         expressions: [],
@@ -371,11 +364,13 @@ export default {
       // this.row[this.field] = node.title
       this.$set(this.row, this.linkedField, value)
       this.$set(this.row, this.field, node.title)
+      this.$emit('selectChanged', this.row)
     },
     changeData(value) {
       if (!value) {
         this.$set(this.row, this.linkedField, '')
         this.$set(this.row, this.field, '')
+        this.$emit('selectChanged', this.row)
       }
     },
   },

package/packages/index.js

@@ -78,7 +78,8 @@ const popupInterceptor = (params) => {
         parentElement.className.indexOf('ant-calendar') > -1 ||
         parentElement.className.indexOf('ant-select-dropdown-menu-item') > -1 ||
         parentElement.className.indexOf('interceptor-class') > -1 ||
-        parentElement.className.indexOf('ant-time-picker-panel') > -1)
+        parentElement.className.indexOf('ant-time-picker-panel') > -1 ||
+        parentElement.className.indexOf('ant-select-dropdown') > -1)
     ) {
       //定义网格弹出框不能对焦问题
       return false