cnhis-design-vue 0.2.66-beta → 0.2.69-beta

package/packages/big-table/src/components/edit-form/edit-component/mixins/search.js

@@ -1,4 +1,5 @@
 const SELECT_LIST = ["SEARCH_MORE", "SEARCH", "SEARCH_CASCADE", "LEVEL_SEARCH_CASCADE"];
+import vexutils from '@/utils/vexutils';
 export default {
   components: {
     VNodes: {
@@ -42,7 +43,8 @@ export default {
         isclose: true
       },
 
-      searchShowHotList: false
+      searchShowHotList: false,
+      optionsRequestSource: null
     };
   },
   computed: {
@@ -74,6 +76,7 @@ export default {
       if (html_type == "SEARCH") {
         if (targetStr) {
           this.$nextTick(() => {
+            console.log('handleRequestedOptions---6');
             this.handleRequestedOptions(this.item, targetStr, true);
           });
         }
@@ -144,7 +147,7 @@ export default {
               this.curOptions = [...defOptions];
               this.selectedOptions = [...(defOptions || [])];
             }
-            defList = this.$utils.uniqArrObj(defList, "key");
+            defList = vexutils.uniqArrObj(defList, "key");
             this.defList = defList;
             this.$set(this.item, "useFormValue", defList);
             this.$emit("valueOnChange", [...defOptions], this.item);
@@ -379,6 +382,7 @@ export default {
       defFalg = false,
       otherConfig = {}
     ) {
+      console.log('handleRequestedOptions---1');
       const closeLoading = () => {
         this.fetching = false;
         this.searchPageConfig.isFetching = false;
@@ -436,112 +440,128 @@ export default {
         if (!html_type.includes("SEARCH_CASCADE")) {
           this.cancelOptionsRequest && this.cancelOptionsRequest();
         }
-        this.optionsRequestSource = this.axios.CancelToken.source();
+        // this.optionsRequestSource = axios.CancelToken.source();
         if (keyword && !defFalg) {
           let key = typeof keyword === "string" ? keyword.trim() : keyword;
           key && this.handleSearchTracher(itemData, { keyword: key });
         }
         Object.assign(params, { asyncCount: 1 });
-        return this.axios
-          .post(`/tableReader/getWordbookData`, this.$qs.stringify(params), {
-            cancelToken: this.optionsRequestSource.token
-          })
-          .then(({ data }) => {
-            if (otherConfig.page) {
-              this.handleSearchScrollTop(itemData);
+        let handleEditFormGetWordbookData = this.editFormApiConfig?.handleEditFormGetWordbookData
+        if (!handleEditFormGetWordbookData || typeof handleEditFormGetWordbookData !== 'function') {
+          handleEditFormGetWordbookData = this.getWordbookDataRequest
+        }
+        return handleEditFormGetWordbookData(params, { optionsRequestSource: this.optionsRequestSource }).then((data) => {
+          this.optionsRequestSource = null;
+          this.fetching = false;
+          if (otherConfig.page) {
+            this.handleSearchScrollTop(itemData);
+          }
+          closeLoading();
+          if (!data) return [];
+          this.searchAddObj[`${itemData.val_key}_${itemData.name}`] = true;
+          let { rows, fieldList, page, total } = data.map;
+          this.searchPageConfig = Object.assign(this.searchPageConfig, {
+            page,
+            total,
+            isRequest: true,
+            keyword
+          });
+          let rowData = [];
+          if (isCascade) {
+            wordbook.myUniqueLabel = myUniqueKey;
+            wordbook.myUniqueKey = myUniqueKey;
+            wordbook.isLoadData = html_type == "LEVEL_SEARCH_CASCADE";
+            if (wordbook.isLoadData) {
+              this.levelNum = defFalg ? 1 : this.levelNum;
             }
-            this.optionsRequestSource = null;
-            this.fetching = false;
-            if (data.result === "SUCCESS") {
-              this.searchAddObj[`${itemData.val_key}_${itemData.name}`] = true;
-              let { rows, fieldList, page, total } = data.map;
-              this.searchPageConfig = Object.assign(this.searchPageConfig, {
-                page,
-                total,
-                isRequest: true,
-                keyword
-              });
-              let rowData = [];
-              if (isCascade) {
-                wordbook.myUniqueLabel = myUniqueKey;
-                wordbook.myUniqueKey = myUniqueKey;
-                wordbook.isLoadData = html_type == "LEVEL_SEARCH_CASCADE";
-                if (wordbook.isLoadData) {
-                  this.levelNum = defFalg ? 1 : this.levelNum;
-                }
-                rows = this.hanldeRemoveDuplicates(rows, {
-                  key: wordbook.value_key
-                });
-                this.handleFormCascade(rows, wordbook);
-                rowData = rows;
-              } else {
-                // 去重
-                rowData = this.handleRowUnique(rows, itemData, {
-                  myUniqueKey: myUniqueKey,
-                  reqUniqueKey: reqUniqueKey
-                });
-
-                // 获取显示字段title
-                if (rowData.length > 0 && wordbook.render_key && wordbook.render_key.length > 1) {
-                  rowData.unshift(
-                    Object.assign(
-                      {},
-                      {
-                        showLabel: this.getTitleHeader(fieldList, wordbook.render_key),
-                        myUniqueKey: Math.random()
-                      }
-                    )
-                  );
-                }
-              }
-              const searchList = [
-                "SEARCH",
-                "SEARCH_CASCADE",
-                "SEARCH_MORE",
-                "LEVEL_SEARCH_CASCADE"
-              ];
-              if (searchList.includes(html_type)) {
-                if (html_type != "LEVEL_SEARCH_CASCADE") {
-                  this.curOptions = rowData;
-                } else {
-                  (defFalg || !this.loadDataPrimary_key) && (this.curOptions = rowData);
-                }
-              }
-              // 默认值处理
-              this.handleGetSearchDefVal(defFalg, rowData, itemData, {
-                myUniqueKey: myUniqueKey,
-                reqUniqueKey: reqUniqueKey,
-                keyword: keyword,
-                ...otherConfig
-              });
-
-              // 自由输入
-              if (!defFalg && html_type == "SEARCH" && keyword && free_entry == "1") {
-                this.handleFreeEntry({
-                  rowData,
-                  keyword,
-                  wordbook,
-                  fieldList,
-                  myUniqueKey
-                });
-              }
+            rows = this.hanldeRemoveDuplicates(rows, {
+              key: wordbook.value_key
+            });
+            this.handleFormCascade(rows, wordbook);
+            rowData = rows;
+          } else {
+            // 去重
+            rowData = this.handleRowUnique(rows, itemData, {
+              myUniqueKey: myUniqueKey,
+              reqUniqueKey: reqUniqueKey
+            });
 
-              return rowData;
+            // 获取显示字段title
+            if (rowData.length > 0 && wordbook.render_key && wordbook.render_key.length > 1) {
+              rowData.unshift(
+                Object.assign(
+                  {},
+                  {
+                    showLabel: this.getTitleHeader(fieldList, wordbook.render_key),
+                    myUniqueKey: Math.random()
+                  }
+                )
+              );
             }
-            return [];
-          })
-          .catch(err => {
-            console.log(err);
-          })
-          .finally(() => {
-            closeLoading();
+          }
+          const searchList = [
+            "SEARCH",
+            "SEARCH_CASCADE",
+            "SEARCH_MORE",
+            "LEVEL_SEARCH_CASCADE"
+          ];
+          if (searchList.includes(html_type)) {
+            if (html_type != "LEVEL_SEARCH_CASCADE") {
+              this.curOptions = rowData;
+            } else {
+              (defFalg || !this.loadDataPrimary_key) && (this.curOptions = rowData);
+            }
+          }
+          // 默认值处理
+          this.handleGetSearchDefVal(defFalg, rowData, itemData, {
+            myUniqueKey: myUniqueKey,
+            reqUniqueKey: reqUniqueKey,
+            keyword: keyword,
+            ...otherConfig
           });
+
+          // 自由输入
+          if (!defFalg && html_type == "SEARCH" && keyword && free_entry == "1") {
+            this.handleFreeEntry({
+              rowData,
+              keyword,
+              wordbook,
+              fieldList,
+              myUniqueKey
+            });
+          }
+
+          return rowData;
+
+        }).catch(() => {
+          closeLoading();
+        })
+
       } catch (error) {
         closeLoading();
         console.log(error);
       }
     },
 
+    getWordbookDataRequest(params, config) {
+      let { optionsRequestSource } = config;
+      optionsRequestSource = this.axios.CancelToken.source();
+      return new Promise((resolve, reject) => {
+        this.axios
+          .post(`/tableReader/getWordbookData`, this.$qs.stringify(params), {
+            cancelToken: optionsRequestSource.token
+          })
+          .then(({ data }) => {
+            optionsRequestSource = null;
+            if (data.result === "SUCCESS") return resolve(data);
+            resolve(null);
+          })
+          .catch(err => {
+            reject(err);
+          });
+      });
+    },
+
     handleFreeEntry(option = {}) {
       const { rowData, keyword, wordbook, fieldList, myUniqueKey } = option;
       if (!keyword) return;
@@ -663,6 +683,7 @@ export default {
       this.searchPageConfig.keyword = val || undefined;
       if (this.dropdownHide && !val) return;
       this.timeout = setTimeout(() => {
+        console.log('handleRequestedOptions---2');
         this.handleRequestedOptions(itemData, val);
       }, 200);
     },
@@ -786,6 +807,7 @@ export default {
       this.loadDataPrimary_key = targetOption[this.item.wordbook.primary_key];
       targetOption.loading = true;
       try {
+        console.log('handleRequestedOptions---3');
         const res = await this.handleRequestedOptions(this.item, "", false);
         targetOption.loading = false;
         targetOption.children = res && res.length ? [...res] : undefined;
@@ -799,6 +821,8 @@ export default {
     handlerDropdownVisibleChange(e, data) {
       const searchList = ["SEARCH_MORE", "SEARCH"];
       if (e) {
+        e.preventDefault && e.preventDefault();
+        e.stopPropagation && e.stopPropagation();
         this.handleCalculateOptionsMaxWidth();
       }
 
@@ -818,6 +842,7 @@ export default {
           this.handlerSearchOnFocus(data);
         }
         if (e && isRequest) {
+          console.log('handleRequestedOptions---4');
           this.handleRequestedOptions(data);
         }
         if (!e && this.noAllow_check_mid_level && searchList.includes(data.html_type)) {
@@ -904,6 +929,7 @@ export default {
       let cType = type || "next";
       let { page, keyword = undefined } = this.searchPageConfig;
       page = cType === "next" ? page + 1 : page - 1;
+      console.log('handleRequestedOptions---5');
       this.handleRequestedOptions(this.item, keyword, false, { page });
     },
 
@@ -916,7 +942,7 @@ export default {
         try {
           let item = this.$el.querySelector(".ant-select");
           const itemRect = item.getBoundingClientRect();
-          let baseDom = this.mainForm.$el.querySelector(".base-form");
+          let baseDom = this.mainForm.$el.querySelector(".big-table");
           const baseRect = baseDom.getBoundingClientRect();
           maxwith = baseRect.right - itemRect.left;
 
@@ -1026,29 +1052,38 @@ export default {
       }
     },
 
-    getHotSearchConfig() {
+    async getHotSearchConfig() {
       const { item, mainForm } = this;
       if (!SELECT_LIST.includes(item.html_type) || item.is_recommend != "1") return;
-      this.axios
-        .get("form/commonLatestAndHot", {
-          params: {
-            formId: mainForm.params_formId,
-            valKey: item.val_key,
-            htmlType: item.html_type
-          }
-        })
-        .then(({ data }) => {
-          if (data.result == "SUCCESS") {
-            this.hotSearchConfig.isRequest = true;
-            let hotList = (data?.map?.hotList || []).filter(Boolean);
-            let latestList = (data?.map?.latestList || []).filter(Boolean);
-            let config = Object.assign(this.hotSearchConfig, { hotList, latestList });
-            this.$set(this, "hotSearchConfig", config);
-          }
-        })
-        .catch(err => {
-          console.log(err, "getHotSearchConfig");
-        });
+      let params = {
+        formId: mainForm.params_formId,
+        valKey: item.val_key,
+        htmlType: item.html_type
+      }
+      let handleEditFormCommonLatestAndHot = this.editFormApiConfig?.handleEditFormCommonLatestAndHot
+      if (!handleEditFormCommonLatestAndHot || typeof handleEditFormCommonLatestAndHot !== 'function') {
+        handleEditFormCommonLatestAndHot = this.commonLatestAndHotRequest
+      }
+      let data = await handleEditFormCommonLatestAndHot(params)
+      if (!data) return;
+      this.hotSearchConfig.isRequest = true;
+      let hotList = (data?.map?.hotList || []).filter(Boolean);
+      let latestList = (data?.map?.latestList || []).filter(Boolean);
+      let config = Object.assign(this.hotSearchConfig, { hotList, latestList });
+      this.$set(this, "hotSearchConfig", config);
+    },
+    commonLatestAndHotRequest(params) {
+      return new Promise((resolve, reject) => {
+        this.axios
+          .get(`/tableReader/commonLatestAndHot`, { params })
+          .then(({ data }) => {
+            if (data.result === "SUCCESS") return resolve(data);
+            resolve(null);
+          })
+          .catch(err => {
+            reject(err);
+          });
+      });
     },
 
     handleSelectHotKeyword(key) {
@@ -1080,25 +1115,30 @@ export default {
 
     hanldeClearLately() {
       const { item, mainForm } = this;
-      this.axios
-        .post(
-          "form/deleteLatestAndHot",
-          this.$qs.stringify({
-            formId: mainForm.params_formId,
-            valKey: item.val_key,
-            htmlType: item.html_type
+      let params = {
+        formId: mainForm.params_formId,
+        valKey: item.val_key,
+        htmlType: item.html_type
+      }
+      let handleEditFormDeleteLatestAndHot = this.editFormApiConfig?.handleEditFormDeleteLatestAndHot;
+      if (!handleEditFormDeleteLatestAndHot || typeof handleEditFormDeleteLatestAndHot !== 'function') {
+        handleEditFormDeleteLatestAndHot = this.deleteLatestAndHotRequest
+      }
+      handleEditFormDeleteLatestAndHot(params);
+    },
+    deleteLatestAndHotRequest(params) {
+      return new Promise((resolve, reject) => {
+        this.axios
+          .post(`/form/deleteLatestAndHot`, this.$qs.stringify(params))
+          .then(({ data }) => {
+            if (data.result == "SUCCESS") return resolve(data);
+            this.$message.warning(data.resultMsg || "删除失败");
+            resolve(null);
           })
-        )
-        .then(({ data }) => {
-          if (data.result == "SUCCESS") {
-            // this.hotSearchConfig.latestList = [];
-            // this.hotSearchConfig.hotList = [];
-            // 点击清除成功，刷新“常用值”数据
-            // this.getHotSearchConfig();
-          } else {
-            this.$message.warning(data.resultMsg || this.$t("1.7.1.10"));
-          }
-        });
+          .catch(err => {
+            reject(err);
+          });
+      });
     },
     closeHotSearch() {
       this.hideHotSearch = false;
@@ -1108,26 +1148,35 @@ export default {
       if (!SELECT_LIST.includes(item?.html_type || undefined)) return;
       const { mainForm } = this;
       const { keyword = "", select = "" } = obj || {};
-      try {
-        // 埋点
-        let key =
-          item.html_type === "SEARCH_MORE"
-            ? "表单搜索多选框"
-            : item.html_type === "SEARCH"
-              ? "表单搜索框"
-              : item.html_type === "SEARCH_CASCADE"
-                ? "表单级联搜索"
-                : "表单逐级级联";
-        this.$_handleTracherLog(key, {
-          表单ID: mainForm.params_formId,
-          字段Key: item.val_key,
-          字段名称: item.name,
-          搜索关键字: keyword,
-          选中值: select
-        });
-      } catch (error) {
-        console.log(error);
+      // 埋点
+      let key =
+        item.html_type === "SEARCH_MORE"
+          ? "表单搜索多选框"
+          : item.html_type === "SEARCH"
+            ? "表单搜索框"
+            : item.html_type === "SEARCH_CASCADE"
+              ? "表单级联搜索"
+              : "表单逐级级联";
+      let params = {
+        key,
+        params_formId: mainForm.params_formId,
+        val_key: item.val_key,
+        name: item.name,
+        keyword,
+        select
       }
+      this.handleGetConfigApi(params, 'handleEditFormSearchTracher');
+      // try {
+      //   this.$_handleTracherLog(key, {
+      //     表单ID: mainForm.params_formId,
+      //     字段Key: item.val_key,
+      //     字段名称: item.name,
+      //     搜索关键字: keyword,
+      //     选中值: select
+      //   });
+      // } catch (error) {
+      //   console.log(error);
+      // }
     },
 
     hanldercheckOption(data) {
@@ -1167,7 +1216,7 @@ export default {
         if (Array.isArray(selectedOptions) && selectedOptions.length > 0) {
           let val = this.handleGetAllFormValue()[item.val_key];
           let keyword = "";
-          if (this.$utils.isJSON(val)) {
+          if (vexutils.isJSON(val)) {
             keyword = JSON.parse(val)?.objStr || "";
           }
           if (!keyword) return;

package/packages/big-table/src/components/edit-form/edit-item/form-event.js

@@ -1,3 +1,4 @@
+import vexutils from '@/utils/vexutils';
 export const formEvent = {
   methods: {
     /**
@@ -28,7 +29,7 @@ export const formEvent = {
         };
         operationalForm.forEach(v => {
           let itemRes;
-          let operationalRule = this.$utils.handleSysParams(v.operationalRule, obj, 0);
+          let operationalRule = vexutils.handleSysParams(v.operationalRule, obj, 0);
           let operationFormParam = v.operationFormParam;
           let f = operationFormParam.find(v => v.includes(curKey));
           if (!f) return;
@@ -57,7 +58,7 @@ export const formEvent = {
     handleGetOperationalKey(str) {
       // table.dept_name 提取 dept_name
       const getVal = (t, r) => {
-        return t.replace(r, function() {
+        return t.replace(r, function () {
           var pKey = arguments[1];
           return pKey || '';
         });

package/packages/big-table/src/components/edit-form/edit-item/validate-rules.js

@@ -1,6 +1,7 @@
 /**
  * 表单检验
  */
+import vexutils from '@/utils/vexutils';
 const validateRules = {
   data() {
     return {};
@@ -119,7 +120,7 @@ const validateRules = {
       if (validate && vali_obj == "mobile" && !validate.phone_idcard_type && is_null == 0) {
         initRules.push({
           pattern: /(^[0-9]{11,11}$)/,
-          message: this.$t("1.1.7.29"),
+          message: '请正确输入手机号',
           trigger: "change"
         });
       }
@@ -148,7 +149,7 @@ const validateRules = {
         const { min_value, max_value } = validate || {};
         let showName = alias || name;
         // max_value min_value
-        if (isNaN(+value)) {
+        if (value && isNaN(+value)) {
           callback("只能输入数字");
           return;
         }
@@ -257,7 +258,7 @@ const validateRules = {
         if (Array.isArray(value)) {
           if (is_null == 0) {
             if (value.length === 0) {
-              callback(`${this.$t("1.1.6.7")}${alias || name}`);
+              callback(`请选择${alias || name}`);
               return;
             }
           }
@@ -298,7 +299,6 @@ const validateRules = {
         let max = strlen > max_length,
           min = min_length > strlen;
         if (is_null == 0 && !value && value != 0) {
-          // callback(`${this.$t("1.9.47")}`);
           callback(`请输入${min_length || 0}-${max_length}个字符`);
           return;
         }
@@ -355,7 +355,7 @@ const validateRules = {
         let unit = html_type === "UPPICTURE" ? "张" : "个";
         if (html_type === "UPPICTURE") {
           curval = curval.split(",").filter(Boolean);
-        } else if (this.$utils.isJSON(value || "")) {
+        } else if (vexutils.isJSON(value || "")) {
           curval = JSON.parse(curval);
         }
         let len = curval?.length || 0;
@@ -387,7 +387,7 @@ const validateRules = {
         if (is_null == 0 && !curval) {
           callback(`请选${name}`);
         }
-        if (this.$utils.isJSON(value || "")) {
+        if (vexutils.isJSON(value || "")) {
           curval = JSON.parse(curval);
         }
         if (is_null != 0 && !Array.isArray(curval)) {