cnhis-design-vue 0.2.67-beta → 0.2.70-beta

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -4,14 +4,16 @@
       <div class="bease-left" ref="baseLeft" v-resize="onResize">
         <!-- 行内编辑对应生成的（保存、取消）按钮 -->
         <template v-if="visibleInlineOperateBtn">
-          <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditClick" class="btn-custom-class" style="margin: 8px 8px 8px 0" type="primary">
-            保存
-          </a-button>
-          <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditCancel" class="btn-custom-class" style="margin: 8px 8px 8px 0">
-            取消
-          </a-button>
+          <div class="btn-custom-wrap">
+            <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditClick" class="btn-custom-class" style="margin: 8px 8px 8px 0" type="primary">
+              保存
+            </a-button>
+            <a-button :style="{ display: isInlineOperating ? 'inline-block' : 'none' }" @click="inlineEditCancel" class="btn-custom-class" style="margin: 8px 8px 8px 0">
+              取消
+            </a-button>
+          </div>
         </template>
-        <ul v-else>
+        <ul v-if="!visibleInlineOperateBtn && !isRowEditing">
           <div ref="btnRow" class="btn-row" v-if="isShowSettingBtn">
             <a-button class="btn-setting" v-show="currentTempId != '0' && isShowSetting('hideSettingBtn')" icon="setting" @click="handlerSetting">
               设置
@@ -324,7 +326,7 @@
         </ul>
       </div>
     </div>
-    <div class="base-tabs" v-if="conditionType === 'keyword' && tabConditionList.length > 0">
+    <div class="base-tabs" v-if="showBaseTabs">
       <div v-for="(item, index) in tabConditionList" :key="index" :class="tabIndex === index ? 'base-tabs-item base-tabs-item-active' : 'base-tabs-item'" @click="tabClick(index)"
         >{{ item.name }} {{ countTabCondition == 1 && (item.digital || item.digital === 0) ? '(' + (item.digital || 0) + ')' : '' }}</div
       >
@@ -557,7 +559,8 @@ export default create({
       type: Object,
       default: () => ({})
     },
-    useFieldList: Array
+    useFieldList: Array,
+    editTableUid: [String, Number]
   },
   components: {
     [Button.name]: Button,
@@ -721,6 +724,9 @@ export default create({
     curBatchBtnData() {
       return this?.gettersConfig?.curBatchBtnData || {};
     },
+    isRowEditing() {
+      return this?.gettersConfig?.isRowEditing || false;
+    },
     // 是否有高级筛选外显
     showOutSearch() {
       return this.outSearchFieldList?.length || this.outRelationQuickSearch?.length;
@@ -757,6 +763,9 @@ export default create({
       // 平铺列表, 左侧不为tree, 而是table
       if(this.editTableSource == 'relatedComponent' && this.relatedBaseInfo?.showType != "TREE") return showQuick
       return showQuick && this.isRelatedSearchFold
+    },
+    showBaseTabs() {
+      return  this.conditionType === 'keyword' && this.tabConditionList?.length && !this.visibleInlineOperateBtn && !this.isRowEditing
     }
   },
   data() {
@@ -822,7 +831,7 @@ export default create({
       if (index !== -1) this.$emit('tabClick', this.tabConditionList[index]);
     },
     pageResize(obj) {
-      if (this.resizeFlag || this.visibleInlineOperateBtn) return;
+      if (this.resizeFlag || this.visibleInlineOperateBtn || this.isRowEditing) return;
       let baseLeft = this.$refs['baseLeft'];
       if (!baseLeft) return;
       this.resizeFlag = true;
@@ -846,7 +855,7 @@ export default create({
       }
     },
     onResize() {
-      if (this.isButtonFolding || this.isShowSetting('buttonAdaption') || this.relatedIsTree == 1 || this.visibleInlineOperateBtn) return;
+      if (this.isButtonFolding || this.isShowSetting('buttonAdaption') || this.relatedIsTree == 1 || this.visibleInlineOperateBtn || this.isRowEditing) return;
       utils.debounce(this.pageResize({ type: 'resize' }), 300);
     },
     async saveListIsTile() {
@@ -1141,11 +1150,12 @@ export default create({
           paramsData: paramsData,
           btnName: btn.name,
           _params_data: this.paramsData,
+          _type_: btn.type
         }),
         indexList: indexList,
         btnConfig: JSON.parse(JSON.stringify(btn)),
         _params_data: this.paramsData,
-        
+        _type_: btn.type
       };
       this.$emit('btnEvent', btnData);
     },
@@ -1915,28 +1925,23 @@ export default create({
       });
     },
     inlineEditClick() {
-      // 批量编辑
-      if (this.isBatchEditing) {
-        let { btnName, tipsMsg, isTips } = this.curBatchBtnData || {};
-        let _this = this;
-        // 保存是否需要提示
-        if (isTips != 1) {
-          this.setBatchSaveRowStatus(true);
-          return;
-        }
-        this.$confirm({
-          title: tipsMsg || btnName,
-          okText: '确定',
-          cancelText: '取消',
-          onOk: () => {
-            _this.setBatchSaveRowStatus(true);
-          },
-          onCancel() {
-          }
-        });
+      let { btnName, tipsMsg, isTips } = this.curBatchBtnData || {};
+      let _this = this;
+      // 保存是否需要提示
+      if (isTips != 1) {
+        this.setBatchSaveRowStatus(true);
         return;
       }
-      this.setSaveRowStatus(true);
+      this.$confirm({
+        title: tipsMsg || `是否确认${btnName}`,
+        okText: '确定',
+        cancelText: '取消',
+        onOk: () => {
+          _this.setBatchSaveRowStatus(true);
+        },
+        onCancel() {
+        }
+      });
     },
 
     /**
@@ -1964,12 +1969,7 @@ export default create({
 
 
     inlineEditCancel() {
-      // 批量编辑
-      if (this.isBatchEditing) {
-        this.setBatchCancelRowStatus(true);
-        return;
-      }
-      this.setCancelRowStatus(true);
+      this.setBatchCancelRowStatus(true);
     },
 
     setBatchSaveRowStatus(f) {
@@ -1980,14 +1980,6 @@ export default create({
       this.$emit('setBatchCancelRowStatus', f);
     },
 
-    setSaveRowStatus(f) {
-      this.$emit('setSaveRowStatus', f);
-    },
-
-    setCancelRowStatus(f) {
-      this.$emit('setCancelRowStatus', f);
-    },
-
     setPrintNumberCache(obj) {
       this.$emit('setPrintNumberCache', obj);
     }
@@ -2118,7 +2110,7 @@ export default create({
           this.inputSearchW = w > maxW ? maxW : w < 200 ? 200 : w;
           if (w > maxW) {
             this.showPlaceholderPrefix = true;
-          } 
+          }
           this.onResize();
         });
       }
@@ -2141,6 +2133,12 @@ export default create({
     justify-content: flex-start;
     align-items: flex-start;
     flex: 1;
+    .btn-custom-wrap {
+      width: 100%;
+      display: flex;
+      justify-content: flex-end;
+      align-items: flex-start;
+    }
   }
   .base-tabs {
     display: flex;

package/packages/table-filter/src/components/out-quick-search/out-quick-search.vue

@@ -277,6 +277,9 @@ export default {
       };
       return this.handleGetConfigApi(params, 'requestGetWordbookData', { fields: o }).then(res => {
         this.fetchingWordbook = false;
+        if(typeof res.data === 'object'){
+          res.data.reqParams =  params;
+        }
         return res;
       }).catch(() => {
         this.fetchingWordbook = false;

package/src/utils/utils-map.js

@@ -447,4 +447,38 @@ export default {
     });
     return item;
   },
+  handleCurValue(value) {
+    if (!value) return value;
+    if (!this.isString(value)) {
+      return value;
+    }
+    if (this.checkHtml(value)) {
+      return this.htmlToText(value)
+    } else {
+      return this.handleUseValue(value)
+    }
+  },
+  /**
+   * @description: 将HTML格式转换为纯文本
+   */
+  htmlToText(HTML) {
+    var input = HTML;
+    return input
+      .replace(/<(style|script|iframe)[^>]*?>[\s\S]+?<\/\1\s*>/gi, "")
+      .replace(/<[^>]+?>/g, "")
+      .replace(/\s+/g, " ")
+      .replace(/ /g, " ")
+      .replace(/>/g, " ");
+  },
+  checkHtml(str) {
+    var reg = /<[^>]+>/g;
+    return reg.test(str);
+  },
+  handleUseValue(value) {
+    if (value && value.startsWith("###{")) {
+      let temp = JSON.parse(value.replace("###", ""));
+      return temp.tooltip || temp.value;
+    }
+    return value;
+  }
 };

package/src/utils/vexutils.js

@@ -2,7 +2,7 @@ import XEUtils from 'xe-utils';
 import moment from 'moment';
 // com内容来源于老项目
 const com = {
-  parseCondition: function(conList, data, fieldList) {
+  parseCondition: function (conList, data, fieldList) {
     if (conList && conList.length > 0 && data && data.table) {
       for (let i = 0; i < conList.length; i++) {
         let conObj = conList[i];
@@ -19,7 +19,7 @@ const com = {
     }
     return true;
   },
-  getFieldByKey: function(fieldKey, fieldList) {
+  getFieldByKey: function (fieldKey, fieldList) {
     if (fieldList && fieldList.length > 0) {
       for (let i = 0; i < fieldList.length; i++) {
         let fobj = fieldList[i];
@@ -29,7 +29,7 @@ const com = {
       }
     }
   },
-  getConnection: function(cObj, fVal, field) {
+  getConnection: function (cObj, fVal, field) {
     let con = cObj.con;
     let value = cObj.value;
     // 修改 #['NULL','NOT_NULL'] 的判断:  value => fval    2020-09-15.
@@ -340,7 +340,7 @@ const com = {
     }
     return true;
   },
-  getBetween: function(value, type, comVal) {
+  getBetween: function (value, type, comVal) {
     if (value && value.indexOf('~') != -1 && value.split('~').length == 2) {
       let start = value.split('~')[0];
       let end = value.split('~')[1];
@@ -351,7 +351,7 @@ const com = {
       }
     }
   },
-  convertDate: function(str) {
+  convertDate: function (str) {
     if (str) {
       if (str.indexOf('-') != -1) {
         str = str = str.replace(/-/g, '/');
@@ -371,7 +371,7 @@ const com = {
       }
     }
   },
-  addDate: function(tempDate, days, unit) {
+  addDate: function (tempDate, days, unit) {
     let date = tempDate;
     if (['D', 'H', 'W'].includes(unit)) {
       if (tempDate && XEUtils.isValidDate(tempDate)) {
@@ -398,7 +398,7 @@ const com = {
       return new Date(date + days * 3600 * 1000);
     }
   },
-  addDiDate: function(curDate, count, unit = 'day', type) {
+  addDiDate: function (curDate, count, unit = 'day', type) {
     let useTime,
       res = {};
     let getUnit = unit.toLowerCase();
@@ -413,7 +413,7 @@ const com = {
     return res;
   },
   // 获取当前季度第一天
-  getCurSeasonFirstDay: function() {
+  getCurSeasonFirstDay: function () {
     let curDate = new Date();
     let year = curDate.getFullYear();
     let month = curDate.getMonth() + 1;
@@ -427,7 +427,7 @@ const com = {
       return new Date(year + '/10/01');
     }
   },
-  isNumber: function(val) {
+  isNumber: function (val) {
     try {
       let i = val * 1 + 100;
       if (i > 0 || i < 0 || i == 0) {
@@ -438,7 +438,7 @@ const com = {
     }
     return false;
   },
-  isDate: function(data) {
+  isDate: function (data) {
     if (isNaN(data) && !isNaN(Date.parse(data))) {
       return true;
     }
@@ -701,13 +701,13 @@ XEUtils.mixin({
    * @param {*} k key
    * @returns
    */
-   stringToValue(item, k = "value") {
-      if (XEUtils.isString(item)) {
-        if (item && item.startsWith("###{")) {
-          let temp = JSON.parse(item.replace("###", ""));
-          item = temp[k];
-        }
+  stringToValue(item, k = "value") {
+    if (XEUtils.isString(item)) {
+      if (item && item.startsWith("###{")) {
+        let temp = JSON.parse(item.replace("###", ""));
+        item = temp[k];
       }
+    }
     return item;
   },
 
@@ -715,71 +715,89 @@ XEUtils.mixin({
     return XEUtils.isBoolean(text) || String(text) === "0" || !!text;
   },
 
-    /**
-   * 变量转换
-   * @param {string} str
-   * @param {object} obj
-   * @param {string | number} noval // 没有值，默认赋值
-   */
-     handleSysParams(str, obj = {}, noval = "") {
-      let p = {
-        ...obj
-      };
-      const that = this;
-      // 解析变量
-      const getValList = (plsList = [], obj = {}) => {
-        var l = [];
-        var o = obj;
-        plsList.forEach(v => {
-          let c = v;
-          // xx.xx
-          if (v.includes(".")) {
-            try {
-              // 使用 eval 解析 'result.map.map.filed'
-              eval(`c=o.${v}`);
-            } catch (error) {
-              c = "";
-            }
-          }
-          if (XEUtils.notEmpty(c)) {
-            l.push(c);
+  /**
+ * 变量转换
+ * @param {string} str
+ * @param {object} obj
+ * @param {string | number} noval // 没有值，默认赋值
+ */
+  handleSysParams(str, obj = {}, noval = "") {
+    let p = {
+      ...obj
+    };
+    const that = this;
+    // 解析变量
+    const getValList = (plsList = [], obj = {}) => {
+      var l = [];
+      var o = obj;
+      plsList.forEach(v => {
+        let c = v;
+        // xx.xx
+        if (v.includes(".")) {
+          try {
+            // 使用 eval 解析 'result.map.map.filed'
+            eval(`c=o.${v}`);
+          } catch (error) {
+            c = "";
           }
-        });
-        return l;
-      };
-      const getVal = (t, r, k) => {
-        return t.replace(r, function() {
-          var pKey = arguments[1];
-          // 切割
-          var pls = pKey.split("!");
-          // 取值
-          var l = getValList(pls, p);
-          var f = l.find(v => XEUtils.notEmpty(v));
-          var res = f;
-          res = XEUtils.notEmpty(res) ? res : noval;
-          return res;
-        });
-      };
-      if (typeof str === "string") {
-        if (str.includes("form")) {
-          str = getVal(str, /\${(.*?)\}/g, "form");
-        }
-        if (str.includes("sys")) {
-          str = getVal(str, /\${(.*?)\}/g, "sys");
         }
-        if (str.includes("db")) {
-          str = getVal(str, /\${(.*?)\}/g, "db");
-        }
-        if (str.includes("table")) {
-          str = getVal(str, /\${(.*?)\}/g, "table");
-        }
-        if (str.includes("result")) {
-          str = getVal(str, /\${(.*?)\}/g, "result");
+        if (XEUtils.notEmpty(c)) {
+          l.push(c);
         }
+      });
+      return l;
+    };
+    const getVal = (t, r, k) => {
+      return t.replace(r, function () {
+        var pKey = arguments[1];
+        // 切割
+        var pls = pKey.split("!");
+        // 取值
+        var l = getValList(pls, p);
+        var f = l.find(v => XEUtils.notEmpty(v));
+        var res = f;
+        res = XEUtils.notEmpty(res) ? res : noval;
+        return res;
+      });
+    };
+    if (typeof str === "string") {
+      if (str.includes("form")) {
+        str = getVal(str, /\${(.*?)\}/g, "form");
       }
-      return str;
-    },
-
+      if (str.includes("sys")) {
+        str = getVal(str, /\${(.*?)\}/g, "sys");
+      }
+      if (str.includes("db")) {
+        str = getVal(str, /\${(.*?)\}/g, "db");
+      }
+      if (str.includes("table")) {
+        str = getVal(str, /\${(.*?)\}/g, "table");
+      }
+      if (str.includes("result")) {
+        str = getVal(str, /\${(.*?)\}/g, "result");
+      }
+    }
+    return str;
+  },
+  /**
+   * 去掉字符串两边的空格
+   * @param {string} str
+   * @return {string}
+   */
+  handleClearStrBlank(str) {
+    if (typeof str === "string") {
+      return str.replace(/^\s*|\s*$/g, "");
+    }
+    return str;
+  },
+  // 数组对象去重
+  uniqArrObj(arr, name) {
+    let obj = {};
+    return arr.reduce((cur, next) => {
+      obj[next[name]] ? "" : (obj[next[name]] = true && cur.push(next));
+      return cur;
+    }, []);
+  },
 });
 
 export default XEUtils;
@@ -809,3 +827,4 @@ export function formatReleaseTime(type, time) {
   }
   return XEUtils.toDateString(time, format);
 }
+