three-trees-ui 1.0.95 → 1.0.96

package/packages/RoleSelector/src/main.vue

@@ -16,23 +16,33 @@
       @click="showDialog"
     >
       <div
-        v-if="inputWriteable"
-        class="el-input el-input--suffix"
-        :class="{ 'custom-selector-mobile': isMobile }"
+        ref="tagSpans"
+        style="width: calc(100% - 25px);"
+        :class="{
+          'el-select__tags_readonly': !inputWriteable,
+          'el-select__tags': inputWriteable,
+        }"
       >
-        <div v-if="isMobile" class="custom-selector-mobile-box">
-          <div
+        <span class="tag-wrap">
+          <span
             v-for="(item, index) in selectors"
             :key="index"
-            class="common-selector-tag"
+            class="el-tag el-tag--info el-tag--small"
+            @click.stop
           >
-            <span>{{ item.name }}</span>
-            <i class="el-icon-error" @click.stop="handleRemove(item)"></i>
-          </div>
-        </div>
+            <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">
         <input
           ref="inputEl"
-          v-model="calcInputValue"
+          v-model="value"
           v-validate="inputValidate"
           type="text"
           readonly="readonly"
@@ -40,6 +50,10 @@
           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">
@@ -48,55 +62,50 @@
           </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" />
-    <template v-if="isDialogShow">
-      <role-selector-mobile-dialog
-        v-if="isMobile"
-        ref="roleSelectorMobileDialog"
-        v-model="selectors"
-        :search-placeholder="searchPlaceholder"
-        :single="single"
-        :data="data"
-        :table-columns="tableColumns"
-        :pagination="pagination"
-        :select-label="selectLabel"
-        :quick-search-props="quickSearchProps"
-        :append-to-body="appendToBody"
-        :title="title"
-        :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)"
-      />
-      <role-selector-dialog
-        v-else
-        ref="roleSelectorDialog"
-        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)"
-      />
-    </template>
+    <role-selector-mobile-dialog
+      v-if="isMobile"
+      ref="roleSelectorMobileDialog"
+      v-model="selectors"
+      :search-placeholder="searchPlaceholder"
+      :single="single"
+      :data="data"
+      :table-columns="tableColumns"
+      :pagination="pagination"
+      :select-label="selectLabel"
+      :quick-search-props="quickSearchProps"
+      :append-to-body="appendToBody"
+      :title="title"
+      :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)"
+    />
+    <role-selector-dialog
+      v-else
+      ref="roleSelectorDialog"
+      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)"
+    />
   </div>
 </template>
 <script>
@@ -173,23 +182,11 @@
     },
     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,8 +245,14 @@
         // 通过valueChange事件发布值变更消息
         this.$emit('valueChange', ary.join(','), newVal)
         setTimeout(() => {
+          if (newVal.length > 0) {
+            this.calacInputSuffixHeight()
+          } else {
+            this.inputSuffixHeight = 30
+          }
           if (this.$refs.inputEl) {
-            this.$validator.validate(this.inputName)
+            this.$refs.inputEl.focus()
+            this.$refs.inputEl.blur()
           }
         }, 10)
       },
@@ -314,14 +317,10 @@
           this.selectors = tmpAry
         }
       },
-      async showDialog() {
+      showDialog() {
         if (!this.inputWriteable) {
           return
         }
-        if (this.isDialogShow === false) {
-          this.isDialogShow = true
-          await this.$nextTick()
-        }
         if (this.isMobile) {
           this.$refs.roleSelectorMobileDialog.showDialog()
         } else {
@@ -338,12 +337,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
+        }
       },
     },
   }
@@ -354,11 +353,6 @@
     margin-left: 1px;
   }
 
-  .el-input__inner {
-    height: 32px;
-    line-height: 32px;
-  }
-
   .el-select__tags_readonly {
     position: relative;
     top: 50%;

package/packages/UserSelector/src/main.vue

@@ -16,23 +16,48 @@
       @click="showDialog"
     >
       <div
-        v-if="inputWriteable"
-        class="el-input el-input--suffix"
-        :class="{ 'custom-selector-mobile': isMobile }"
+        ref="tagSpans"
+        class="user-selector_block"
+        :class="{
+          'el-select__tags_readonly': !inputWriteable,
+          'el-select__tags': inputWriteable,
+        }"
       >
-        <div v-if="isMobile" class="custom-selector-mobile-box">
-          <div
+        <span class="tag-wrap">
+          <span
             v-for="(item, index) in selectors"
             :key="index"
-            class="common-selector-tag"
+            class="el-tag el-tag--info el-tag--small"
+            @click.stop
           >
-            <span>{{ item.fullname }}</span>
-            <i class="el-icon-error" @click.stop="handleRemove(item)"></i>
-          </div>
-        </div>
+            <span class="el-select__tags-text">{{ item.fullname }}</span>
+            <i
+              v-if="inputWriteable"
+              class="el-tag__close el-icon-close"
+              @click.stop="handleRemove(item)"
+            ></i>
+          </span>
+          <template v-if="!selectors.length && value">
+            <span
+              v-for="(item, index) in value.split(',')"
+              :key="index"
+              class="el-tag el-tag--info el-tag--small"
+              @click.stop
+            >
+              <span class="el-select__tags-text">{{ item }}</span>
+              <i
+                v-if="inputWriteable"
+                class="el-tag__close el-icon-close"
+                @click.stop="handleRemoveText(index)"
+              ></i>
+            </span>
+          </template>
+        </span>
+      </div>
+      <div v-if="inputWriteable" class="el-input el-input--suffix">
         <input
           ref="inputEl"
-          v-model="calcInputValue"
+          v-model="value"
           v-validate="inputValidate"
           type="text"
           readonly="readonly"
@@ -40,71 +65,66 @@
           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">
-            <i
-              v-if="value"
-              class="el-icon-circle-close clear-icon"
-              @click.stop="clear"
-            ></i>
+            <i class="el-icon-circle-close clear-icon" @click.stop="clear"></i>
             <ht-icon name="user" class="user-icon" />
           </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" />
-    <template v-if="isDialogShow">
-      <user-selector-dialog
-        v-if="!isMobile"
-        ref="userSelectorDialog"
-        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-user="(org) => $emit('load-org-user', org)"
-        @load-policy-user="(policy) => $emit('load-policy-user', policy)"
-        @load-role-user="(role) => $emit('load-role-user', role)"
-      />
-      <user-selector-mobile-dialog
-        v-else
-        ref="userSelectorMobileDialog"
-        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"
-        @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)"
-        @getCustomQuerys="(querys) => $emit('getCustomQuerys', querys)"
-      />
-    </template>
+    <user-selector-dialog
+      v-if="!isMobile"
+      ref="userSelectorDialog"
+      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-user="(org) => $emit('load-org-user', org)"
+      @load-policy-user="(policy) => $emit('load-policy-user', policy)"
+      @load-role-user="(role) => $emit('load-role-user', role)"
+    />
+    <user-selector-mobile-dialog
+      v-else
+      ref="userSelectorMobileDialog"
+      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"
+      @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)"
+      @getCustomQuerys="(querys) => $emit('getCustomQuerys', querys)"
+    />
   </div>
 </template>
 <script>
@@ -178,23 +198,11 @@
     },
     data() {
       return {
-        isDialogShow: false,
         inputSuffixHeight: 30,
         selectors: [],
       }
     },
     computed: {
-      calcInputValue: function() {
-        let name = ''
-        if (this.selectors) {
-          name = this.selectors
-            .map((k) => {
-              return k.fullname
-            })
-            .join(',')
-        }
-        return name
-      },
       primaryField: function() {
         return this.config && this.config.hasOwnProperty('id')
           ? 'id'
@@ -308,8 +316,14 @@
         // 通过valueChange事件发布值变更消息
         setTimeout(() => {
           this.$emit('valueChange', ary.join(','), newVal)
+          if (newVal.length > 0) {
+            this.calacInputSuffixHeight()
+          } else {
+            this.inputSuffixHeight = 30
+          }
           if (this.$refs.inputEl) {
-            this.$validator.validate(this.inputName)
+            this.$refs.inputEl.focus()
+            this.$refs.inputEl.blur()
           }
         }, 10)
       },
@@ -447,14 +461,10 @@
           this.selectors = tmpAry
         }
       },
-      async showDialog() {
+      showDialog() {
         if (!this.inputWriteable) {
           return
         }
-        if (this.isDialogShow === false) {
-          this.isDialogShow = true
-          await this.$nextTick()
-        }
         if (this.isMobile) {
           this.$refs.userSelectorMobileDialog.showDialog()
         } else {
@@ -470,12 +480,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
+        }
       },
       handleRemoveText(index) {
         if (!this.value) {
@@ -489,7 +499,6 @@
   }
 </script>
 <style lang="scss" scoped>
-  @import '~@/styles/selector.scss';
   .user-selector_block {
     width: calc(100% - 25px);
     background: #fff;
@@ -500,10 +509,6 @@
     top: 50%;
     background: unset !important;
   }
-  .el-input__inner {
-    height: 32px;
-    line-height: 32px;
-  }
 
   .el-input__inner[aria-invalid='true'] {
     border-color: #f56c6c;

package/src/directive/formulas.js

@@ -32,14 +32,8 @@ const formula = {
         vnode.context.$set(vnode.context.data[pathAry[1]], pathAry[2], '')
       } else if (pathAry.length == 4) {
         let key = /^(\w+)\[(\d+)\]$/.exec(pathAry[2])
-        // 存在dialogData则是子表编辑模式，dialogData.dialogVisible为true则是打开弹窗
-        const name = (pathAry[2] || '').substring(4).split('[')
-        const dialogData =
-          vnode.context.$refs[`HtSubEditModeDialog_${name[0]}`] || {}
         vnode.context.$set(
-          dialogData.dialogVisible
-            ? dialogData.row
-            : vnode.context.data[pathAry[1]][key[1]][key[2]],
+          vnode.context.data[pathAry[1]][key[1]][key[2]],
           pathAry[3],
           ''
         )

package/src/index.js

@@ -42,7 +42,6 @@ import HtEditor from '../packages/Editor/index'
 import HtPicture from '../packages/picture/index'
 import HtExplain from '../packages/Explain/index'
 import HtAvatarImage from '../packages/Avatar/index'
-import HtSubEditModeDialog from '../packages/SubEditModeDialog/index'
 import {
   HtH1,
   HtH2,
@@ -231,7 +230,6 @@ const HotentUi = {
   HtPostDialog,
   HtJobDialog,
   HtRoleDialog,
-  HtSubEditModeDialog,
 }
 
 HotentUi.install = (Vue, opts = {}) => {