@94ai/nf-conditions 8.1.6 → 8.1.9

package/lib/index.d.ts

@@ -283,6 +283,10 @@ declare const _default: import("vue/types/v3-component-public-instance").Compone
         type: import("vue-demi").PropType<boolean>;
         default: boolean;
     };
+    outLogicMergeDesc: {
+        type: import("vue-demi").PropType<string>;
+        default: string;
+    };
 }>>, Readonly<import("vue-demi").ExtractPropTypes<{
     tag: {
         type: import("vue-demi").PropType<string>;
@@ -567,6 +571,10 @@ declare const _default: import("vue/types/v3-component-public-instance").Compone
         type: import("vue-demi").PropType<boolean>;
         default: boolean;
     };
+    outLogicMergeDesc: {
+        type: import("vue-demi").PropType<string>;
+        default: string;
+    };
 }>>, {
     reduceCondition: (event: Record<string, any>) => void;
     addCondition: (event: Record<string, any>) => void;
@@ -627,6 +635,7 @@ declare const _default: import("vue/types/v3-component-public-instance").Compone
     addConditionDesc: string;
     deleteConditionDesc: string;
     initAddRuleData: boolean;
+    outLogicMergeDesc: string;
 }, true, import("vue/types/v3-component-options").ComponentOptionsBase<any, any, any, any, any, any, any, any, any, any>> & Readonly<Readonly<import("vue-demi").ExtractPropTypes<{
     tag: {
         type: import("vue-demi").PropType<string>;
@@ -911,6 +920,10 @@ declare const _default: import("vue/types/v3-component-public-instance").Compone
         type: import("vue-demi").PropType<boolean>;
         default: boolean;
     };
+    outLogicMergeDesc: {
+        type: import("vue-demi").PropType<string>;
+        default: string;
+    };
 }>>> & import("vue-demi").ShallowUnwrapRef<{
     addCondition: () => Promise<void>;
     removeCondition: (j: any) => void;
@@ -1346,6 +1359,10 @@ declare const _default: import("vue/types/v3-component-public-instance").Compone
         type: import("vue-demi").PropType<boolean>;
         default: boolean;
     };
+    outLogicMergeDesc: {
+        type: import("vue-demi").PropType<string>;
+        default: string;
+    };
 }>>, any, any, any, import("vue-demi").ComponentComputedOptions, import("vue-demi").ComponentMethodOptions> & import("vue/types/v3-component-options").ComponentOptionsBase<Readonly<import("vue-demi").ExtractPropTypes<{
     tag: {
         type: import("vue-demi").PropType<string>;
@@ -1630,6 +1647,10 @@ declare const _default: import("vue/types/v3-component-public-instance").Compone
         type: import("vue-demi").PropType<boolean>;
         default: boolean;
     };
+    outLogicMergeDesc: {
+        type: import("vue-demi").PropType<string>;
+        default: string;
+    };
 }>>, {
     addCondition: () => Promise<void>;
     removeCondition: (j: any) => void;
@@ -1841,6 +1862,7 @@ declare const _default: import("vue/types/v3-component-public-instance").Compone
     addConditionDesc: string;
     deleteConditionDesc: string;
     initAddRuleData: boolean;
+    outLogicMergeDesc: string;
 }> & {
     props: {
         tag: {
@@ -2126,6 +2148,10 @@ declare const _default: import("vue/types/v3-component-public-instance").Compone
             type: import("vue-demi").PropType<boolean>;
             default: boolean;
         };
+        outLogicMergeDesc: {
+            type: import("vue-demi").PropType<string>;
+            default: string;
+        };
     };
 } & PluginObject<undefined>;
 export default _default;

package/lib/nf-conditions.cjs.js

@@ -147,6 +147,12 @@ __sfc_main.props = {
     type: String,
     default: "且"
   },
+  outLogicMergeDesc: {
+    key: "outLogicMergeDesc",
+    required: false,
+    type: String,
+    default: "或"
+  },
   placeholder: {
     key: "placeholder",
     required: false,
@@ -564,7 +570,17 @@ var _sfc_render = function render() {
         "onChange": () => _vm.$emit("ruleChange", _vm.plan[_vm.conditionsKey])
       }
     })], 1);
+  }), _vm.plan[_vm.conditionsKey].length > 0 ? [_c("div", {
+    staticClass: "nf-line-icon-pre-circle out"
+  }), _c("div", {
+    staticClass: "nf-line-icon-pre out"
+  }), _vm.plan[_vm.conditionsKey].length > 1 ? _c("div", {
+    staticClass: "nf-also-icon out"
+  }, [_vm._v(" " + _vm._s(_vm.outLogicMergeDesc) + " ")]) : _vm._e(), _c("div", {
+    staticClass: "nf-line-icon-after out"
   }), _c("div", {
+    staticClass: "nf-line-icon-after-circle"
+  })] : _vm._e(), _c("div", {
     staticClass: "condition-footer"
   }, [!_vm.hiddenConditionAdd && (!_vm.conditionLimit || ((_a = _vm.plan[_vm.conditionsKey]) == null ? void 0 : _a.length) < _vm.conditionLimit) ? _c("span", {
     staticClass: "add-condition",

package/lib/nf-conditions.esm-bundler.js

@@ -145,6 +145,12 @@ __sfc_main.props = {
     type: String,
     default: "且"
   },
+  outLogicMergeDesc: {
+    key: "outLogicMergeDesc",
+    required: false,
+    type: String,
+    default: "或"
+  },
   placeholder: {
     key: "placeholder",
     required: false,
@@ -562,7 +568,17 @@ var _sfc_render = function render() {
         "onChange": () => _vm.$emit("ruleChange", _vm.plan[_vm.conditionsKey])
       }
     })], 1);
+  }), _vm.plan[_vm.conditionsKey].length > 0 ? [_c("div", {
+    staticClass: "nf-line-icon-pre-circle out"
+  }), _c("div", {
+    staticClass: "nf-line-icon-pre out"
+  }), _vm.plan[_vm.conditionsKey].length > 1 ? _c("div", {
+    staticClass: "nf-also-icon out"
+  }, [_vm._v(" " + _vm._s(_vm.outLogicMergeDesc) + " ")]) : _vm._e(), _c("div", {
+    staticClass: "nf-line-icon-after out"
   }), _c("div", {
+    staticClass: "nf-line-icon-after-circle"
+  })] : _vm._e(), _c("div", {
     staticClass: "condition-footer"
   }, [!_vm.hiddenConditionAdd && (!_vm.conditionLimit || ((_a = _vm.plan[_vm.conditionsKey]) == null ? void 0 : _a.length) < _vm.conditionLimit) ? _c("span", {
     staticClass: "add-condition",

package/lib/nf-conditions.vue.d.ts

@@ -22,6 +22,7 @@ declare const _default: import("vue-demi").DefineComponent<__VLS_WithDefaults<__
     statusIcon?: boolean | undefined;
     validPrefix?: string | undefined;
     logicMergeDesc?: string | undefined;
+    outLogicMergeDesc?: string | undefined;
     placeholder?: string | undefined;
     numberRequireDesc?: string | undefined;
     commonLenLimitDesc?: string | undefined;
@@ -79,6 +80,7 @@ declare const _default: import("vue-demi").DefineComponent<__VLS_WithDefaults<__
     deleteConditionDesc: string;
     size: string;
     logicMergeDesc: string;
+    outLogicMergeDesc: string;
     placeholder: string;
     numberRequireDesc: string;
     commonLenLimitDesc: string;
@@ -339,6 +341,7 @@ declare const _default: import("vue-demi").DefineComponent<__VLS_WithDefaults<__
     statusIcon?: boolean | undefined;
     validPrefix?: string | undefined;
     logicMergeDesc?: string | undefined;
+    outLogicMergeDesc?: string | undefined;
     placeholder?: string | undefined;
     numberRequireDesc?: string | undefined;
     commonLenLimitDesc?: string | undefined;
@@ -396,6 +399,7 @@ declare const _default: import("vue-demi").DefineComponent<__VLS_WithDefaults<__
     deleteConditionDesc: string;
     size: string;
     logicMergeDesc: string;
+    outLogicMergeDesc: string;
     placeholder: string;
     numberRequireDesc: string;
     commonLenLimitDesc: string;
@@ -537,6 +541,7 @@ declare const _default: import("vue-demi").DefineComponent<__VLS_WithDefaults<__
     addConditionDesc: string;
     deleteConditionDesc: string;
     initAddRuleData: boolean;
+    outLogicMergeDesc: string;
 }>;
 export default _default;
 declare type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;

package/package/nf-conditions.vue

@@ -80,6 +80,16 @@
           @onChange="() => $emit('ruleChange' , plan[conditionsKey])"
         />
       </el-form-item>
+      <template v-if="plan[conditionsKey].length > 0">
+        <div class="nf-line-icon-pre-circle out" />
+        <div class="nf-line-icon-pre out" />
+        <div class="nf-also-icon out" v-if="plan[conditionsKey].length > 1">
+          {{ outLogicMergeDesc }}
+        </div>
+        <div class="nf-line-icon-after out" />
+        <div class="nf-line-icon-after-circle" />
+      </template>
+
       <div class="condition-footer">
         <span class="add-condition" @click="addCondition()" v-if="!hiddenConditionAdd && (!conditionLimit || plan[conditionsKey]?.length < conditionLimit)">
           <span class="add-condition-icon">{{ addConditionDesc }}</span>
@@ -147,6 +157,7 @@ const props = withDefaults(defineProps<{
    * 国际化
    */
   logicMergeDesc?: string,
+  outLogicMergeDesc?: string,
   placeholder?: string,
   numberRequireDesc?: string,
   commonLenLimitDesc?: string,
@@ -229,6 +240,7 @@ const props = withDefaults(defineProps<{
 
   size: 'mini',
   logicMergeDesc: '且',
+  outLogicMergeDesc: '或',
   placeholder: '请选择',
   numberRequireDesc: '请输入数字',
   commonLenLimitDesc: '总文案长度不超过2000中文字符',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@94ai/nf-conditions",
-  "version": "8.1.6",
+  "version": "8.1.9",
   "description": "> TODO: description",
   "keywords": [],
   "author": "zoujiahe <zoujiahe@94ai.com>",
@@ -14,9 +14,9 @@
     "url": "http://94ai.gitlab.com/ui/common-ui.git"
   },
   "dependencies": {
-    "@94ai/common-utils": "^8.1.6",
-    "@94ai/nf-rules": "^8.1.6",
-    "@94ai/nf-theme-chalk": "^8.1.6",
+    "@94ai/common-utils": "^8.1.9",
+    "@94ai/nf-rules": "^8.1.9",
+    "@94ai/nf-theme-chalk": "^8.1.9",
     "vue-demi": "^0.14.5"
   },
   "peerDependenciesMeta": {
@@ -32,5 +32,5 @@
   "types": "lib/index.d.ts",
   "main": "lib/nf-conditions.cjs.js",
   "module": "lib/nf-conditions.esm-bundler.js",
-  "gitHead": "bf11e74313c1c8cefa32407eab3d7ef339fe2f72"
+  "gitHead": "eb0b1c5ee29b277208e13eeebdb43d1b07554ce3"
 }