star-horse-lowcode 2.8.3 → 2.8.4

package/dist/index.es.js

@@ -69492,6 +69492,7 @@ const fieldAssign = (props, relationFields, values) => {
     const field = props.formInfo?.find((field2) => field2.fieldName == item);
     if (field) {
       let flag = false;
+      field.formVisible = true;
       Object.entries(record).forEach(([key, value]) => {
         if (value.includes(field.itemType ?? field.type)) {
           field.preps[key] = values;
@@ -69500,86 +69501,127 @@ const fieldAssign = (props, relationFields, values) => {
         }
       });
       if (!flag) {
-        field.defaultValue = values;
+        if (isJson(values)) {
+          Object.entries(values).forEach(([key, value]) => {
+            field.preps[key] = value;
+          });
+        } else if (!Array.isArray(values)) {
+          field.defaultValue = values;
+        }
       }
     }
   });
 };
 const dataLinkage = async (props, item, e) => {
-  let { relationFields, params } = item;
-  if (!relationFields) {
+  if (item.isWorking) {
     return;
   }
-  if (!Array.isArray(relationFields)) {
-    relationFields = [relationFields];
-  }
-  const tempParams = { ...params };
-  tempParams.queryParams = tempParams.queryParams || [];
-  tempParams.queryParams.push(
-    createCondition(item.matchFieldName, e, item.matchType)
-  );
-  const resultData = await dynamicUrlOperation({
-    preps: {
-      ...tempParams
+  item.isWorking = true;
+  try {
+    let { relationFields, params, matchFieldValue } = item;
+    if (!Array.isArray(matchFieldValue)) {
+      matchFieldValue = matchFieldValue ? [matchFieldValue] : [];
     }
-  });
-  fieldAssign(props, relationFields, resultData);
+    if (matchFieldValue.length > 0 && !matchFieldValue.includes(item.controlCondition)) {
+      return;
+    }
+    if (!Array.isArray(relationFields)) {
+      relationFields = [relationFields];
+    }
+    const tempParams = { ...params };
+    if (item.controlCondition == "asParamDataLinkage") {
+      tempParams.queryParams = tempParams.queryParams || [];
+      tempParams.queryParams.push(
+        createCondition(item.matchFieldName, e, item.matchType)
+      );
+    }
+    const resultData = await dynamicUrlOperation({
+      preps: {
+        ...tempParams
+      }
+    });
+    fieldAssign(props, relationFields, resultData);
+  } finally {
+    item.isWorking = false;
+  }
 };
-const eqDisableOrEditable = (props, item, e, isEq) => {
-  let { relationFields, params } = item;
-  if (!relationFields) {
+const eqDisableOrEditable = (props, item, e) => {
+  let { relationFields, matchFieldValue } = item;
+  if (item.isWorking) {
     return;
   }
-  if (!Array.isArray(relationFields)) {
-    relationFields = [relationFields];
+  if (!Array.isArray(matchFieldValue)) {
+    matchFieldValue = matchFieldValue ? [matchFieldValue] : [];
   }
-  relationFields?.forEach(async (item2) => {
-    const field = props.formInfo?.find((field2) => field2.fieldName == item2);
-    if (field) {
-      field.formVisible = isEq ? params != e : params == e;
+  try {
+    item.isWorking = true;
+    if (!Array.isArray(relationFields)) {
+      relationFields = [relationFields];
     }
-  });
+    relationFields?.forEach(async (sitem) => {
+      const field = props.formInfo?.find(
+        (field2) => field2.fieldName == sitem
+      );
+      if (field) {
+        if (!field.preps) {
+          field.preps = {};
+        }
+        if (item.controlCondition == "eqHide") {
+          field.formVisible = !matchFieldValue.includes(e);
+        } else if (item.controlCondition == "eqVisible") {
+          field.formVisible = matchFieldValue.includes(e);
+        } else if (item.controlCondition == "eqEditable") {
+          field.preps["disabled"] = !matchFieldValue.includes(e);
+        } else if (item.controlCondition == "eqDisable") {
+          field.preps["disabled"] = matchFieldValue.includes(e);
+        }
+      }
+    });
+  } finally {
+    item.isWorking = false;
+  }
 };
 const assignValue = (props, item, e) => {
-  let { relationFields, relationDetailsDefaultValue } = item;
-  if (!relationFields) {
-    return;
-  }
+  let { relationFields, staticDatas } = item;
   if (!Array.isArray(relationFields)) {
     relationFields = [relationFields];
   }
-  fieldAssign(props, relationFields, relationDetailsDefaultValue);
+  fieldAssign(props, relationFields, staticDatas);
 };
 const changeType = (props, item, e) => {
-  let { relationFields, params } = item;
-  if (!relationFields) {
-    return;
-  }
+  let { relationFields } = item;
   if (!Array.isArray(relationFields)) {
     relationFields = [relationFields];
   }
-  relationFields?.forEach(async (item2) => {
-    const field = props.formInfo?.find((field2) => field2.fieldName == item2);
+  relationFields?.forEach(async (sitem) => {
+    const field = props.formInfo?.find(
+      (field2) => field2.fieldName == sitem
+    );
     if (field) {
-      field.itemType = params;
+      field.itemType = item.staticDatas;
     }
   });
 };
 const relationEvent = (props, relationDetails, e, actionName) => {
   relationDetails?.forEach((item) => {
-    const { controlCondition } = item;
+    let { controlCondition, relationFields, matchFieldValue } = item;
+    if (!Array.isArray(matchFieldValue)) {
+      matchFieldValue = matchFieldValue ? [matchFieldValue] : [];
+    }
+    if (!relationFields) {
+      return;
+    }
     switch (controlCondition) {
       //数据联动
-      case "dataLinkage":
+      case "eqConditionDataLinkage":
+      case "asParamDataLinkage":
         dataLinkage(props, item, e);
         break;
       case "eqDisable":
-      case "eqDisableOrEditable":
-        eqDisableOrEditable(props, item, e, true);
-        break;
+      case "eqHide":
       case "eqEditable":
-      case "eqEditableOrDisable":
-        eqDisableOrEditable(props, item, e, false);
+      case "eqVisible":
+        eqDisableOrEditable(props, item, e);
         break;
       case "assignValue":
         assignValue(props, item);
@@ -69630,13 +69672,13 @@ const checkIsDisabled = (attrs) => {
   const isImplicitlyDisabled = !attrs?.formData?.[`_${fieldName}Editable`] && field?.preps?.disabled;
   return eidtDidsabled === true || isExplicitlyDisabled === true || isImplicitlyDisabled === true;
 };
-const initRelationEvent = (props, formData) => {
+const initRelationEvent = (props, formData, needWatch) => {
   const dataRelation = props.field.preps?.dataRelation;
   const actionName = dataRelation?.actionName;
   if (actionName) {
-    if (Object.keys(formData.value || {}).length == 0 || !formData.value[props.field.fieldName]) {
+    if ((Object.keys(formData.value || {}).length == 0 || !formData.value?.[props.field?.fieldName]) && needWatch) {
       const stop = watch(
-        () => formData.value[props.field.fieldName],
+        () => formData.value?.[props.field?.fieldName],
         (val) => {
           if (val) {
             relationEvent(
@@ -69665,7 +69707,7 @@ const initCompCallEvent = (props, emits, formData) => {
         (val) => {
           if (val) {
             doInitCallEvent(props, emits, formData);
-            initRelationEvent(props, val);
+            initRelationEvent(props, val, false);
             stop();
           }
         },
@@ -69675,7 +69717,7 @@ const initCompCallEvent = (props, emits, formData) => {
     }
     doInitCallEvent(props, emits, formData);
   }
-  initRelationEvent(props, formData);
+  initRelationEvent(props, formData, true);
 };
 const doInitCallEvent = (props, emits, formData) => {
   const events = Object.keys(props.field.actions || {});
@@ -69971,37 +70013,49 @@ const useZIndex = (zIndexOverrides) => {
     nextZIndex
   };
 };
+const handleEvent = (eventName, e, recall) => {
+  if (eventName.includes(".")) {
+    const modifier = eventName.split(".")[1];
+    if (modifier == e.key.toLowerCase()) {
+      console.log("成功触发事件:", eventName);
+      recall && recall(modifier);
+    }
+  } else {
+    recall && recall(eventName);
+  }
+};
+const baseEvent = (eventName, recall) => {
+  return function handler(e) {
+    handleEvent(eventName, e, recall);
+  };
+};
+const baseRelationEvent = (props, relationDetails, actionName) => {
+  return function handler(e) {
+    handleEvent(actionName, e, (tempName) => {
+      relationEvent(props, relationDetails, e);
+    });
+  };
+};
 function getDynamicEvents(props, recall) {
   const events = {};
   const actions = props.field.actions;
   const actionNames = Object.keys(actions || {});
-  const handleEvent = (eventName, e, subReCall) => {
-    if (eventName.includes(".")) {
-      const modifier = eventName.split(".")[1];
-      if (modifier == e.key.toLowerCase()) {
-        console.log("成功触发事件:", eventName);
-        recall && recall(modifier);
-        subReCall && subReCall(modifier);
-      }
-    } else {
-      recall && recall(eventName);
-      subReCall && subReCall(eventName);
-    }
-  };
   actionNames?.forEach((actionName2) => {
     if (actionName2.includes(".")) {
-      const baseEvent = actionName2.split(".")[0];
-      events[baseEvent] = (e) => handleEvent(actionName2, e);
+      const baseEventName = actionName2.split(".")[0];
+      events[baseEventName] = baseEvent(actionName2, recall);
     } else {
-      events[actionName2] = (e) => handleEvent(actionName2, e);
+      events[actionName2] = baseEvent(actionName2, recall);
     }
   });
   const dataRelation = props.field.preps?.dataRelation;
   const actionName = dataRelation?.actionName;
   if (actionName) {
-    events[actionName] = (e) => handleEvent(actionName, e, (actionName2) => {
-      relationEvent(props, dataRelation?.relationDetails, e);
-    });
+    events[actionName] = baseRelationEvent(
+      props,
+      dataRelation?.relationDetails,
+      actionName
+    );
   }
   return events;
 }
@@ -127553,9 +127607,13 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
     onMounted(() => {
       init();
     });
-    watch(() => props.field, () => {
-      checkMenuStatus();
-    }, { deep: true, immediate: true });
+    watch(
+      () => props.field,
+      () => {
+        checkMenuStatus();
+      },
+      { deep: true, immediate: true }
+    );
     watch(
       () => props.parentField,
       () => tableAction(props, buttonControl.value, props.type),
@@ -129349,7 +129407,7 @@ const _sfc_main$19 = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const __unplugin_components_0$3 = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["__scopeId", "data-v-5f72910f"]]);
+const __unplugin_components_0$3 = /* @__PURE__ */ _export_sfc(_sfc_main$19, [["__scopeId", "data-v-90a916cb"]]);
 
 const starhorseFormItem = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -129454,7 +129512,7 @@ const _sfc_main$18 = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const areaItem = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["__scopeId", "data-v-7938a999"]]);
+const areaItem = /* @__PURE__ */ _export_sfc(_sfc_main$18, [["__scopeId", "data-v-c481f296"]]);
 
 const areaItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -129878,7 +129936,7 @@ const _sfc_main$15 = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const buttonItem = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-26c4272c"]]);
+const buttonItem = /* @__PURE__ */ _export_sfc(_sfc_main$15, [["__scopeId", "data-v-de366f68"]]);
 
 const buttonItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -130140,7 +130198,7 @@ const _sfc_main$14 = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const cascadeItem = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["__scopeId", "data-v-ec2aa290"]]);
+const cascadeItem = /* @__PURE__ */ _export_sfc(_sfc_main$14, [["__scopeId", "data-v-cebddac7"]]);
 
 const cascadeItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -133225,7 +133283,7 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const datetimeItem = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["__scopeId", "data-v-66eaf449"]]);
+const datetimeItem = /* @__PURE__ */ _export_sfc(_sfc_main$T, [["__scopeId", "data-v-16e3ccaf"]]);
 
 const datetimeItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -133468,7 +133526,7 @@ const _sfc_main$R = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const dialogInputItem = /* @__PURE__ */ _export_sfc(_sfc_main$R, [["__scopeId", "data-v-af0205ca"]]);
+const dialogInputItem = /* @__PURE__ */ _export_sfc(_sfc_main$R, [["__scopeId", "data-v-cc7182c1"]]);
 
 const dialogInputItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -150927,7 +150985,7 @@ const _sfc_main$N = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const iconItem = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-9ca9bb86"]]);
+const iconItem = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-001b0103"]]);
 
 const iconItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -151143,7 +151201,7 @@ const _sfc_main$M = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const imageItem = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-1f811710"]]);
+const imageItem = /* @__PURE__ */ _export_sfc(_sfc_main$M, [["__scopeId", "data-v-d561ca11"]]);
 
 const imageItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -151390,7 +151448,7 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const inputItem = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["__scopeId", "data-v-a1b1d0a2"]]);
+const inputItem = /* @__PURE__ */ _export_sfc(_sfc_main$K, [["__scopeId", "data-v-277d463f"]]);
 
 const inputItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -151574,7 +151632,7 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const __unplugin_components_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-b63980a0"]]);
+const __unplugin_components_0$2 = /* @__PURE__ */ _export_sfc(_sfc_main$J, [["__scopeId", "data-v-c5fe21a2"]]);
 
 const baseJsonItem = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -203223,7 +203281,7 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const markdownItem = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__scopeId", "data-v-f2582961"]]);
+const markdownItem = /* @__PURE__ */ _export_sfc(_sfc_main$G, [["__scopeId", "data-v-e8c73824"]]);
 
 const markdownItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -203311,7 +203369,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const numberItem = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__scopeId", "data-v-760161df"]]);
+const numberItem = /* @__PURE__ */ _export_sfc(_sfc_main$F, [["__scopeId", "data-v-b8e8df9f"]]);
 
 const numberItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -203456,7 +203514,7 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const numberRangeItem = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["__scopeId", "data-v-0e318291"]]);
+const numberRangeItem = /* @__PURE__ */ _export_sfc(_sfc_main$E, [["__scopeId", "data-v-78dc5aa2"]]);
 
 const numberRangeItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -203853,7 +203911,7 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const pageSelectItem = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__scopeId", "data-v-9debdb0c"]]);
+const pageSelectItem = /* @__PURE__ */ _export_sfc(_sfc_main$D, [["__scopeId", "data-v-10cadb61"]]);
 
 const pageSelectItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -204315,7 +204373,7 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const selectItem = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__scopeId", "data-v-f3d02d02"]]);
+const selectItem = /* @__PURE__ */ _export_sfc(_sfc_main$z, [["__scopeId", "data-v-2d4ab92c"]]);
 
 const selectItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -204884,7 +204942,7 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const signatureItem = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__scopeId", "data-v-68c85ca0"]]);
+const signatureItem = /* @__PURE__ */ _export_sfc(_sfc_main$y, [["__scopeId", "data-v-dd94b6d6"]]);
 
 const signatureItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -205297,7 +205355,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const timeItem = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-57418512"]]);
+const timeItem = /* @__PURE__ */ _export_sfc(_sfc_main$s, [["__scopeId", "data-v-99def2f8"]]);
 
 const timeItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -205362,7 +205420,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const timePickerItem = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-271ede98"]]);
+const timePickerItem = /* @__PURE__ */ _export_sfc(_sfc_main$r, [["__scopeId", "data-v-458f167a"]]);
 
 const timePickerItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -205855,7 +205913,7 @@ const _sfc_main$n = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const uploadItem = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__scopeId", "data-v-9838d555"]]);
+const uploadItem = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["__scopeId", "data-v-fab47ad8"]]);
 
 const uploadItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,
@@ -206085,7 +206143,7 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
       loadComponent();
     });
     watch(
-      () => [props.field.preps?.compName, props.field.preps?.name],
+      () => props.field.preps?.compName,
       () => {
         loadComponent();
       },
@@ -206185,7 +206243,7 @@ const _sfc_main$k = /* @__PURE__ */ defineComponent({
 
 /* unplugin-vue-components disabled */
 
-const viewMarkdownItem = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-486e2f68"]]);
+const viewMarkdownItem = /* @__PURE__ */ _export_sfc(_sfc_main$k, [["__scopeId", "data-v-2ee361a9"]]);
 
 const viewMarkdownItem$1 = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.defineProperty({
   __proto__: null,

package/dist/types/index.d.ts

@@ -3404,7 +3404,7 @@ export declare interface RelationDetail {
     /**
      * 控制条件
      */
-    controlCondition: string;
+    controlCondition: "eqConditionDataLinkage" | "asParamDataLinkage" | "eqDisable" | "eqEditable" | "eqHide" | "eqVisible" | "assignValue" | "changeType" | string;
     /**
      * 关联字段
      */
@@ -3417,14 +3417,22 @@ export declare interface RelationDetail {
      * 匹配字段名称
      */
     matchFieldName: string;
+    /**
+     * 匹配字段值
+     */
+    matchFieldValue: Array<string> | string;
     /**
      * 关联参数
      */
-    params: RedirectParams | any;
+    params: RedirectParams;
+    /**
+     * 关联静态数据,根据不同类型赋值
+     */
+    staticDatas: SelectOption[] | any;
     /**
-     * 关联参数默认值
+     * 多次事件是否 working
      */
-    relationDetailsDefaultValue: SelectOption[] | any;
+    isWorking: boolean;
 }
 
 /**

package/package.json

@@ -2,7 +2,7 @@
   "name": "star-horse-lowcode",
   "private": false,
   "author": "l_1019@163.com",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "type": "module",
   "description": "星马低代码核心库，提供了低代码平台的基础功能和组件库。此库可引用到您的项目中，快速构建表单和列表。",
   "keywords": [
@@ -100,7 +100,7 @@
   },
   "devDependencies": {
     "@types/jquery": "^3.5.32",
-    "@types/node": "^24.2.1",
+    "@types/node": "^24.3.0",
     "@types/prismjs": "^1.26.5",
     "@types/sortablejs": "^1.15.8",
     "@types/uuid": "^10.0.0",