@indfnd/common 0.1.6 → 0.1.7

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.1.7](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.6...v0.1.7) (2024-03-29)
+
 ### [0.1.6](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v0.1.5...v0.1.6) (2024-03-28)
 
 

package/dist/ind-common.es.js

@@ -2,7 +2,7 @@ import { Button as Button$1, ButtonGroup as ButtonGroup$1, Input, Drawer as Draw
 import { isNil, formatDate as formatDate$1, useConfig, getLocalStorage, getQuarterNum, formatQuarter, str2Date, isDate, isArray, checkIdCard, checkVehicleNo, checkPhone, getDictMapApi, axios, isFunction, isString, exportJsonToExcel as exportJsonToExcel$1, importJsonFromExcel, on, off, deleteMenuHistoryApi, deleteMenuCollectApi, getMenuHistoryApi, getMenuCollectApi, listItemTreeApi, getPriceInfo, MIME_TYPE, base64ToBlob, putOssFileApi, isEqual, getCaptchaURL, guid, setLocalStorage, removeLocalStorage, clearSessionStorage, cryptor, getToken, putOssFileUrl, getOssFileUrl, responseInterceptors, config as config$1, setToken, loginApi, clearUserInfoCache, clearPermissionCache, logoutApi, getUserInfoCache, getUserInfoApi, setUserInfoCache, getSessionStorage, setSessionStorage, getAppListApi, getPermissionCache, getPermissionApi, setPermissionCache, menuHistoryApi, addMenuCollectApi, removeMenuCollectApi, getIndexDescCache, listIndexDescApi, setIndexDescCache } from "@indfnd/utils";
 import Vue$1 from "vue";
 const name$1 = "@indfnd/common";
-const version = "0.1.5";
+const version = "0.1.6";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -48386,6 +48386,7 @@ var FormImpl = {
           };
           if (d.validate) {
             validateTmp.validator = d.validate;
+            validateTmp.message = null;
           }
           if (["number"].includes(d.type)) {
             validateTmp.type = "number";
@@ -48524,21 +48525,19 @@ var FormImpl = {
   render(h) {
     let formItems = [];
     let spanList;
-    if (this.formType == "search") {
-      spanList = _.fill(_.range(Math.max(4, this.fieldList.length)), 6);
-    } else {
-      spanList = _.fill(_.range(this.fieldList.length), this.defaultSpan);
-      _.forEach(this.fieldList, (d, idx) => {
-        if (d.span) {
-          spanList[idx] = d.span;
-        } else if (["textarea", "fileUpload", "imgUpload"].includes(d.type)) {
-          spanList[idx] = 24;
-        }
-        let conditionFlag = d.condition instanceof Function ? d.condition(this.form) : d.condition !== false;
-        if (!conditionFlag) {
-          spanList[idx] = 0;
-        }
-      });
+    spanList = _.fill(_.range(this.fieldList.length), this.formType == "search" ? 6 : this.defaultSpan);
+    _.forEach(this.fieldList, (d, idx) => {
+      if (d.span) {
+        spanList[idx] = d.span;
+      } else if (["textarea", "fileUpload", "imgUpload"].includes(d.type)) {
+        spanList[idx] = 24;
+      }
+      let conditionFlag = d.condition instanceof Function ? d.condition(this.form) : d.condition !== false;
+      if (!conditionFlag) {
+        spanList[idx] = 0;
+      }
+    });
+    if (this.formType !== "search") {
       let spanCount = 0;
       _.forEach(spanList, (d, idx) => {
         if (spanCount != 0 && d != this.defaultSpan && d !== 0) {
@@ -60351,7 +60350,7 @@ function addNodeToTree(tree, node) {
     if (!midNode) {
       midNode = {
         pathStr: path2.length == 0 ? node.pathStr : "",
-        id: midPathNode == null ? void 0 : midPathNode.id,
+        id: path2.length == 0 ? node.pathStr : midPathNode == null ? void 0 : midPathNode.id,
         title: midPathNode == null ? void 0 : midPathNode.title,
         children: []
       };
@@ -60380,6 +60379,15 @@ function generateColumnsByTreeNodes(treeNodes) {
   });
   return rlt;
 }
+function generateOptionsByTreeNodes(treeNodes) {
+  let columnsClone = _.cloneDeep(treeNodes);
+  let rlt = {};
+  columnsClone.forEach((d) => {
+    var _a;
+    rlt[d.id] = (_a = d.children) == null ? void 0 : _a.map((dd) => dd.id);
+  });
+  return rlt;
+}
 function getFilterColumnsByParams(options, columns) {
   let columnsClone = _.cloneDeep(columns);
   let itemIdx = _.findIndex(columnsClone, { field: "item" });
@@ -60513,9 +60521,11 @@ const __vue2_script$d = {
       this.$emit("update:show", false);
     },
     onOk() {
+      let columns = generateColumnsByTreeNodes(this.choosedIndexTree);
+      let options = generateOptionsByTreeNodes(this.choosedIndexTree);
       this.$emit("update:show", false);
-      this.$emit("input", generateColumnsByTreeNodes(this.choosedIndexTree));
-      this.$emit("confirm");
+      this.$emit("input", columns);
+      this.$emit("confirm", { options, columns });
     },
     getFilterColumnsByParams(options) {
       let columns = generateColumnsByTreeNodes(this.choosedIndexTree);