eoss-ui 0.8.41 → 0.8.42

package/packages/selector/src/main.vue

@@ -1,12 +1,17 @@
 <template>
   <div
+    @click.stop="handleClick"
     v-if="isRender"
     class="es-selector"
     ref="esSelector"
-    :class="{ 'is-button': button && !readonly }"
+    :class="{ 'is-button': button && !isReadonly }"
   >
     <template v-if="form">
-      <el-button v-if="button && !readonly" v-bind="button" @click="openDialog">
+      <el-button
+        v-if="button && !isReadonly"
+        v-bind="button"
+        @click.stop="openDialog"
+      >
         <slot>
           <es-icon v-if="icon" :contents="icon"></es-icon>
           <template v-else>选择</template>
@@ -14,10 +19,10 @@
       </el-button>
       <template v-else>
         <el-autocomplete
-          v-if="!(multiple && readonly)"
+          v-if="!(multiple && isReadonly)"
           v-model="selectedLabel"
           value-key="showname"
-          :readonly="readonly"
+          :readonly="isReadonly || !this.isSearch"
           :fetch-suggestions="search"
           :placeholder="placeholder"
           :trigger-on-focus="false"
@@ -26,7 +31,7 @@
           @change="handleChange"
         >
           <el-button
-            v-if="!readonly"
+            v-if="!isReadonly"
             slot="suffix"
             type="text"
             class="es-selector-btn"
@@ -38,12 +43,14 @@
           v-if="multiple"
           ref="tags"
           class="es-select__tags"
-          :class="{ 'is-edit': !readonly, 'is-show': selected.length }"
+          :class="{ 'is-edit': !isReadonly, 'is-show': selected.length }"
         >
           <el-tag
             v-for="(item, index) in selected"
             :key="getValueKey(item)"
-            :closable="!selectorDisabled && !readonly && selected.length > min"
+            :closable="
+              !selectorDisabled && !isReadonly && selected.length > min
+            "
             type="info"
             disable-transitions
             @close="deleteTag($event, item, index)"
@@ -54,7 +61,7 @@
       </template>
     </template>
     <es-dialog
-      v-if="!readonly"
+      v-if="!isReadonly"
       :title="title"
       :visible.sync="visible"
       :width="width"
@@ -237,7 +244,10 @@ export default {
       default: true
     },
     //弹窗关闭时是否销毁子组件
-    destroyOnClose: Boolean,
+    destroyOnClose: {
+      type: Boolean,
+      default: true
+    },
     //树结构标题
     treeTitle: String,
     //是否显示切换按钮
@@ -245,7 +255,12 @@ export default {
       type: Boolean,
       default: true
     },
-    selection: [Array, String]
+    selection: [Array, String],
+    //输入框是否可搜索
+    isSearch: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -264,6 +279,9 @@ export default {
     };
   },
   computed: {
+    isReadonly() {
+      return this.readonly || (this.elForm || {}).readonly;
+    },
     isRender() {
       let useCaseCodes = util.getStorage('useCaseCodes');
       if (useCaseCodes && this.useCaseCode) {
@@ -352,11 +370,6 @@ export default {
           (this.minWidth = this.$refs.reference.$el.children[0].offsetWidth);
       });
     }
-    if (this.$refs.openDialog) {
-      this.$refs.openDialog.$el.parentNode.addEventListener('click', () => {
-        this.openDialog();
-      });
-    }
   },
   methods: {
     getSysParam() {
@@ -388,8 +401,14 @@ export default {
     getValueKey(obj) {
       return util.isObject(obj) ? obj[this.valueKey] : obj;
     },
+    handleClick() {
+      console.log('handleClick');
+      if (!this.isSearch) {
+        this.openDialog();
+      }
+    },
     openDialog() {
-      if (!this.selectorDisabled && !this.readonly && this.select) {
+      if (!this.selectorDisabled && !this.isReadonly && this.select) {
         this.visible = true;
       }
     },
@@ -573,7 +592,7 @@ export default {
           }
         }
         if (height) {
-          if (this.readonly) {
+          if (this.isReadonly) {
             this.$refs.reference.style.height = height;
           } else {
             let inputChildNodes = this.$refs.reference.$el.childNodes;

package/packages/selector-panel/src/selection.vue

@@ -1,174 +1,174 @@
-<template>
-  <div class="es-selection">
-    <el-scrollbar class="es-scrollbar">
-      <el-radio-group
-        v-if="!multiple"
-        v-bind="$attrs"
-        size="small"
-        v-on="$listeners"
-        v-model="selectes"
-      >
-        <el-radio
-          v-for="(item, index) in data"
-          :key="index"
-          v-show="item.disabled ? showDisabled : true"
-          v-bind="getprops($attrs, item)"
-          :label="isObject || typeof item == 'string' ? item : item[valueKey]"
-          :disabled="isDisabled(item)"
-          :class="{ 'es-radio-delete': genre === 'delete' }"
-          :value-key="valueKey"
-          :tooltip="showTooltip ? item[tipKey] : undefined"
-        >
-          {{ typeof item == 'string' ? item : getLabel(item) }}</el-radio
-        >
-      </el-radio-group>
-      <el-checkbox-group
-        v-else
-        v-bind="$attrs"
-        :max="max"
-        size="small"
-        v-on="$listeners"
-        v-model="selectes"
-        ref="sortable"
-      >
-        <el-checkbox
-          v-for="(item, index) in data"
-          :key="index"
-          v-show="item.disabled ? showDisabled : true"
-          v-bind="getprops($attrs, item)"
-          :label="isObject || typeof item == 'string' ? item : item[valueKey]"
-          :disabled="isDisabled(item)"
-          :class="{ 'es-checkbox-delete': genre === 'delete' }"
-          :value-key="valueKey"
-          :tooltip="showTooltip ? item[tipKey] : undefined"
-        >
-          {{ typeof item == 'string' ? item : getLabel(item) }}
-          <i v-show="genre === 'delete'" class="el-icon-circle-close"></i>
-        </el-checkbox>
-      </el-checkbox-group>
-    </el-scrollbar>
-  </div>
-</template>
-<script>
-import Sortable from 'sortablejs';
-import util from 'eoss-ui/src/utils/util.js';
-export default {
-  name: 'Selection',
-  props: {
-    value: [String, Array, Object],
-    showDisabled: {
-      type: Boolean,
-      default: true
-    },
-    genre: String,
-    valueKey: {
-      type: String,
-      default: 'showid'
-    },
-    labelKey: {
-      type: String,
-      default: 'showname'
-    },
-    tipKey: {
-      type: String,
-      default: 'pathname'
-    },
-    showTooltip: {
-      type: Boolean,
-      default: true
-    },
-    valueType: {
-      type: String,
-      default: 'object',
-      validator: function (value) {
-        return ['string', 'object'].includes(value);
-      }
-    },
-    data: {
-      type: Array,
-      default() {
-        return [];
-      }
-    },
-    multiple: {
-      type: Boolean,
-      default: true
-    },
-    max: Number,
-    mix: Boolean,
-    disableds: {
-      type: Array,
-      default() {
-        return [];
-      }
-    }
-  },
-  data() {
-    return {};
-  },
-  computed: {
-    isObject() {
-      if (
-        this.selectes &&
-        Array.isArray(this.selectes) &&
-        this.selectes.length > 0 &&
-        util.isObject(this.selectes[0])
-      ) {
-        return true;
-      } else {
-        if (this.valueType === 'object') {
-          return true;
-        } else {
-          return false;
-        }
-      }
-    },
-    selectes: {
-      get() {
-        if (!this.multiple && this.value && this.value.length) {
-          return this.value[0];
-        }
-        return this.value;
-      },
-      set(val) {
-        return val;
-      }
-    }
-  },
-  mounted() {
-    if (this.multiple && this.genre === 'delete') {
-      this._sortable = new Sortable(this.$refs.sortable.$el, {
-        animation: 150,
-        onUpdate: this.handleSort
-      });
-    }
-  },
-  methods: {
-    getLabel(res) {
-      return res[this.labelKey]
-        ? res[this.labelKey]
-        : res.label || res[this.valueKey];
-    },
-    handleSort(res) {
-      this.$emit('sort', res);
-    },
-    getprops(attrs, res) {
-      return util.isObject(res) ? { ...attrs, ...res } : attrs;
-    },
-    isDisabled(res) {
-      if (typeof res == 'string') {
-        return false;
-      }
-      if (this.disableds && this.disableds.length > 0) {
-        if (this.disableds.includes(res[this.valueKey])) {
-          return true;
-        }
-      }
-      return res.disabled;
-    }
-  },
-  beforeDestroy() {
-    if (this._sortable !== undefined) this._sortable.destroy();
-  }
-};
-</script>
+<template>
+  <div class="es-selection">
+    <el-scrollbar class="es-scrollbar">
+      <el-radio-group
+        v-if="!multiple"
+        v-bind="$attrs"
+        size="small"
+        v-on="$listeners"
+        v-model="selectes"
+      >
+        <el-radio
+          v-for="(item, index) in data"
+          :key="index"
+          v-show="item.disabled ? showDisabled : true"
+          v-bind="getprops($attrs, item)"
+          :label="isObject || typeof item == 'string' ? item : item[valueKey]"
+          :disabled="isDisabled(item)"
+          :class="{ 'es-radio-delete': genre === 'delete' }"
+          :value-key="valueKey"
+          :tooltip="showTooltip ? item[tipKey] : undefined"
+        >
+          {{ typeof item == 'string' ? item : getLabel(item) }}</el-radio
+        >
+      </el-radio-group>
+      <el-checkbox-group
+        v-else
+        v-bind="$attrs"
+        :max="max"
+        size="small"
+        v-on="$listeners"
+        v-model="selectes"
+        ref="sortable"
+      >
+        <el-checkbox
+          v-for="(item, index) in data"
+          :key="index"
+          v-show="item.disabled ? showDisabled : true"
+          v-bind="getprops($attrs, item)"
+          :label="isObject || typeof item == 'string' ? item : item[valueKey]"
+          :disabled="isDisabled(item)"
+          :class="{ 'es-checkbox-delete': genre === 'delete' }"
+          :value-key="valueKey"
+          :tooltip="showTooltip ? item[tipKey] : undefined"
+        >
+          {{ typeof item == 'string' ? item : getLabel(item) }}
+          <i v-show="genre === 'delete'" class="el-icon-circle-close"></i>
+        </el-checkbox>
+      </el-checkbox-group>
+    </el-scrollbar>
+  </div>
+</template>
+<script>
+import Sortable from 'sortablejs';
+import util from 'eoss-ui/src/utils/util.js';
+export default {
+  name: 'Selection',
+  props: {
+    value: [String, Array, Object],
+    showDisabled: {
+      type: Boolean,
+      default: true
+    },
+    genre: String,
+    valueKey: {
+      type: String,
+      default: 'showid'
+    },
+    labelKey: {
+      type: String,
+      default: 'showname'
+    },
+    tipKey: {
+      type: String,
+      default: 'pathname'
+    },
+    showTooltip: {
+      type: Boolean,
+      default: true
+    },
+    valueType: {
+      type: String,
+      default: 'object',
+      validator: function (value) {
+        return ['string', 'object'].includes(value);
+      }
+    },
+    data: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
+    multiple: {
+      type: Boolean,
+      default: true
+    },
+    max: Number,
+    mix: Boolean,
+    disableds: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
+  },
+  data() {
+    return {};
+  },
+  computed: {
+    isObject() {
+      if (
+        this.selectes &&
+        Array.isArray(this.selectes) &&
+        this.selectes.length > 0 &&
+        util.isObject(this.selectes[0])
+      ) {
+        return true;
+      } else {
+        if (this.valueType === 'object') {
+          return true;
+        } else {
+          return false;
+        }
+      }
+    },
+    selectes: {
+      get() {
+        if (!this.multiple && this.value && this.value.length) {
+          return this.value[0];
+        }
+        return this.value;
+      },
+      set(val) {
+        return val;
+      }
+    }
+  },
+  mounted() {
+    if (this.multiple && this.genre === 'delete') {
+      this._sortable = new Sortable(this.$refs.sortable.$el, {
+        animation: 150,
+        onUpdate: this.handleSort
+      });
+    }
+  },
+  methods: {
+    getLabel(res) {
+      return res[this.labelKey]
+        ? res[this.labelKey]
+        : res.label || res[this.valueKey];
+    },
+    handleSort(res) {
+      this.$emit('sort', res);
+    },
+    getprops(attrs, res) {
+      return util.isObject(res) ? { ...attrs, ...res } : attrs;
+    },
+    isDisabled(res) {
+      if (typeof res == 'string') {
+        return false;
+      }
+      if (this.disableds && this.disableds.length > 0) {
+        if (this.disableds.includes(res[this.valueKey])) {
+          return true;
+        }
+      }
+      return res.disabled;
+    }
+  },
+  beforeDestroy() {
+    if (this._sortable !== undefined) this._sortable.destroy();
+  }
+};
+</script>