three-trees-ui 1.0.5 → 1.0.6

package/packages/CustomDialog/src/customDialog.vue

@@ -39,7 +39,6 @@
           direction="vertical"
         ></el-divider>
         <el-container>
-          <!-- 查询条件 -->
           <el-header v-if="querysShow" class="middle-header">
             <div
               v-for="(condition, index) in conditionBind"
@@ -47,7 +46,6 @@
               class="search-item"
             >
               <p style="font-size: 14px">{{ condition.comment }}:</p>
-              <!-- input输入框 -->
               <div v-if="condition.controllerType == '1'">
                 <el-input
                   v-model="queryParams[index][condition.field]"
@@ -59,7 +57,6 @@
                   @keyup.enter.native="searchEnterFun"
                 ></el-input>
               </div>
-              <!-- 单选按钮 -->
               <div
                 v-if="condition.controllerType == '2'"
                 style="margin-right: 10px"
@@ -73,28 +70,35 @@
                   {{ itemR.value }}
                 </el-radio>
               </div>
-              <!-- 下拉框 -->
               <div
                 v-if="condition.controllerType == '3'"
                 style="margin-right: 10px"
               >
-                <!-- 静态选项 -->
                 <ht-select
                   v-if="condition.config.choiceType == 'static'"
                   v-model="queryParams[index][condition.field]"
                   :placeholder="quickSearch"
-                  :multiple="condition.config.multiple"
                   :options="condition.config.options"
                 ></ht-select>
-                <!-- 动态选项时展示数据字典 -->
-                <ht-dictionary
+                <eip-select-dia
                   v-else
-                  v-model="queryParams[index][condition.field]"
-                  :dickey="condition.config.dic"
-                  :filterable="condition.config.filterable"
-                ></ht-dictionary>
+                  v-model="queryParams[condition.field]"
+                  :placeholder="quickSearch"
+                  :ganged="{
+                    alias: condition.config.customQuery.alias,
+                    valueBind: condition.config.customQuery.valueBind,
+                    noInit: '',
+                    labelBind: condition.config.customQuery.labelBind,
+                    gangedBind: '{}',
+                    bind: condition.config.bind,
+                  }"
+                  :multiple="false"
+                  :filterable="false"
+                  :allow-create="false"
+                  :selectlist="[]"
+                  :query-params="queryParams"
+                ></eip-select-dia>
               </div>
-              <!-- 标签 -->
               <div
                 v-if="condition.controllerType == '4'"
                 style="margin-right: 10px"
@@ -107,121 +111,6 @@
                   :expand="condition.config.expand"
                 ></eip-tag>
               </div>
-              <!-- 日期 -->
-              <div
-                v-if="condition.controllerType == '6'"
-                style="margin-right: 10px"
-              >
-                <!-- 根据日期的条件类型来判断展示单个日期还是日期范围 -->
-                <div v-if="condition.condition == 'BETWEEN'">
-                  <ht-date
-                    v-model="queryParams[index].startDate"
-                    :format="condition.config.inputFormat"
-                    :valueFormat="condition.config.inputFormat"
-                  ></ht-date>
-                  至
-                  <ht-date
-                    v-model="queryParams[index].endDate"
-                    :format="condition.config.inputFormat"
-                    :valueFormat="condition.config.inputFormat"
-                  ></ht-date>
-                </div>
-                <ht-date
-                  v-model="queryParams[index][condition.field]"
-                  v-else
-                  :format="condition.config.inputFormat"
-                  :valueFormat="condition.config.inputFormat"
-                ></ht-date>
-              </div>
-              <!-- 选择器 -->
-              <div
-                v-if="condition.controllerType == '7'"
-                style="margin-right: 10px"
-              >
-                <ht-user-selector-input
-                  v-model="queryParams[index].selectName"
-                  v-if="condition.config.alias == 'user'"
-                  append-to-body
-                  @change="
-                    (data) => {
-                      queryParams[index][condition.field] = getSelectId(data)
-                    }
-                  "
-                ></ht-user-selector-input>
-                <ht-org-selector-input
-                  v-model="queryParams[index].selectName"
-                  v-if="condition.config.alias == 'org'"
-                  append-to-body
-                  @change="
-                    (data) => {
-                      queryParams[index][condition.field] = getSelectId(data)
-                    }
-                  "
-                ></ht-org-selector-input>
-                <ht-role-selector-input
-                  v-model="queryParams[index].selectName"
-                  v-if="condition.config.alias == 'role'"
-                  append-to-body
-                  @change="
-                    (data) => {
-                      queryParams[index][condition.field] = getSelectId(data)
-                    }
-                  "
-                ></ht-role-selector-input>
-                <ht-job-selector-input
-                  v-model="queryParams[index].selectName"
-                  v-if="condition.config.alias == 'job'"
-                  append-to-body
-                  @change="
-                    (data) => {
-                      queryParams[index][condition.field] = getSelectId(data)
-                    }
-                  "
-                ></ht-job-selector-input>
-                <ht-post-selector-input
-                  v-model="queryParams[index].selectName"
-                  v-if="condition.config.alias == 'post'"
-                  append-to-body
-                  @change="
-                    (data) => {
-                      queryParams[index][condition.field] = getSelectId(data)
-                    }
-                  "
-                ></ht-post-selector-input>
-                <ht-dimension-selector-input
-                  v-model="queryParams[index].selectName"
-                  v-if="condition.config.alias == 'dimension'"
-                  append-to-body
-                  @change="
-                    (data) => {
-                      queryParams[index][condition.field] = getSelectId(data)
-                    }
-                  "
-                ></ht-dimension-selector-input>
-              </div>
-              <!-- 对话框 -->
-              <div
-                v-if="condition.controllerType == '5'"
-                style="margin-right: 10px"
-              >
-                <ht-custom-dialog
-                  v-model="queryParams[index][condition.field]"
-                  :model-name="condition.config.keyBind"
-                  dialogType="search"
-                  :custdialog="{
-                    name: '请选择',
-                    icon: '',
-                    custDialog: {
-                      selectNum: 1,
-                      conditions: [],
-                      mappingConf: [],
-                      custQueryJson: [],
-                      alias: condition.config.alias,
-                      type: 'custDialog',
-                    },
-                  }"
-                ></ht-custom-dialog>
-              </div>
             </div>
             <div
               v-if="conditionBind && conditionBind.length > 0"
@@ -285,11 +174,12 @@
                 label="序号"
               ></el-table-column>
               <el-table-column
-                v-for="field in sortDisplayfield"
+                v-for="field in displayfield"
                 :key="field.field"
+                :show-overflow-tooltip="true"
                 :prop="field.field"
                 :label="field.comment"
-                :width="field.width || ''"
+                style="width: 100%"
               ></el-table-column>
             </el-table>
           </el-main>
@@ -438,13 +328,9 @@
         type: Boolean,
         default: false,
       },
-      dialogConfig: Object,
-      dialogType: String,
     },
     data() {
       return {
-        startDate: '', // 日期控件
-        endDate: '', // 日期控件
         tableHeight: 350,
         isEditInputShow: false,
         customValue: '',
@@ -516,24 +402,6 @@
         }
         return []
       },
-      jumpParamKey() {
-        return this.dialogConfig && this.dialogConfig.jumpParamKey
-          ? this.dialogConfig.jumpParamKey
-          : ''
-      },
-      // 是否保存成跳转url参数
-      isHaveJumpUrl() {
-        return (
-          this.dialogConfig &&
-          ((this.isMobile && this.dialogConfig.mobileUrl) ||
-            (!this.isMobile && this.dialogConfig.pcUrl))
-        )
-      },
-      sortDisplayfield() {
-        return this.displayfield.sort((a, b) => {
-          return a.sort > b.sort ? 1 : -1
-        })
-      },
     },
     watch: {
       dialogData: {
@@ -570,156 +438,143 @@
       })
     },
     methods: {
-      // 获取已选择的选择器数据id
-      getSelectId(data) {
-        if (!data || !data.length) {
-          return ''
-        }
-        let ids = []
-        data.forEach((item) => {
-          ids.push(item.id)
-        })
-        return ids.join(',')
-      },
       showDialog(isMounted = false) {
+        const this_ = this
         this.fixedParams = {}
-        // 如果已存在配置信息就不去请求配置信息 直接初始化数据
-        if (this.dialogConfig) {
-          this.initDialog(this.dialogConfig, isMounted)
-          return
-        }
         var alias = this.custdialog.custDialog.alias
         this.$requestConfig
           .getCustomDialogByAlias(alias)
           .then((customDialog) => {
-            this.initDialog(customDialog, isMounted)
-          })
-      },
-      initDialog(customDialog, isMounted) {
-        let alias = this.custdialog.custDialog.alias
-        const this_ = this
-        if (!customDialog || !customDialog.alias) {
-          this.$message.error('对话框别名【' + alias + '】不存在！')
-          return
-        }
-        if (customDialog.style == 1) {
-          var displaylist = JSON.parse(customDialog.displayfield)
-          this_.nodeKey = displaylist.id
-        }
-        if (customDialog.needPage && customDialog.requestType === 'POST') {
-          let obj = {}
-          this.getLastKeyByPath(obj, customDialog.pageKey, 1)
-          this.getLastKeyByPath(obj, customDialog.pageSizeKey, 10)
-          this.getLastKeyByPath(obj, customDialog.totalKey, true)
-          const exp = utils.parseExp(customDialog.dataParam, obj, true)
-          if (exp) {
-            const params = JSON.parse(exp)
-            if (params.pageBean) {
-              this.pagination = {
-                ...params.pageBean,
-              }
+            if (!customDialog || !customDialog.alias) {
+              this.$message.error('对话框别名【' + alias + '】不存在！')
+              return
             }
-          }
-        }
-        //对话框按表单字段查询（参数传入的）
-        let bindList = this_.custdialog.custDialog.conditions
-        this_.param = [] //绑定的表单字段
-        if (bindList.length > 0) {
-          bindList.forEach((ele) => {
-            //绑定表单字段
-            if (
-              ele.bind &&
-              (ele.defaultType == '3' || ele.bind.startsWith('data.searchForm'))
-            ) {
+            if (customDialog.style == 1) {
+              var displaylist = JSON.parse(customDialog.displayfield)
+              this_.nodeKey = displaylist.id
+            }
+            if (customDialog.needPage && customDialog.requestType === 'POST') {
               let obj = {}
-              obj.field = ele.field
-              obj.bind = ele.bind
-              obj.bindType = ele.bindType
-              this_.param.push(obj)
+              this.getLastKeyByPath(obj, customDialog.pageKey, 1)
+              this.getLastKeyByPath(obj, customDialog.pageSizeKey, 10)
+              this.getLastKeyByPath(obj, customDialog.totalKey, true)
+              const exp = utils.parseExp(customDialog.dataParam, obj, true)
+              if (exp) {
+                const params = JSON.parse(exp)
+                if (params.pageBean) {
+                  this.pagination = {
+                    ...params.pageBean,
+                  }
+                }
+              }
             }
-            //取值对象为脚本时获取value
-            if (ele.bindType === 3) {
-              this_.$requestConfig.executeScript(ele.bind).then((res) => {
-                this_.executeScriptResult = res && res.value
+            //对话框按表单字段查询（参数传入的）
+            let bindList = this_.custdialog.custDialog.conditions
+            this_.param = [] //绑定的表单字段
+            if (bindList.length > 0) {
+              bindList.forEach((ele) => {
+                //绑定表单字段
+                if (
+                  ele.bind &&
+                  (ele.defaultType == '3' ||
+                    ele.bind.startsWith('data.searchForm'))
+                ) {
+                  let obj = {}
+                  obj.field = ele.field
+                  obj.bind = ele.bind
+                  obj.bindType = ele.bindType
+                  this_.param.push(obj)
+                }
+                //取值对象为脚本时获取value
+                if (ele.bindType === 3) {
+                  this_.$requestConfig.executeScript(ele.bind).then((res) => {
+                    this_.executeScriptResult = res && res.value
+                  })
+                }
               })
             }
-          })
-        }
-        //判断对话框查询是否有条件
-        let userInputList = JSON.parse(customDialog.conditionfield)
-        this_.quickSearch = '' //填写提示 placeholder
-        this_.conditionBind = []
-        let queryParams = []
-        let placeholders = []
-        if (userInputList.length > 0) {
-          userInputList.forEach((ele) => {
-            var obj = {}
-            //条件查询参数（用户输入的） 文本框输入 defaultType 1 用户输入 2固定值 3参数传入 5脚本
-            if (ele.defaultType == '1') {
-              obj[ele.field] = ''
-              queryParams.push(obj)
-              // queryParams[ele.field] = "";
-              this_.conditionBind.push(ele)
-              placeholders.push('请输入' + ele.comment)
+            //判断对话框查询是否有条件
+            let userInputList = JSON.parse(customDialog.conditionfield)
+            this_.quickSearch = '' //填写提示 placeholder
+            this_.conditionBind = []
+            let queryParams = []
+            let placeholders = []
+            if (userInputList.length > 0) {
+              userInputList.forEach((ele) => {
+                var obj = {}
+                //条件查询参数（用户输入的） 文本框输入 defaultType 1 用户输入 2固定值 3参数传入 5脚本
+                if (ele.defaultType == '1') {
+                  obj[ele.field] = ''
+                  queryParams.push(obj)
+                  // queryParams[ele.field] = "";
+                  this_.conditionBind.push(ele)
+                  placeholders.push('请输入' + ele.comment)
+                }
+                if (ele.defaultType == '2' && ele.defaultValue) {
+                  this_.fixedParams[ele.field] = ele.defaultValue
+                }
+              })
+              this.$set(this, 'queryParams', queryParams)
+              this.$set(this, 'placeholders', placeholders)
             }
-            if (ele.defaultType == '2' && ele.defaultValue) {
-              this_.fixedParams[ele.field] = ele.defaultValue
+            //判断是否显示条件查询输入框
+            if (this_.quickSearch != '') {
+              this_.querysShow = true
+            } else {
+              this_.querysShow = true
             }
-          })
-          this.$set(this, 'queryParams', queryParams)
-          this.$set(this, 'placeholders', placeholders)
-        }
-        //判断是否显示条件查询输入框
-        if (this_.quickSearch != '') {
-          this_.querysShow = true
-        } else {
-          this_.querysShow = true
-        }
-        this_.quickSearch = '请输入' + this.quickSearch + '查询'
-        this_.style = 'height:' + customDialog.height + 'px'
-        if (window.screen.height && window.screen.height <= 900) {
-          this.style = 'height:440px'
-        }
-        if (customDialog.style == 0 || customDialog.style == 2) {
-          //列表
-          setTimeout(() => {
-            this_.customDialogShow(
-              {
-                alias: alias,
-                customDialog: customDialog,
-              },
-              isMounted
-            )
-          }, 100)
-        } else if (customDialog.style == 1) {
-          //树形
-          this_.pageParam = { alias: alias, customDialog: customDialog }
-          this_.customDialog = customDialog
-          let param = {}
-          this_.conditionfieldTree = []
-          //判断是否存在条件
-          if (customDialog.conditionfield) {
-            this_.conditionfieldTree = JSON.parse(customDialog.conditionfield)
-            if (this_.conditionfieldTree.length > 0) {
-              for (let i = this_.conditionfieldTree.length - 1; i >= 0; i--) {
-                //判断条件字段是否是动态传入（defaultType：4：动态传入，2：固定值 ）
-                if (this_.conditionfieldTree[i].defaultType == '4') {
-                  param[this_.conditionfieldTree[i].field] =
-                    this_.conditionfieldTree[i].comment
+            this_.quickSearch = '请输入' + this.quickSearch + '查询'
+            this_.style = 'height:' + customDialog.height + 'px'
+            if (window.screen.height && window.screen.height <= 900) {
+              this.style = 'height:440px'
+            }
+            if (customDialog.style == 0 || customDialog.style == 2) {
+              //列表
+              setTimeout(() => {
+                this_.customDialogShow(
+                  {
+                    alias: alias,
+                    customDialog: customDialog,
+                  },
+                  isMounted
+                )
+              }, 100)
+            } else if (customDialog.style == 1) {
+              //树形
+              this_.pageParam = { alias: alias, customDialog: customDialog }
+              this_.customDialog = customDialog
+              let param = {}
+              this_.conditionfieldTree = []
+              //判断是否存在条件
+              if (customDialog.conditionfield) {
+                this_.conditionfieldTree = JSON.parse(
+                  customDialog.conditionfield
+                )
+                if (this_.conditionfieldTree.length > 0) {
+                  for (
+                    let i = this_.conditionfieldTree.length - 1;
+                    i >= 0;
+                    i--
+                  ) {
+                    //判断条件字段是否是动态传入（defaultType：4：动态传入，2：固定值 ）
+                    if (this_.conditionfieldTree[i].defaultType == '4') {
+                      param[this_.conditionfieldTree[i].field] =
+                        this_.conditionfieldTree[i].comment
+                    }
+                  }
+                }
+              }
+              //有动态传入的字段
+              if (!isMounted) {
+                if (JSON.stringify(param) != '{}') {
+                  this_.dialogVisible = true
+                } else {
+                  //无动态传入的字段
+                  this_.customDialogTreeShow(this_.pageParam)
                 }
               }
             }
-          }
-          //有动态传入的字段
-          if (!isMounted) {
-            if (JSON.stringify(param) != '{}') {
-              this_.dialogVisible = true
-            } else {
-              //无动态传入的字段
-              this_.customDialogTreeShow(this_.pageParam)
-            }
-          }
-        }
+          })
       },
       initTableHeight() {
         this.$nextTick(() => {
@@ -869,22 +724,13 @@
           }
           // 添加用户id 岗位id 组织id
           try {
-            if (
-              this.$requestConfig.getUserId &&
-              this.$requestConfig.getUserId()
-            ) {
+            if (this.$requestConfig.getUserId()) {
               ctx.userId = this.$requestConfig.getUserId()
             }
-            if (
-              this.$requestConfig.getOrgId &&
-              this.$requestConfig.getOrgId()
-            ) {
+            if (this.$requestConfig.getOrgId()) {
               ctx.orgId = this.$requestConfig.getOrgId()
             }
-            if (
-              this.$requestConfig.getPostId &&
-              this.$requestConfig.getPostId()
-            ) {
+            if (this.$requestConfig.getPostId()) {
               ctx.postId = this.$requestConfig.getPostId()
             }
           } catch (e) {
@@ -981,19 +827,8 @@
         this.selectOrgs = this.convertComment2Field(str, field)
         this.custdialog.custDialog.mappingConf.forEach((con) => {
           var val = ''
-          str.forEach((item, index) => {
-            // 此处添加url跳转参数保存逻辑
-            if (
-              this.jumpParamKey &&
-              this.isHaveJumpUrl &&
-              this.modelName == 'data.' + con['target'][0]
-            ) {
-              val += `${item[con.from]}¯${this.jumpParamKey}:${
-                this.selectOrgs[index][this.jumpParamKey]
-              },`
-            } else {
-              val += item[con.from] + ','
-            }
+          str.forEach((item) => {
+            val += item[con.from] + ','
           })
           if (this.modelName == 'data.' + con['target'][0]) {
             utils.setValueByPath(
@@ -1078,46 +913,19 @@
           pageBean.pageBean = { page: 1, pageSize: 10, showTotal: true }
         }
         //用户输入的
-        let flag = false
         if (this.queryParams.length != 0 && this.queryParams[0] != '') {
           this.conditionBind.forEach((item, index) => {
-            // 日期范围特殊处理
-            if (item.dbType == 'date' && item.condition == 'BETWEEN') {
-              if (
-                (this.queryParams[index].startDate &&
-                  !this.queryParams[index].endDate) ||
-                (!this.queryParams[index].startDate &&
-                  this.queryParams[index].endDate)
-              ) {
-                flag = true
-                this.$message.info('日期范围未填写完整！')
-                return
-              }
-              if (
-                this.queryParams[index].startDate &&
-                this.queryParams[index].endDate
-              ) {
-                this.queryParams[index][
-                  item.field
-                ] = `${this.queryParams[index].startDate},${this.queryParams[index].endDate}`
-              } else {
-                this.queryParams[index][item.field] = ''
-              }
-            }
             if (this.queryParams[index][item.field]) {
               querys.push({
                 property: item.field,
                 value: this.queryParams[index][item.field],
                 group: 'main',
-                operation: item.condition,
+                operation: 'LIKE',
                 relation: 'AND',
               })
             }
           })
         }
-        if (flag) {
-          return
-        }
         //参数传入的查询拼接
         if (this.param) {
           this.param.forEach((item) => {
@@ -1183,22 +991,13 @@
           queryParamMap.total = pageBean.pageBean.total
           // 添加用户id 岗位id 组织id
           try {
-            if (
-              this.$requestConfig.getUserId &&
-              this.$requestConfig.getUserId()
-            ) {
+            if (this.$requestConfig.getUserId()) {
               ctx.userId = this.$requestConfig.getUserId()
             }
-            if (
-              this.$requestConfig.getOrgId &&
-              this.$requestConfig.getOrgId()
-            ) {
+            if (this.$requestConfig.getOrgId()) {
               ctx.orgId = this.$requestConfig.getOrgId()
             }
-            if (
-              this.$requestConfig.getPostId &&
-              this.$requestConfig.getPostId()
-            ) {
+            if (this.$requestConfig.getPostId()) {
               ctx.postId = this.$requestConfig.getPostId()
             }
           } catch (e) {
@@ -1223,14 +1022,12 @@
                   value: queryParamMap[bindKey] || ctx[bindKey] || '',
                 }
               })
-            param.querys = queryList || []
+            param.querys = queryList
             if (this.customDialog.needPage) {
               param.pageBean = obj
             } else {
               param.pageBean.pageSize = -1
             }
-            // 日期格式的 改成数组
-            // this.changeDateFormat(param)
             //构造请求的参数
             let requestParam = {
               pageBean: param,
@@ -1270,21 +1067,6 @@
         }
         this.tableRadioVal = ''
       },
-      changeDateFormat(param) {
-        let dateValidate1 = /^\d{4}\-\d{2}\-\d{2}$/
-        let dateValidate2 = /^([1-2][0-9][0-9][0-9]-[0-1]{0,1}[0-9]-[0-3]{0,1}[0-9])\s(20|21|22|23|[0-1]\d):[0-5]\d:[0-5]\d$/
-        Object.keys(param).forEach((key) => {
-          if (
-            param[key] &&
-            typeof param[key] == 'string' &&
-            param[key].includes(',') &&
-            (dateValidate1.test(param[key].split(',')[0]) ||
-              dateValidate2.test(param[key].split(',')[0]))
-          ) {
-            param[key] = param[key].split(',')
-          }
-        })
-      },
       getSearchValueByKey() {
         let queryParamsObj = {}
         if (this.queryParams.length > 0) {
@@ -1539,8 +1321,6 @@
       },
       // 同步选择结果
       syncInputValue() {
-        // 对话框跳转url需要两个参数 1当前控件绑定的对象参数modelName 2对话框配置中配置的key名称
-        // 同步值时，如果有绑定url跳转参数，值格式为 名称¯跳转key:跳转value
         let thisIndex = null //当前数据所在下标
         let parentIndex = null //父节点所在下标
         if (this.$parent.$el) {
@@ -1628,33 +1408,13 @@
             }
           }
         }
-        // 如果是查询中使用的对话框
-        if (this.dialogType == 'search') {
-          let returnVal = []
-          str.forEach((item) => {
-            returnVal.push(decodeURIComponent(item[this.modelName]))
-          })
-          this.$emit('updateInput', returnVal.join(','))
-          return
-        }
         const pInst = utils.getOnlineFormInstance(this)
         this.custdialog.custDialog.mappingConf.forEach((con) => {
           var val = ''
           var from = con.from.toLowerCase()
           str.forEach((item) => {
-            // 如果有绑定url跳转参数 需获取跳转参数的key
             if (item) {
-              if (
-                this.jumpParamKey &&
-                this.isHaveJumpUrl &&
-                this.modelName == 'data.' + con['target'][0]
-              ) {
-                val += `${decodeURIComponent(item[from])}¯${
-                  this.jumpParamKey
-                }:${item[this.jumpParamKey]},`
-              } else {
-                val += decodeURIComponent(item[from]) + ','
-              }
+              val += decodeURIComponent(item[from]) + ','
             }
           })
           if (this.modelName == 'data.' + con['target'][0]) {
@@ -1695,6 +1455,7 @@
             const _val = val.substring(0, val.length - 1)
             if (path) {
               if (this.modelName && this.modelName.endsWith(path)) {
+                // this.$emit('input', _val)
                 this.$emit('updateInput', _val)
               }
               utils.setValueByPath(