three-trees-ui 1.1.2 → 1.1.4

package/packages/OrgSelector/src/main.vue

@@ -16,35 +16,23 @@
       @click="showDialog"
     >
       <div
-        ref="tagSpans"
-        style="width: calc(100% - 25px);"
-        :class="{
-          'el-select__tags_readonly': !inputWriteable,
-          'el-select__tags': inputWriteable,
-        }"
+        v-if="inputWriteable"
+        class="el-input el-input--suffix"
+        :class="{ 'custom-selector-mobile': isMobile }"
       >
-        <span class="tag-wrap">
-          <span
+        <div v-if="isMobile" class="custom-selector-mobile-box">
+          <div
             v-for="(item, index) in selectors"
             :key="index"
-            class="el-tag el-tag--info el-tag--small"
-            @click.stop
+            class="common-selector-tag"
           >
-            <span class="el-select__tags-text">
-              {{ showPath ? item.pathName : item.name }}
-            </span>
-            <i
-              v-if="inputWriteable"
-              class="el-tag__close el-icon-close"
-              @click="handleRemove(item)"
-            ></i>
-          </span>
-        </span>
-      </div>
-      <div v-if="inputWriteable" class="el-input el-input--suffix">
+            <span>{{ item.name }}</span>
+            <i class="el-icon-error" @click.stop="handleRemove(item)"></i>
+          </div>
+        </div>
         <input
           ref="inputEl"
-          v-model="value"
+          v-model="calcInputValue"
           v-validate="inputValidate"
           type="text"
           readonly="readonly"
@@ -52,10 +40,6 @@
           autocomplete="off"
           class="el-input__inner"
           :placeholder="placeholder"
-          :style="{
-            height: inputSuffixHeight + 'px',
-            lineHeight: inputSuffixHeight + 'px',
-          }"
         />
         <span class="el-input__suffix">
           <span class="el-input__suffix-inner">
@@ -64,51 +48,56 @@
           </span>
         </span>
       </div>
+      <div v-else class="el-select__tags_readonly">
+        <span>{{ calcInputValue }}</span>
+      </div>
     </div>
     <ht-field-tail :field-name="inputName" :input-value="value" />
-    <org-selector-dialog
-      v-if="!isMobile"
-      ref="orgSelectorDialog"
-      v-model="selectors"
-      :title="title"
-      :append-to-body="appendToBody"
-      :data="data"
-      :pagination="pagination"
-      :select-label="selectLabel"
-      :quick-search-props="quickSearchProps"
-      :single="single"
-      :search-placeholder="searchPlaceholder"
-      :primary-field="primaryField"
-      :mode="mode"
-      @filter-type-change="(type) => $emit('filter-type-change', type)"
-      @search="(word) => $emit('search', word)"
-      @reset="() => $emit('reset')"
-      @row-click="(row) => $emit('row-click', row)"
-      @select-data="(data) => $emit('select-data', data)"
-      @page-change="(page) => $emit('page-change', page)"
-      @size-change="(size) => $emit('size-change', size)"
-      @contact-group-change="(group) => $emit('contact-group-change', group)"
-      @load-org="(org) => $emit('load-org', org)"
-      @load-policy-org="(policy) => $emit('load-policy-org', policy)"
-    />
-    <org-selector-mobile-dialog
-      v-else
-      ref="orgSelectorMobileDialog"
-      v-model="selectors"
-      :title="title"
-      :append-to-body="appendToBody"
-      :data="data"
-      :pagination="pagination"
-      :select-label="selectLabel"
-      :single="single"
-      :search-placeholder="searchPlaceholder"
-      :primary-field="primaryField"
-      @search="(word) => $emit('search', word)"
-      @reset="() => $emit('reset')"
-      @row-click="(row) => $emit('row-click', row)"
-      @select-data="(data) => $emit('select-data', data)"
-      @page-change="(page) => $emit('page-change', page)"
-    />
+    <template v-if="isDialogShow">
+      <org-selector-dialog
+        v-if="!isMobile"
+        ref="orgSelectorDialog"
+        v-model="selectors"
+        :title="title"
+        :append-to-body="appendToBody"
+        :data="data"
+        :pagination="pagination"
+        :select-label="selectLabel"
+        :quick-search-props="quickSearchProps"
+        :single="single"
+        :search-placeholder="searchPlaceholder"
+        :primary-field="primaryField"
+        :mode="mode"
+        @filter-type-change="(type) => $emit('filter-type-change', type)"
+        @search="(word) => $emit('search', word)"
+        @reset="() => $emit('reset')"
+        @row-click="(row) => $emit('row-click', row)"
+        @select-data="(data) => $emit('select-data', data)"
+        @page-change="(page) => $emit('page-change', page)"
+        @size-change="(size) => $emit('size-change', size)"
+        @contact-group-change="(group) => $emit('contact-group-change', group)"
+        @load-org="(org) => $emit('load-org', org)"
+        @load-policy-org="(policy) => $emit('load-policy-org', policy)"
+      />
+      <org-selector-mobile-dialog
+        v-else
+        ref="orgSelectorMobileDialog"
+        v-model="selectors"
+        :title="title"
+        :append-to-body="appendToBody"
+        :data="data"
+        :pagination="pagination"
+        :select-label="selectLabel"
+        :single="single"
+        :search-placeholder="searchPlaceholder"
+        :primary-field="primaryField"
+        @search="(word) => $emit('search', word)"
+        @reset="() => $emit('reset')"
+        @row-click="(row) => $emit('row-click', row)"
+        @select-data="(data) => $emit('select-data', data)"
+        @page-change="(page) => $emit('page-change', page)"
+      />
+    </template>
   </div>
 </template>
 <script>
@@ -186,11 +175,23 @@
     },
     data() {
       return {
+        isDialogShow: false,
         inputSuffixHeight: 30,
         selectors: [],
       }
     },
     computed: {
+      calcInputValue: function() {
+        let name = ''
+        if (this.selectors) {
+          name = this.selectors
+            .map((k) => {
+              return this.showPath ? k.pathName : k.name
+            })
+            .join(',')
+        }
+        return name
+      },
       primaryField: function() {
         return this.config && this.config.hasOwnProperty('id')
           ? 'id'
@@ -262,14 +263,8 @@
         // 通过valueChange事件发布值变更消息
         this.$emit('valueChange', ary.join(','), newVal)
         setTimeout(() => {
-          if (newVal.length > 0) {
-            this.calacInputSuffixHeight()
-          } else {
-            this.inputSuffixHeight = 30
-          }
           if (this.$refs.inputEl) {
-            this.$refs.inputEl.focus()
-            this.$refs.inputEl.blur()
+            this.$validator.validate(this.inputName)
           }
         }, 10)
       },
@@ -350,10 +345,14 @@
           this.selectors = tmpAry
         }
       },
-      showDialog() {
+      async showDialog() {
         if (!this.inputWriteable) {
           return
         }
+        if (this.isDialogShow === false) {
+          this.isDialogShow = true
+          await this.$nextTick()
+        }
         if (this.isMobile) {
           this.$refs.orgSelectorMobileDialog.showDialog()
         } else {
@@ -369,12 +368,12 @@
       },
       // 更新当前输入框的高度来适配已选数据的高度
       calacInputSuffixHeight() {
-        if (!this.$refs.tagSpans) return
-        if (this.$refs.tagSpans.offsetHeight) {
-          this.inputSuffixHeight = this.$refs.tagSpans.offsetHeight + 5
-        } else {
-          this.inputSuffixHeight = 30
-        }
+        // if (!this.$refs.tagSpans) return
+        // if (this.$refs.tagSpans.offsetHeight) {
+        //   this.inputSuffixHeight = this.$refs.tagSpans.offsetHeight + 5
+        // } else {
+        //   this.inputSuffixHeight = 30
+        // }
       },
     },
   }
@@ -391,7 +390,10 @@
     position: relative;
     top: 50%;
   }
-
+  .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+  }
   .el-input__inner[aria-invalid='true'] {
     border-color: #f56c6c;
   }

package/packages/PostSelector/src/main.vue

@@ -16,33 +16,23 @@
       @click="showDialog"
     >
       <div
-        ref="tagSpans"
-        style="width: calc(100% - 25px);"
-        :class="{
-          'el-select__tags_readonly': !inputWriteable,
-          'el-select__tags': inputWriteable,
-        }"
+        v-if="inputWriteable"
+        class="el-input el-input--suffix"
+        :class="{ 'custom-selector-mobile': isMobile }"
       >
-        <span class="tag-wrap">
-          <span
+        <div v-if="isMobile" class="custom-selector-mobile-box">
+          <div
             v-for="(item, index) in selectors"
             :key="index"
-            class="el-tag el-tag--info el-tag--small"
-            @click.stop
+            class="common-selector-tag"
           >
-            <span class="el-select__tags-text">{{ item.name }}</span>
-            <i
-              v-if="inputWriteable"
-              class="el-tag__close el-icon-close"
-              @click="handleRemove(item)"
-            ></i>
-          </span>
-        </span>
-      </div>
-      <div v-if="inputWriteable" class="el-input el-input--suffix">
+            <span>{{ item.name }}</span>
+            <i class="el-icon-error" @click.stop="handleRemove(item)"></i>
+          </div>
+        </div>
         <input
           ref="inputEl"
-          v-model="value"
+          v-model="calcInputValue"
           v-validate="inputValidate"
           type="text"
           readonly="readonly"
@@ -50,10 +40,6 @@
           autocomplete="off"
           class="el-input__inner"
           :placeholder="placeholder"
-          :style="{
-            height: inputSuffixHeight + 'px',
-            lineHeight: inputSuffixHeight + 'px',
-          }"
         />
         <span class="el-input__suffix">
           <span class="el-input__suffix-inner">
@@ -62,50 +48,55 @@
           </span>
         </span>
       </div>
+      <div v-else class="el-select__tags_readonly">
+        <span>{{ calcInputValue }}</span>
+      </div>
     </div>
     <ht-field-tail :field-name="inputName" :input-value="value" />
-    <post-selector-dialog
-      v-if="!isMobile"
-      ref="postSelectorDialog"
-      v-model="selectors"
-      :title="title"
-      :append-to-body="appendToBody"
-      :data="data"
-      :pagination="pagination"
-      :select-label="selectLabel"
-      :quick-search-props="quickSearchProps"
-      :single="single"
-      :search-placeholder="searchPlaceholder"
-      :primary-field="primaryField"
-      :mode="mode"
-      @filter-type-change="(type) => $emit('filter-type-change', type)"
-      @search="(word) => $emit('search', word)"
-      @reset="() => $emit('reset')"
-      @row-click="(row) => $emit('row-click', row)"
-      @select-data="(data) => $emit('select-data', data)"
-      @page-change="(page) => $emit('page-change', page)"
-      @size-change="(size) => $emit('size-change', size)"
-      @load-org-post="(org) => $emit('load-org-post', org)"
-      @load-policy-post="(policy) => $emit('load-policy-post', policy)"
-    />
-    <post-selector-mobile-dialog
-      v-else
-      ref="postSelectorMobileDialog"
-      v-model="selectors"
-      :title="title"
-      :append-to-body="appendToBody"
-      :data="data"
-      :pagination="pagination"
-      :select-label="selectLabel"
-      :single="single"
-      :search-placeholder="searchPlaceholder"
-      :primary-field="primaryField"
-      @search="(word) => $emit('search', word)"
-      @reset="() => $emit('reset')"
-      @row-click="(row) => $emit('row-click', row)"
-      @select-data="(data) => $emit('select-data', data)"
-      @page-change="(page) => $emit('page-change', page)"
-    />
+    <template v-if="isDialogShow">
+      <post-selector-dialog
+        v-if="!isMobile"
+        ref="postSelectorDialog"
+        v-model="selectors"
+        :title="title"
+        :append-to-body="appendToBody"
+        :data="data"
+        :pagination="pagination"
+        :select-label="selectLabel"
+        :quick-search-props="quickSearchProps"
+        :single="single"
+        :search-placeholder="searchPlaceholder"
+        :primary-field="primaryField"
+        :mode="mode"
+        @filter-type-change="(type) => $emit('filter-type-change', type)"
+        @search="(word) => $emit('search', word)"
+        @reset="() => $emit('reset')"
+        @row-click="(row) => $emit('row-click', row)"
+        @select-data="(data) => $emit('select-data', data)"
+        @page-change="(page) => $emit('page-change', page)"
+        @size-change="(size) => $emit('size-change', size)"
+        @load-org-post="(org) => $emit('load-org-post', org)"
+        @load-policy-post="(policy) => $emit('load-policy-post', policy)"
+      />
+      <post-selector-mobile-dialog
+        v-else
+        ref="postSelectorMobileDialog"
+        v-model="selectors"
+        :title="title"
+        :append-to-body="appendToBody"
+        :data="data"
+        :pagination="pagination"
+        :select-label="selectLabel"
+        :single="single"
+        :search-placeholder="searchPlaceholder"
+        :primary-field="primaryField"
+        @search="(word) => $emit('search', word)"
+        @reset="() => $emit('reset')"
+        @row-click="(row) => $emit('row-click', row)"
+        @select-data="(data) => $emit('select-data', data)"
+        @page-change="(page) => $emit('page-change', page)"
+      />
+    </template>
   </div>
 </template>
 <script>
@@ -185,11 +176,23 @@
     },
     data() {
       return {
+        isDialogShow: false,
         inputSuffixHeight: 30,
         selectors: [],
       }
     },
     computed: {
+      calcInputValue: function() {
+        let name = ''
+        if (this.selectors) {
+          name = this.selectors
+            .map((k) => {
+              return k.name
+            })
+            .join(',')
+        }
+        return name
+      },
       primaryField: function() {
         return this.config && this.config.hasOwnProperty('id')
           ? 'id'
@@ -248,14 +251,8 @@
         // 通过valueChange事件发布值变更消息
         this.$emit('valueChange', ary.join(','), newVal)
         setTimeout(() => {
-          if (newVal.length > 0) {
-            this.calacInputSuffixHeight()
-          } else {
-            this.inputSuffixHeight = 30
-          }
           if (this.$refs.inputEl) {
-            this.$refs.inputEl.focus()
-            this.$refs.inputEl.blur()
+            this.$validator.validate(this.inputName)
           }
         }, 10)
       },
@@ -321,10 +318,14 @@
           this.selectors = tmpAry
         }
       },
-      showDialog() {
+      async showDialog() {
         if (!this.inputWriteable) {
           return
         }
+        if (this.isDialogShow === false) {
+          this.isDialogShow = true
+          await this.$nextTick()
+        }
         if (this.isMobile) {
           this.$refs.postSelectorMobileDialog.showDialog()
         } else {
@@ -340,12 +341,12 @@
       },
       // 更新当前输入框的高度来适配已选数据的高度
       calacInputSuffixHeight() {
-        if (!this.$refs.tagSpans) return
-        if (this.$refs.tagSpans.offsetHeight) {
-          this.inputSuffixHeight = this.$refs.tagSpans.offsetHeight + 5
-        } else {
-          this.inputSuffixHeight = 30
-        }
+        // if (!this.$refs.tagSpans) return
+        // if (this.$refs.tagSpans.offsetHeight) {
+        //   this.inputSuffixHeight = this.$refs.tagSpans.offsetHeight + 5
+        // } else {
+        //   this.inputSuffixHeight = 30
+        // }
       },
     },
   }
@@ -356,6 +357,10 @@
     margin-left: 1px;
   }
 
+  .el-input__inner {
+    height: 32px;
+    line-height: 32px;
+  }
   .el-select__tags_readonly {
     position: relative;
     top: 50%;

package/packages/Preview/src/FrameViewer.vue

@@ -6,10 +6,11 @@
         v-else-if="contentType.indexOf('image') > -1"
         class="frame-viewer__img"
       >
-        <img
+        <el-image
+          style="width: 100px; height: 100px"
           :src="dataSrc"
-          :style="{ height: utils.isMobile() ? 'auto' : '100%' }"
-        />
+          :preview-src-list="[dataSrc]"
+        ></el-image>
       </div>
       <iframe
         v-else
@@ -124,12 +125,12 @@
           return
         }
         if (iframe.attachEvent) {
-          iframe.attachEvent('onload', function() {
+          iframe.attachEvent('onload', function () {
             that.setFrameBody(this.contentWindow.document)
             that.watermarkRender()
           })
         } else {
-          iframe.onload = function() {
+          iframe.onload = function () {
             that.setFrameBody(this.contentWindow.document)
             that.watermarkRender()
           }