doway-coms 1.5.14 → 1.6.0

package/packages/BasePulldown/src/index.vue

@@ -1,888 +1,868 @@
 <template>
-  <div class="d-control-container">
-    <div
-      class="d-control-label"
-      v-if="showLabel === true"
-      :style="{ width: labelWidth > 0 ? labelWidth + 'px' : 'none' }"
-    >
-      {{ label }}
-      <span v-if="rules && rules['required']" class="d-control-label-required"
-        >*</span
+    <div class="d-control-container">
+      <div
+        class="d-control-label"
+        v-if="showLabel === true"
+        :style="{ width: labelWidth > 0 ? labelWidth + 'px' : 'none' }"
       >
-      <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
-        <img src="../../styles/icon/help.png" alt="" style="width: 14px" />
-      </Tooltip>
-    </div>
-    <div
-      :class="{
-        'd-control': showLabel === true,
-        'd-grid-control': showLabel === false,
-      }"
-    >
-      <VxePulldown
-        style="width: 100%"
-        @hide-panel="pullDownHideEvent"
-        ref="pulldownRef"
-        v-if="edit === true"
-        transfer
+        {{ label
+        }}
+        <span v-if="rules && rules['required']" class="d-control-label-required"
+        >*</span
+        >
+        <Tooltip :title="tooltip" v-if="tooltip" style="margin: 0 2px">
+          <img src="../../styles/icon/help.png" alt="" style="width: 14px">
+        </Tooltip>
+      </div>
+      <div
+        :class="{
+          'd-control': showLabel === true,
+          'd-grid-control': showLabel === false
+        }"
       >
-        <template #default>
-          <ValidationProvider :name="label" v-slot="v" :rules="rules">
-            <a-input
-              :size="'small'"
-              allow-clear
-              @change="inputChangeEvent"
-              class="inner-cell-control"
-              v-model="currentValue"
-              @click="inputClickEvent"
-              @focus="inputFocusEvent"
-              @blur="inputBlurEvent"
-              @keydown="inputKeydownEvent"
-              @keyup="inputKeyupEvent"
-              :class="{ 'd-error-input': v.errors.length > 0 }"
-            ></a-input>
-            <div class="d-error-msg">
-              {{ v.errors[0] }}
-            </div>
-          </ValidationProvider>
-        </template>
-        <template #dropdown>
-          <div class="pulldown-grid interceptor-class">
-            <vxe-grid
-              size="mini"
-              border
-              :row-class-name="gridRowStyle"
-              highlight-current-row
-              :keyboard-config="{ isArrow: true }"
-              highlight-hover-row
-              auto-resize
-              resizable
-              :loading="gridLoading"
-              height="auto"
-              ref="pupupGridView"
-              :data="searchRows"
-              @cell-click="gridCellClick"
-              :columns="internalColumns"
-              :checkbox-config="{ checkMethod: checkMethod }"
-              @sort-change="sortChange"
-              :sort-config="{
-                multiple: true,
-                remote: true,
-                chronological: true,
-                defaultSort: defaultSort,
-              }"
-            >
-              <!-- :pager-config="gridPagerConfig" -->
-              <!-- @page-change="pageChangeEvent" -->
-              <template #matCode_header="{ column }">
-                <div class="first-col">
-                  <div class="first-col-top">
-                    {{ column.title }}
-                  </div>
-                  <div class="first-col-bottom">
-                    <input style="width: 100%" />
+        <VxePulldown
+          style="width:100%"
+          @hide-panel="pullDownHideEvent"
+          ref="pulldownRef"
+          v-if="edit === true"
+          transfer
+        >
+          <template #default>
+            <ValidationProvider :name="label" v-slot="v" :rules="rules">
+              <a-input
+                :size="'small'"
+                allow-clear
+                @change="inputChangeEvent"
+                class="inner-cell-control"
+                v-model="currentValue"
+                @click="inputClickEvent"
+                @focus="inputFocusEvent"
+                @blur="inputBlurEvent"
+                @keydown="inputKeydownEvent"
+                @keyup="inputKeyupEvent"
+                :class="{ 'd-error-input': v.errors.length > 0 }"
+              ></a-input>
+              <div class="d-error-msg">
+                {{ v.errors[0] }}
+              </div>
+            </ValidationProvider>
+          </template>
+          <template #dropdown>
+            <div class="pulldown-grid interceptor-class">
+              <vxe-grid
+                size="mini"
+                border
+                :row-class-name="gridRowStyle"
+                highlight-current-row
+                :keyboard-config="{ isArrow: true }"
+                highlight-hover-row
+                auto-resize
+                resizable
+                :loading="gridLoading"
+                height="auto"
+                ref="pupupGridView"
+                :data="searchRows"
+                @cell-click="gridCellClick"
+                :columns="internalColumns"
+                :checkbox-config="{ checkMethod: checkMethod }"
+              >
+                <!-- :pager-config="gridPagerConfig" -->
+                <!-- @page-change="pageChangeEvent" -->
+                <template #matCode_header="{column}">
+                  <div class="first-col">
+                    <div class="first-col-top">
+                      {{ column.title }}
+                    </div>
+                    <div class="first-col-bottom">
+                      <input style="width:100%" />
+                    </div>
                   </div>
-                </div>
-              </template>
-              <template #pager>
-                <a-row>
-                  <a-col :span="8">
-                    <a-button
-                      v-if="isMultiSelect === true"
-                      type="primary"
-                      size="small"
-                      style="margin: 5px"
-                      @click="multiSelectConfirm"
-                    >
-                      确认选择
-                    </a-button>
-                    <a-button
-                      v-if="popupAddName"
-                      type="primary"
-                      size="small"
-                      style="margin: 5px"
-                      @click="pagerBtnClick(btn)"
-                    >
-                      新增
-                    </a-button>
-
-                    <template v-if="optBtns.length > 0">
+                </template>
+                <template #pager>
+                  <a-row>
+                    <a-col :span="8">
+                      <a-button
+                        v-if="isMultiSelect === true"
+                        type="primary"
+                        size="small"
+                        style="margin: 5px"
+                        @click="multiSelectConfirm"
+                      >
+                        确认选择
+                      </a-button>
                       <a-button
-                        v-for="btn in optBtns"
-                        :key="btn.field"
+                        v-if="popupAddName"
                         type="primary"
                         size="small"
                         style="margin: 5px"
                         @click="pagerBtnClick(btn)"
                       >
-                        {{ btn.name }}
+                        新增
                       </a-button>
-                    </template>
-                  </a-col>
-                  <a-col :span="16">
-                    <vxe-pager
-                      align="right"
-                      size="mini"
-                      :current-page.sync="gridPagerConfig.currentPage"
-                      :page-size.sync="gridPagerConfig.pageSize"
-                      :total="gridPagerConfig.total"
-                      @page-change="pageChangeEvent"
-                    >
-                    </vxe-pager>
-                  </a-col>
-                </a-row>
-              </template>
-            </vxe-grid>
-          </div>
-        </template>
-      </VxePulldown>
-      <span v-if="edit === false">
-        <a v-if="route" @click="routeLinkClick">{{ currentValue }}</a>
-        <span v-else> {{ currentValue }}</span>
-      </span>
+  
+                      <template v-if="optBtns.length > 0">
+                        <a-button
+                          v-for="btn in optBtns"
+                          :key="btn.field"
+                          type="primary"
+                          size="small"
+                          style="margin: 5px"
+                          @click="pagerBtnClick(btn)"
+                        >
+                          {{ btn.name }}
+                        </a-button>
+                      </template>
+                    </a-col>
+                    <a-col :span="16">
+                      <vxe-pager
+                        align="right"
+                        size="mini"
+                        :current-page.sync="gridPagerConfig.currentPage"
+                        :page-size.sync="gridPagerConfig.pageSize"
+                        :total="gridPagerConfig.total"
+                        @page-change="pageChangeEvent"
+                      >
+                      </vxe-pager>
+                    </a-col>
+                  </a-row>
+                </template>
+              </vxe-grid>
+            </div>
+          </template>
+        </VxePulldown>
+        <span v-if="edit === false">
+          <a v-if="route" @click="routeLinkClick">{{ currentValue }}</a>
+          <span v-else> {{ currentValue }}</span>
+        </span>
+      </div>
+  
+      <keep-alive>
+        <div
+          :is="popupAddName"
+          ref="pupupAddView"
+          @popupSaveAfter="popupSaveAfter"
+        ></div>
+      </keep-alive>
     </div>
+  </template>
+  
+  <script>
+  import XEUtils from 'xe-utils'
+  import { sysRowState, sysFormState, controlType } from '../../utils/enum'
+  import { replaceParamString, replaceParam } from '../../utils/common'
+  import request from '../../utils/request'
+  import { Input,Button,Row,Col } from 'ant-design-vue'
+  import { ValidationProvider } from 'vee-validate'
+  import {Pulldown} from 'vxe-table'
+  import { Tooltip } from 'ant-design-vue'
+  export default {
+    name: 'BasePulldown',
+    components:{
+        'a-input':Input,
+        'a-button':Button,
+        'a-row':Row,
+        'a-col':Col,
+        'VxePulldown':Pulldown,
+        ValidationProvider,
+      Tooltip,
 
-    <keep-alive>
-      <div
-        :is="popupAddName"
-        ref="pupupAddView"
-        @popupSaveAfter="popupSaveAfter"
-      ></div>
-    </keep-alive>
-  </div>
-</template>
-
-<script>
-import XEUtils from "xe-utils";
-import { sysRowState, sysFormState, controlType } from "../../utils/enum";
-import { replaceParamString, replaceParam } from "../../utils/common";
-import request from "../../utils/request";
-import { Input, Button, Row, Col } from "ant-design-vue";
-import { ValidationProvider } from "vee-validate";
-import { Pulldown } from "vxe-table";
-import { Tooltip } from "ant-design-vue";
-export default {
-  name: "BasePulldown",
-  components: {
-    "a-input": Input,
-    "a-button": Button,
-    "a-row": Row,
-    "a-col": Col,
-    VxePulldown: Pulldown,
-    ValidationProvider,
-    Tooltip,
-  },
-  data() {
-    return {
-      fetchFields: "",
-      internalColumns: [],
-      isInputChanged: false,
-      inputTimeout: null,
-      searchRows: [],
-      filterCols: [],
-      gridLoading: false,
-      gridPagerConfig: {
-        total: 0,
-        currentPage: 1,
-        pageSize: 10,
-      },
-      sorts: [],
-      defaultSort: [],
-    };
-  },
-  props: {
-    labelWidth: {
-      type: Number,
-      default: function () {
-        return 0;
-      },
     },
-    isMultiSelect: {
-      type: Boolean,
-      default: function () {
-        return false;
-      },
+    data() {
+      return {
+        fetchFields: '',
+        internalColumns: [],
+        isInputChanged: false,
+        inputTimeout: null,
+        searchRows: [],
+        filterCols: [],
+        gridLoading: false,
+        gridPagerConfig: {
+          total: 0,
+          currentPage: 1,
+          pageSize: 10
+        }
+      }
     },
-    popupAddName: {
-      type: String,
-      default: function () {
-        return null;
+    props: {
+      labelWidth: {
+        type: Number,
+        default: function() {
+          return 0
+        }
       },
-    },
-    popupAddPath: {
-      type: String,
-      default: function () {
-        return null;
+      isMultiSelect: {
+        type: Boolean,
+        default: function() {
+          return false
+        }
       },
-    },
-    rules: {
-      type: Object,
-      default: function () {
-        return null;
+      popupAddName: {
+        type: String,
+        default: function() {
+          return null
+        }
       },
-    },
-    showLabel: {
-      type: Boolean,
-      default: function () {
-        return true;
+      popupAddPath: {
+        type: String,
+        default: function() {
+          return null
+        }
       },
-    },
-    label: {
-      type: String,
-      default: function () {
-        return "";
+      rules: {
+        type: Object,
+        default: function() {
+          return null
+        }
       },
-    },
-    defaultExpression: {
-      type: String,
-      default: function () {
-        return "";
+      showLabel: {
+        type: Boolean,
+        default: function() {
+          return true
+        }
       },
-    },
-    formRow: {
-      type: Object,
-      default: function () {
-        return {};
+      label: {
+        type: String,
+        default: function() {
+          return ''
+        }
       },
-    },
-    row: {
-      type: Object,
-      default: function () {
-        return {};
+      defaultExpression: {
+        type: String,
+        default: function() {
+          return ''
+        }
       },
-    },
-    edit: {
-      type: Boolean,
-      default: function () {
-        return false;
+      formRow: {
+        type: Object,
+        default: function() {
+          return {}
+        }
       },
-    },
-    route: Object,
-    placeholder: {
-      // 提示信息
-      type: String,
-    },
-    api: {
-      // api接口
-      type: String,
-    },
-    field: {
-      type: String,
-    },
-    pageSize: {
-      // 分页数量，默认不分页
-      type: Number,
-      default: () => {
-        return 0;
+      row: {
+        type: Object,
+        default: function() {
+          return {}
+        }
       },
-    },
-    columns: {
-      // 列集合
-      type: Array,
-      default: () => {
-        return [];
+      edit: {
+        type: Boolean,
+        default: function() {
+          return false
+        }
       },
-    },
-    isOld: {
-      // 列集合
-      type: Boolean,
-      default: () => {
-        return false;
+      route: Object,
+      placeholder: {
+        // 提示信息
+        type: String
       },
-    },
-    exps: {
-      // 条件
-      type: Array,
-      default: () => {
-        return [];
+      api: {
+        // api接口
+        type: String
       },
-    },
-    value: {
-      type: String,
-      default: function () {
-        return "";
+      field: {
+        type: String
       },
-    },
-    optBtns: {
-      // 操作按钮
-      type: Array,
-      default: () => {
-        return [];
+      pageSize: {
+        // 分页数量，默认不分页
+        type: Number,
+        default: () => {
+          return 0
+        }
       },
-    },
-    gridTable: {
-      // 操作按钮
-      type: Object,
-      default: () => {
-        return null;
+      columns: {
+        // 列集合
+        type: Array,
+        default: () => {
+          return []
+        }
       },
-    },
-    immediate: {
-      type: Boolean,
-      default: true,
-    },
-    isLocalData: {
-      type: Boolean,
-      default: false,
-    },
-    tooltip: {
-      type: String,
-      default: function () {
-        return "";
+      isOld: {
+        // 列集合
+        type: Boolean,
+        default: () => {
+          return false
+        }
       },
-    },
-    propTableData: {
-      type: Array,
-      default: function () {
-        return [];
+      exps: {
+        // 条件
+        type: Array,
+        default: () => {
+          return []
+        }
       },
-    },
-  },
-  watch: {},
-  computed: {
-    currentValue: {
-      // 动态计算currentValue的值
-      get: function () {
-        return this.value; // 将props中的value赋值给currentValue
+      value: {
+        type: String,
+        default: function() {
+          return ''
+        }
+      },
+      optBtns: {
+        // 操作按钮
+        type: Array,
+        default: () => {
+          return []
+        }
+      },
+      gridTable: {
+        // 操作按钮
+        type: Object,
+        default: () => {
+          return null
+        }
       },
-      set: function (val) {
-        this.$emit("input", val); // 通过$emit触发父组件
+      immediate: {
+        type: Boolean,
+        default: true
+      },
+      isLocalData: {
+        type: Boolean,
+        default: false
+      },
+      tooltip: {
+        type: String,
+        default: function() {
+          return ''
+        }
+      },
+      propTableData: {
+        type: Array,
+        default: function() {
+          return []
+        }
       },
     },
-  },
-  created() {
+    watch: {},
+    computed: {
+      currentValue: {
+        // 动态计算currentValue的值
+        get: function() {
+          return this.value // 将props中的value赋值给currentValue
+        },
+        set: function(val) {
+          this.$emit('input', val) // 通过$emit触发父组件
+        }
+      }
+    },
+    created() {
     //   if (this.popupAddName && !this.$options.components[this.popupAddName]) {
     //     // const tempRequire =  require('@/views' + this.popupAddPath + '.vue').default
     //     // this.$options.components[this.popupAddName]  = tempRequire
     //     this.$options.components[this.popupAddName] = () =>
     //       import('@/views' + this.popupAddPath + '.vue')
     //   }
-    this.gridPagerConfig.pageSize = this.pageSize;
-
-    this.internalColumns.push({
-      type: "seq",
-      fixed: "left",
-      width: 50,
-    });
-
-    if (this.isMultiSelect === true) {
+      this.gridPagerConfig.pageSize = this.pageSize
+  
       this.internalColumns.push({
-        type: "checkbox",
-        fixed: "left",
-        width: 40,
-      });
-    }
-
-    for (let i = 0; i < this.columns.length; i++) {
-      this.fetchFields = this.fetchFields + this.columns[i].field + ",";
-      this.columns[i]["params"] = {
-        dataSource: [],
-      };
-      if (this.columns[i].dataSource) {
-        this.columns[i]["params"].dataSource = this.columns[i].dataSource;
-      }
-      if (!this.columns[i].width) {
-        this.columns[i]["width"] = 100;
-      }
-      if (this.columns[i].isCheckbox === true) {
-        this.columns[i]["type"] = "checkbox";
-      }
-      // 默认排序
-      if (this.columns[i].defaultSort) {
-        this.defaultSort.push({
-          field: this.columns[i].field,
-          order: this.columns[i].defaultSort,
-        });
-        this.sorts.push([this.columns[i].field, this.columns[i].defaultSort]);
-      }
-      this.internalColumns.push(this.columns[i]);
-      if (this.columns[i].filter === true) {
-        this.filterCols.push(this.columns[i]);
-      }
-    }
-  },
-  methods: {
-    gridRowStyle(scope) {
-      if (scope.row.sysRepeat === true) {
-        return "row--pending";
-      }
-      // if(scope.row.)
-    },
-    clearInputValue() {
-      if (this.isInputChanged === true) {
-        this.setLinkValue(null, this.row);
-        this.$emit("selectChanged", null);
-      }
-    },
-    routeLinkClick() {
-      //首先需要判断是否有权限
-      // let treeModule = XEUtils.findTree(
-      //   this.$store.getters.addRouters,
-      //   item => item.name === this.route.name
-      // )
-      // if (!treeModule) {
-      //   this.$antwarning('没有权限')
-      //   return
-      // }
-      this.$router.pushRoute({
-        name: this.route.name,
-        query: { id: this.row[this.route.field] },
-      });
-    },
-    /**
-     * 输入框改变事件
-     */
-    inputChangeEvent(event) {
-      this.isInputChanged = true;
-      if (event.type === "click" && event.pointerType === "mouse") {
-        //点击了清空按钮
-        this.$nextTick(() => {
-          this.clearInputValue();
-          this.inputClickEvent(null);
-        });
-      }
-    },
-    inputBlurEvent(event) {},
-    /**
-     * 输入框获取焦点事件
-     */
-    inputFocusEvent(event) {
-      event.currentTarget.select();
-      // this.$refs.pulldownRef.showPanel()
-      // this.searchData()
-    },
-    /**
-     * Tab键隐藏面板
-     */
-    inputKeydownEvent(event) {
-      if (event.keyCode === 9) {
-        //tab事件
-        this.$refs.pulldownRef.hidePanel();
-        this.clearInputValue();
-      }
-    },
-    inputClickEvent(event) {
-      if (this.$refs.pulldownRef.isPanelVisible() === false) {
-        this.$refs.pulldownRef.showPanel();
-        this.searchData();
-      } else {
-        this.$refs.pulldownRef.hidePanel();
-      }
-    },
-    /**
-     * 输入库输入事件
-     */
-    inputKeyupEvent(event) {
-      //好像ok
-      if (!this.immediate && event.keyCode !== 13) {
-        console.debug("davistest");
-      } else {
-        if (this.inputTimeout) {
-          clearTimeout(this.inputTimeout);
-        }
-        let vm = this;
-        this.inputTimeout = setTimeout(() => {
-          //判断面板是否打开
-          if (vm.$refs.pulldownRef.isPanelVisible() === false) {
-            vm.$refs.pulldownRef.showPanel();
-          }
-          vm.searchData();
-        }, 500);
-      }
-    },
-    /**
-     * 网格列选中事件
-     */
-    gridCellClick({ row, column }) {
-      if (row.sysRepeat === true) {
-        return;
+        type: 'seq',
+        fixed: 'left',
+        width: 50
+      })
+  
+      if (this.isMultiSelect === true) {
+        this.internalColumns.push({
+          type: 'checkbox',
+          fixed: 'left',
+          width: 40
+        })
       }
-      if (column.type === "seq" || column.type === "checkbox") {
-        return;
+  
+      for (let i = 0; i < this.columns.length; i++) {
+        this.fetchFields = this.fetchFields + this.columns[i].field + ','
+        this.columns[i]['params'] = {
+          dataSource: []
+        }
+        if (this.columns[i].dataSource) {
+          this.columns[i]['params'].dataSource = this.columns[i].dataSource
+        }
+        if (!this.columns[i].width) {
+          this.columns[i]['width'] = 100
+        }
+        if (this.columns[i].isCheckbox === true) {
+          this.columns[i]['type'] = 'checkbox'
+          // colInfo['field'] = 'matCode'
+        }
+        // if(this.columns[i].formatter){
+        //   this.columns[i].formatter=
+  
+        // }
+        this.internalColumns.push(this.columns[i])
+        if (this.columns[i].filter === true) {
+          this.filterCols.push(this.columns[i])
+        }
       }
-      this.isInputChanged = false;
-      this.setLinkValue(row, this.row);
-      this.$emit("selectChanged", row);
-      this.$refs.pulldownRef.hidePanel();
     },
-    setLinkValue(pulldownRow, oriRow) {
-      for (let i = 0; i < this.internalColumns.length; i++) {
-        if (this.internalColumns[i].linkField) {
-          let tempLinkFields = this.internalColumns[i].linkField.split(".");
-          let tempRow = oriRow;
-          //  for(let j=0;j<tempLinkFields.length;j++){
-          //     let tempField = tempLinkFields[j]
-          //     //如果赋值的属性不存在数据集中，就忽略更新，防止修改后网格单元格值不更细
-          //     if (!(tempField in tempRow)) {
-          //       this.$antwarning(
-          //         '赋值字段[' + this.internalColumns[i].linkField + ']不存在'
-          //       )
-          //       break
-          //     }
-          //     if(j===tempLinkFields.length-1){
-          //       if (pulldownRow === null) {
-          //         if (this.internalColumns[i].nullClear === false) {
-          //           //是否空值清除数据，用于可选可输入的控件
-          //           continue
-          //         }
-          //         this.$set(tempRow, tempField, null)
-          //         } else {
-          //           this.$set(
-          //             tempRow,
-          //             tempField,
-          //             this.getLinkValue(tempField, pulldownRow)
-          //           )
-          //         }
-          //     }else{
-          //       tempRow = tempRow[tempField]
-          //     }
-          //  }
-
-          //如果赋值的属性不存在数据集中，就忽略更新，防止修改后网格单元格值不更细
-          if (!(this.internalColumns[i].linkField in oriRow)) {
-            this.$antwarning(
-              "赋值字段[" + this.internalColumns[i].linkField + "]不存在"
-            );
-            continue;
+    methods: {
+      gridRowStyle(scope) {
+        if (scope.row.sysRepeat === true) {
+          return 'row--pending'
+        }
+        // if(scope.row.)
+      },
+      clearInputValue() {
+        if (this.isInputChanged === true) {
+          this.setLinkValue(null, this.row)
+          this.$emit('selectChanged', null)
+        }
+      },
+      routeLinkClick() {
+        //首先需要判断是否有权限
+        // let treeModule = XEUtils.findTree(
+        //   this.$store.getters.addRouters,
+        //   item => item.name === this.route.name
+        // )
+        // if (!treeModule) {
+        //   this.$antwarning('没有权限')
+        //   return
+        // }
+        this.$router.pushRoute({
+          name: this.route.name,
+          query: { id: this.row[this.route.field] }
+        })
+      },
+      /**
+       * 输入框改变事件
+       */
+      inputChangeEvent(event) {
+        this.isInputChanged = true
+        if (event.type === 'click' && event.pointerType === 'mouse') {
+          //点击了清空按钮
+          this.$nextTick(() => {
+            this.clearInputValue()
+            this.inputClickEvent(null)
+          })
+        }
+      },
+      inputBlurEvent(event) {},
+      /**
+       * 输入框获取焦点事件
+       */
+      inputFocusEvent(event) {
+        event.currentTarget.select()
+        // this.$refs.pulldownRef.showPanel()
+        // this.searchData()
+      },
+      /**
+       * Tab键隐藏面板
+       */
+      inputKeydownEvent(event) {
+        if (event.keyCode === 9) {
+          //tab事件
+          this.$refs.pulldownRef.hidePanel()
+          this.clearInputValue()
+        }
+      },
+      inputClickEvent(event) {
+        if (this.$refs.pulldownRef.isPanelVisible() === false) {
+          this.$refs.pulldownRef.showPanel()
+          this.searchData()
+        } else {
+          this.$refs.pulldownRef.hidePanel()
+        }
+      },
+      /**
+       * 输入库输入事件
+       */
+      inputKeyupEvent(event) {
+        //好像ok
+        if (!this.immediate && event.keyCode !== 13) {
+            console.debug('davistest')
+        } else {
+          if (this.inputTimeout) {
+            clearTimeout(this.inputTimeout)
           }
-          if (pulldownRow === null) {
-            if (this.internalColumns[i].nullClear === false) {
-              //是否空值清楚数据，用于可选可输入的控件
-              continue;
+          let vm = this
+          this.inputTimeout = setTimeout(() => {
+            //判断面板是否打开
+            if (vm.$refs.pulldownRef.isPanelVisible() === false) {
+              vm.$refs.pulldownRef.showPanel()
             }
-            this.$set(oriRow, this.internalColumns[i].linkField, null);
-          } else {
-            this.$set(
-              oriRow,
-              this.internalColumns[i].linkField,
-              this.getLinkValue(this.internalColumns[i].field, pulldownRow)
-            );
-          }
+            vm.searchData()
+          }, 500)
         }
-      }
-    },
-    getLinkValue(field, row) {
-      let linkField = field.split(".");
-      if (linkField.length > 1) {
-        let fieldValue = row;
-        for (let i = 0; i < linkField.length; i++) {
-          if (
-            fieldValue[linkField[i]] === undefined ||
-            fieldValue[linkField[i]] === null
-          ) {
-            return null;
+      },
+      /**
+       * 网格列选中事件
+       */
+      gridCellClick({ row, column }) {
+        if (row.sysRepeat === true) {
+          return
+        }
+        if (column.type === 'seq' || column.type === 'checkbox') {
+          return
+        }
+        this.isInputChanged = false
+        this.setLinkValue(row, this.row)
+        this.$emit('selectChanged', row)
+        this.$refs.pulldownRef.hidePanel()
+      },
+      setLinkValue(pulldownRow, oriRow) {
+        for (let i = 0; i < this.internalColumns.length; i++) {
+          if (this.internalColumns[i].linkField) {
+            let tempLinkFields = this.internalColumns[i].linkField.split('.')
+            let tempRow = oriRow
+            //  for(let j=0;j<tempLinkFields.length;j++){
+            //     let tempField = tempLinkFields[j]
+            //     //如果赋值的属性不存在数据集中，就忽略更新，防止修改后网格单元格值不更细
+            //     if (!(tempField in tempRow)) {
+            //       this.$antwarning(
+            //         '赋值字段[' + this.internalColumns[i].linkField + ']不存在'
+            //       )
+            //       break
+            //     }
+            //     if(j===tempLinkFields.length-1){
+            //       if (pulldownRow === null) {
+            //         if (this.internalColumns[i].nullClear === false) {
+            //           //是否空值清除数据，用于可选可输入的控件
+            //           continue
+            //         }
+            //         this.$set(tempRow, tempField, null)
+            //         } else {
+            //           this.$set(
+            //             tempRow,
+            //             tempField,
+            //             this.getLinkValue(tempField, pulldownRow)
+            //           )
+            //         }
+            //     }else{
+            //       tempRow = tempRow[tempField]
+            //     }
+            //  }
+  
+            //如果赋值的属性不存在数据集中，就忽略更新，防止修改后网格单元格值不更细
+            if (!(this.internalColumns[i].linkField in oriRow)) {
+              this.$antwarning(
+                '赋值字段[' + this.internalColumns[i].linkField + ']不存在'
+              )
+              continue
+            }
+            if (pulldownRow === null) {
+              if (this.internalColumns[i].nullClear === false) {
+                //是否空值清楚数据，用于可选可输入的控件
+                continue
+              }
+              this.$set(oriRow, this.internalColumns[i].linkField, null)
+            } else {
+              this.$set(
+                oriRow,
+                this.internalColumns[i].linkField,
+                this.getLinkValue(this.internalColumns[i].field, pulldownRow)
+              )
+            }
           }
-          fieldValue = fieldValue[linkField[i]];
         }
-        return fieldValue;
-      }
-      return row[field];
-    },
-    /**
-     * 左下角按钮点击事件
-     */
-    pagerBtnClick(btn) {
-      this.$refs.pupupAddView.show();
-      // this.$emit('pulldownBtnClick', btn)
-      this.$refs.pulldownRef.hidePanel();
-    },
-    // 多选内容时，若数据不满足条件，不可选中
-    checkMethod({ row }) {
-      if (row.sysRepeat) {
-        return false;
-      }
-      return true;
-    },
-    /**
-     * 确认多选
-     */
-    multiSelectConfirm() {
-      this.isInputChanged = false;
-      this.$emit(
-        "confirmMultiSelect",
-        this,
-        this.$refs.pupupGridView.getCheckboxRecords(true)
-      );
-      this.$refs.pulldownRef.hidePanel();
-    },
-    popupSaveAfter(pupupAddRowInfo) {
-      let postData = {
-        fields: null,
-        begin: 1,
-        size: 1,
-        expression: {},
-        sorts: "",
-      };
-      let tempKeyExp = XEUtils.find(
-        this.internalColumns,
-        (item) => item.isKey === true
-      );
-      postData.expression = {
-        operator: "and",
-        expressions: [
-          {
-            operator: "and",
-            expressions: [
-              {
-                field: tempKeyExp.field,
-                operator: "EQ",
-                value: pupupAddRowInfo["id"],
-              },
-            ],
-          },
-        ],
-      };
-      let vm = this;
-      let tempApi = this.getPostApi(postData);
-      request({
-        url: tempApi,
-        method: "post",
-        data: postData,
-      })
-        .then((responseData) => {
-          if (responseData.content.length > 0) {
-            vm.setLinkValue(responseData.content[0], vm.row);
-            vm.$emit("selectChanged", responseData.content[0]);
+      },
+      getLinkValue(field, row) {
+        let linkField = field.split('.')
+        if (linkField.length > 1) {
+          let fieldValue = row
+          for (let i = 0; i < linkField.length; i++) {
+            if (
+              fieldValue[linkField[i]] === undefined ||
+              fieldValue[linkField[i]] === null
+            ) {
+              return null
+            }
+            fieldValue = fieldValue[linkField[i]]
           }
+          return fieldValue
+        }
+        return row[field]
+      },
+      /**
+       * 左下角按钮点击事件
+       */
+      pagerBtnClick(btn) {
+        this.$refs.pupupAddView.show()
+        // this.$emit('pulldownBtnClick', btn)
+        this.$refs.pulldownRef.hidePanel()
+      },
+      // 多选内容时，若数据不满足条件，不可选中
+      checkMethod({ row }) {
+        if (row.sysRepeat) {
+          return false
+        }
+        return true
+      },
+      /**
+       * 确认多选
+       */
+      multiSelectConfirm() {
+        this.isInputChanged = false
+        this.$emit(
+          'confirmMultiSelect',
+          this,
+          this.$refs.pupupGridView.getCheckboxRecords(true)
+        )
+        this.$refs.pulldownRef.hidePanel()
+      },
+      popupSaveAfter(pupupAddRowInfo) {
+        let postData = {
+          fields: null,
+          begin: 1,
+          size: 1,
+          expression: {},
+          sort: ''
+        }
+        let tempKeyExp = XEUtils.find(
+          this.internalColumns,
+          item => item.isKey === true
+        )
+        postData.expression = {
+          operator: 'and',
+          expressions: [
+            {
+              operator: 'and',
+              expressions: [
+                {
+                  field: tempKeyExp.field,
+                  operator: 'EQ',
+                  value: pupupAddRowInfo['id']
+                }
+              ]
+            }
+          ]
+        }
+        let vm = this
+        let tempApi = this.getPostApi(postData)
+        request({
+          url: tempApi,
+          method: 'post',
+          data: postData
         })
-        .catch((error) => {
-          console.error(error);
-        })
-        .finally(() => {});
-    },
-    /**
-     * 分页改变事件
-     */
-    pageChangeEvent({ currentPage, pageSize }) {
-      this.gridPagerConfig.currentPage = currentPage;
-      this.gridPagerConfig.pageSize = pageSize;
-      this.searchData();
-    },
-    /**
-     * 面板隐藏事件
-     */
-    pullDownHideEvent({ $event }) {
-      this.clearInputValue();
-    },
-    /**
-     * 查询数据
-     */
-    searchData() {
-      if (this.isLocalData === true) {
-        let tempSearch = {
-          value: this.currentValue,
-          dataSource: [],
-        };
-        this.$emit("preSearch", tempSearch);
-        this.searchRows = tempSearch.dataSource;
-        this.gridPagerConfig.total = tempSearch.dataSource.length;
-        return;
-      }
-
-      let tempExp = {
-        operator: "or",
-        expressions: [],
-      };
-      if (this.isOld === true) {
-        tempExp = "";
-      }
-      if (this.currentValue) {
-        for (let i = 0; i < this.filterCols.length; i++) {
-          if (this.isOld === true) {
-            tempExp =
-              tempExp +
-              this.filterCols[i].field +
-              '.contains("' +
-              this.currentValue +
-              '")';
-            if (i < this.filterCols.length - 1) {
-              tempExp = tempExp + " or ";
+          .then(responseData => {
+            if (responseData.content.length > 0) {
+              vm.setLinkValue(responseData.content[0], vm.row)
+              vm.$emit('selectChanged', responseData.content[0])
             }
-          } else {
-            if (this.filterCols[i].controlType == "number") {
-              tempExp.expressions.push({
-                field: this.filterCols[i].field,
-                operator: "EQ",
-                value: Number(this.currentValue),
-              });
+          })
+          .catch(error => {
+            console.error(error)
+          })
+          .finally(() => {})
+      },
+      /**
+       * 分页改变事件
+       */
+      pageChangeEvent({ currentPage, pageSize }) {
+        this.gridPagerConfig.currentPage = currentPage
+        this.gridPagerConfig.pageSize = pageSize
+        this.searchData()
+      },
+      /**
+       * 面板隐藏事件
+       */
+      pullDownHideEvent({ $event }) {
+        this.clearInputValue()
+      },
+      /**
+       * 查询数据
+       */
+      searchData() {
+        if (this.isLocalData === true) {
+          let tempSearch = {
+            value: this.currentValue,
+            dataSource: []
+          }
+          this.$emit('preSearch', tempSearch)
+          this.searchRows = tempSearch.dataSource
+          this.gridPagerConfig.total = tempSearch.dataSource.length
+          return
+        }
+  
+        let tempExp = {
+          operator: 'or',
+          expressions: []
+        }
+        if (this.isOld === true) {
+          tempExp = ''
+        }
+        if (this.currentValue) {
+          for (let i = 0; i < this.filterCols.length; i++) {
+            if (this.isOld === true) {
+              tempExp =
+                tempExp +
+                this.filterCols[i].field +
+                '.contains("' +
+                this.currentValue +
+                '")'
+              if (i < this.filterCols.length - 1) {
+                tempExp = tempExp + ' or '
+              }
             } else {
-              tempExp.expressions.push({
-                field: this.filterCols[i].field,
-                operator: "CO",
-                value: this.currentValue,
-              });
+              if (this.filterCols[i].controlType == 'number') {
+                tempExp.expressions.push({
+                  field: this.filterCols[i].field,
+                  operator: 'EQ',
+                  value: Number(this.currentValue)
+                })
+              } else {
+                tempExp.expressions.push({
+                  field: this.filterCols[i].field,
+                  operator: 'CO',
+                  value: this.currentValue
+                })
+              }
             }
           }
         }
-      }
-      if (this.isOld === true && tempExp.length > 0) {
-        tempExp = "(" + tempExp + ")";
-      }
-
-      if (this.defaultExpression) {
-        let tempDefault = replaceParamString(
-          this.defaultExpression,
-          this.formRow,
-          this.$store.getters.moduleSelectItems[this.$route.meta.moduleId]
-        );
-
-        if (tempExp) {
-          tempExp = tempExp + " and (" + tempDefault + ")";
-        } else {
-          tempExp = tempDefault;
+        if (this.isOld === true && tempExp.length > 0) {
+          tempExp = '(' + tempExp + ')'
         }
-      }
-
-      let postExpression = {
-        field: this.field,
-        expression: tempExp,
-        extendParams: {},
-      };
-      let repeatRowInfo = {
-        field: "",
-        values: [],
-      };
-      //查询之前从外部组件构造其他的条件
-      this.$emit("preSearch", postExpression, repeatRowInfo);
-      let postData = {
-        fields: this.fetchFields,
-        begin:
-          (this.gridPagerConfig.currentPage - 1) *
-            this.gridPagerConfig.pageSize +
-          1,
-        size: this.gridPagerConfig.pageSize,
-        expression: postExpression.expression,
-        sorts: this.sorts,
-        extendParams: postExpression.extendParams,
-      };
-      console.log(postData.sorts);
-      let tempApi = this.getPostApi(postData);
-
-      // let tempApi = this.api
-      // if (this.api.indexOf('?') > 0) {
-      //   tempApi = this.api.substring(0, this.api.indexOf('?'))
-      //   let tempExtenParams = this.api.substring(this.api.indexOf('?') + 1)
-      //   tempExtenParams = replaceParam(tempExtenParams, this.formRow)
-      //   let tempSplitParams = tempExtenParams.split('&')
-      //   for (let i = 0; i < tempSplitParams.length; i++) {
-      //     let tempSplitValue = tempSplitParams[i].split('=')
-      //     this.$set(
-      //       postData.extendParams,
-      //       tempSplitValue[0],
-      //       tempSplitValue[1]
-      //     )
-      //   }
-      // }
-      let vm = this;
-      vm.gridLoading = true;
-      request({
-        url: tempApi,
-        method: "post",
-        data: postData,
-      })
-        .then((responseData) => {
-          if (vm.isOld === true) {
-            vm.searchRows = responseData.data;
-            vm.gridPagerConfig.total = responseData.extData.totalRows;
+  
+        if (this.defaultExpression) {
+          let tempDefault = replaceParamString(
+            this.defaultExpression,
+            this.formRow,
+            this.$store.getters.moduleSelectItems[this.$route.meta.moduleId]
+          )
+  
+          if (tempExp) {
+            tempExp = tempExp + ' and (' + tempDefault + ')'
           } else {
-            vm.searchRows = responseData.content;
-            vm.gridPagerConfig.total = responseData.otherContent.totalRows;
+            tempExp = tempDefault
           }
-          if (repeatRowInfo.field) {
-            //设置重复值
-            XEUtils.arrayEach(vm.searchRows, (item) => {
-              if (
-                XEUtils.arrayIndexOf(
-                  repeatRowInfo.values,
-                  item[repeatRowInfo.field]
-                ) > -1
-              ) {
-                item["sysRepeat"] = true;
-              } else {
-                item["sysRepeat"] = false;
-              }
-            });
-          }
-          // 设置字段sysRepeat后，所定字段的值全部相同则不可选择
-          let fieldNames = vm.columns
-            .filter((x) => x.sysRepeat)
-            .map((y) => {
-              return {
-                field: y.field,
-                linkField: y.linkField,
-              };
-            });
-          if (fieldNames.length) {
-            vm.searchRows.forEach((info) => {
-              vm.propTableData.forEach((item) => {
-                // 接口字段可能和表字段field不一致，linkField一致
-                let arr = [];
-                for (let j = 0; j < fieldNames.length; j++) {
-                  if (
-                    info[fieldNames[j].field] == item[fieldNames[j].linkField]
-                  ) {
-                    arr.push(true);
-                  }
+        }
+  
+        let postExpression = {
+          field: this.field,
+          expression: tempExp,
+          extendParams: {}
+        }
+        let repeatRowInfo = {
+          field: '',
+          values: []
+        }
+        //查询之前从外部组件构造其他的条件
+        this.$emit('preSearch', postExpression, repeatRowInfo)
+        let postData = {
+          fields: this.fetchFields,
+          begin:
+            (this.gridPagerConfig.currentPage - 1) *
+              this.gridPagerConfig.pageSize +
+            1,
+          size: this.gridPagerConfig.pageSize,
+          expression: postExpression.expression,
+          sort: '',
+          extendParams: postExpression.extendParams
+        }
+  
+        let tempApi = this.getPostApi(postData)
+  
+        // let tempApi = this.api
+        // if (this.api.indexOf('?') > 0) {
+        //   tempApi = this.api.substring(0, this.api.indexOf('?'))
+        //   let tempExtenParams = this.api.substring(this.api.indexOf('?') + 1)
+        //   tempExtenParams = replaceParam(tempExtenParams, this.formRow)
+        //   let tempSplitParams = tempExtenParams.split('&')
+        //   for (let i = 0; i < tempSplitParams.length; i++) {
+        //     let tempSplitValue = tempSplitParams[i].split('=')
+        //     this.$set(
+        //       postData.extendParams,
+        //       tempSplitValue[0],
+        //       tempSplitValue[1]
+        //     )
+        //   }
+        // }
+        let vm = this
+        vm.gridLoading = true
+        request({
+          url: tempApi,
+          method: 'post',
+          data: postData
+        })
+          .then(responseData => {
+            if (vm.isOld === true) {
+              vm.searchRows = responseData.data
+              vm.gridPagerConfig.total = responseData.extData.totalRows
+            } else {
+              vm.searchRows = responseData.content
+              vm.gridPagerConfig.total = responseData.otherContent.totalRows
+            }
+            if (repeatRowInfo.field) {
+              //设置重复值
+              XEUtils.arrayEach(vm.searchRows, item => {
+                if (
+                  XEUtils.arrayIndexOf(
+                    repeatRowInfo.values,
+                    item[repeatRowInfo.field]
+                  ) > -1
+                ) {
+                  item['sysRepeat'] = true
+                } else {
+                  item['sysRepeat'] = false
                 }
-                if (fieldNames.length === arr.length) {
-                  info.sysRepeat = true;
+              })
+            }
+            // 设置字段sysRepeat后，所定字段的值全部相同则不可选择
+            let fieldNames = vm.columns.filter(x => x.sysRepeat)
+              .map(y=> {
+                return {
+                  field: y.field,
+                  linkField: y.linkField,
                 }
-              });
-            });
+              })
+            if (fieldNames.length) {
+              vm.searchRows.forEach(info => {
+                vm.propTableData.forEach(item=>{
+                  // 接口字段可能和表字段field不一致，linkField一致
+                  let arr= []
+                  for(let j=0;j<fieldNames.length;j++){
+                    if(info[fieldNames[j].field] == item[fieldNames[j].linkField]){
+                      arr.push(true)
+                    }
+                  }
+                  if(fieldNames.length === arr.length){
+                    info.sysRepeat = true
+                  }
+                })
+              })
+            }
+          })
+          .catch(error => {
+            console.error(error)
+          })
+          .finally(() => {
+            vm.gridLoading = false
+          })
+      },
+      getPostApi(postData) {
+        let tempApi = this.api
+        if (this.api.indexOf('?') > 0) {
+          tempApi = this.api.substring(0, this.api.indexOf('?'))
+          let tempExtenParams = this.api.substring(this.api.indexOf('?') + 1)
+          tempExtenParams = replaceParam(tempExtenParams, this.formRow)
+          let tempSplitParams = tempExtenParams.split('&')
+          for (let i = 0; i < tempSplitParams.length; i++) {
+            let tempSplitValue = tempSplitParams[i].split('=')
+            this.$set(
+              postData.extendParams,
+              tempSplitValue[0],
+              tempSplitValue[1]
+            )
           }
-        })
-        .catch((error) => {
-          console.error(error);
-        })
-        .finally(() => {
-          vm.gridLoading = false;
-        });
-    },
-    getPostApi(postData) {
-      let tempApi = this.api;
-      if (this.api.indexOf("?") > 0) {
-        tempApi = this.api.substring(0, this.api.indexOf("?"));
-        let tempExtenParams = this.api.substring(this.api.indexOf("?") + 1);
-        tempExtenParams = replaceParam(tempExtenParams, this.formRow);
-        let tempSplitParams = tempExtenParams.split("&");
-        for (let i = 0; i < tempSplitParams.length; i++) {
-          let tempSplitValue = tempSplitParams[i].split("=");
-          this.$set(
-            postData.extendParams,
-            tempSplitValue[0],
-            tempSplitValue[1]
-          );
         }
+        return tempApi
       }
-      return tempApi;
-    },
-    sortChange({ column, property, order, sortBy, sortList, $event }) {
-      let currentSort = sortList.map((x) => {
-        return [x.field, x.order];
-      });
-      this.sorts = currentSort;
-      this.searchData();
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.pulldown-grid {
-  min-width: 600px;
-  width: auto;
-  height: 350px;
-  background-color: #fff;
-  box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
-}
-
-.d-grid-control {
-  width: 100%;
-  height: 30px;
-}
-</style>
-
+    }
+  }
+  </script>
+  
+  <style lang="scss" scoped>
+  .pulldown-grid {
+    min-width: 600px;
+    width: auto;
+    height: 350px;
+    background-color: #fff;
+    box-shadow: 0 0 6px 2px rgba(0, 0, 0, 0.1);
+  }
+  
+  .d-grid-control {
+    width: 100%;
+    height: 30px;
+  }
+  </style>
+  
 
-<style lang="less">
-@import "../../styles/default.less";
+  <style lang="less">
+@import  '../../styles/default.less';
 </style>