cnhis-design-vue 3.3.3-beta.31 → 3.3.3-beta.41

package/README.md

@@ -1,87 +1,87 @@
-# 安装
-
-```shell
-npm i cnhis-design-vue@[版本号]
-# or
-yarn add cnhis-design-vue@[版本号] #推荐
-```
-
-## 1.全局引入
-
-```typescript
-// main.ts
-import { createApp } from 'vue';
-import App from './App.vue';
-import 'cnhis-design-vue/es/packages/index.css';
-import cui from 'cnhis-design-vue';
-
-const app = createApp(App);
-app.use(cui).mount('#app');
-```
-
-## 2. 按需引入
-
-组件现在支持了自动按需引入, 但是样式文件需要额外的处理
-
-### 2.1 样式处理方式1 (按需引入样式)
-
-```shell
-# 安装自动导入样式的插件
-npm i -d vite-plugin-style-import
-```
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-import { createStyleImportPlugin } from 'vite-plugin-style-import';
-
-export default defineConfig({
-  plugins: [
-    // ...otherPlugins
-    createStyleImportPlugin({
-      libs: [
-        {
-          libraryName: 'cnhis-design-vue',
-          esModule: true,
-          ensureStyleFile: true,
-          resolveStyle: name => {
-            return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
-          }
-        }
-      ]
-    })
-  ]
-});
-```
-
-### 2.2 样式处理方式2 (全局引入样式)
-
-```typescript
-// main.ts
-import 'cnhis-design-vue/es/components/index.css';
-```
-
-## 3.FAQ
-
-### 3.1 项目打包后样式丢失
-
-处理方法, 将 cnhis-design-vue 从 vendor 包中移除 (没有出现此问题则不需要)
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    rollupOptions: {
-      // ..otherOptions
-      output: {
-        dir: './dist',
-        manualChunks: {
-          'cnhis-vendor': ['cnhis-design-vue']
-        }
-      }
-    }
-  }
-});
-```
+# 安装
+
+```shell
+npm i cnhis-design-vue@[版本号]
+# or
+yarn add cnhis-design-vue@[版本号] #推荐
+```
+
+## 1.全局引入
+
+```typescript
+// main.ts
+import { createApp } from 'vue';
+import App from './App.vue';
+import 'cnhis-design-vue/es/packages/index.css';
+import cui from 'cnhis-design-vue';
+
+const app = createApp(App);
+app.use(cui).mount('#app');
+```
+
+## 2. 按需引入
+
+组件现在支持了自动按需引入, 但是样式文件需要额外的处理
+
+### 2.1 样式处理方式1 (按需引入样式)
+
+```shell
+# 安装自动导入样式的插件
+npm i -d vite-plugin-style-import
+```
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+import { createStyleImportPlugin } from 'vite-plugin-style-import';
+
+export default defineConfig({
+  plugins: [
+    // ...otherPlugins
+    createStyleImportPlugin({
+      libs: [
+        {
+          libraryName: 'cnhis-design-vue',
+          esModule: true,
+          ensureStyleFile: true,
+          resolveStyle: name => {
+            return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
+          }
+        }
+      ]
+    })
+  ]
+});
+```
+
+### 2.2 样式处理方式2 (全局引入样式)
+
+```typescript
+// main.ts
+import 'cnhis-design-vue/es/components/index.css';
+```
+
+## 3.FAQ
+
+### 3.1 项目打包后样式丢失
+
+处理方法, 将 cnhis-design-vue 从 vendor 包中移除 (没有出现此问题则不需要)
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    rollupOptions: {
+      // ..otherOptions
+      output: {
+        dir: './dist',
+        manualChunks: {
+          'cnhis-vendor': ['cnhis-design-vue']
+        }
+      }
+    }
+  }
+});
+```

package/es/components/button-print/src/components/NewPrintComponent.vue2.js

@@ -1223,6 +1223,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }), createCommentVNode(" \u5916\u663E\u8BBE\u7F6E\u6309\u94AE "), outerPrintItems.value.length > 0 && outerPrintItems.value.length == unref(showSettingItems).length && unref(isShowOutSettingBtn) && unref(isPrintAllType) != 2 ? (openBlock(), createBlock(unref(NPopover), {
         key: 0,
         trigger: "click",
+        placement: "bottom-start",
         to: unref(positionElement),
         "show-arrow": false,
         show: downlistPopover.isOutSetting,
@@ -1299,6 +1300,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       }, [createCommentVNode(" \u6253\u5370\u5168\u90E8\u6309\u94AE "), createVNode(unref(NPopover), {
         trigger: "click",
         "show-arrow": false,
+        placement: "bottom-start",
         to: unref(positionElement),
         show: downlistPopover.oneShow,
         onClickoutside: _cache[10] || (_cache[10] = ($event) => handleClickOutHide("oneShow"))

package/es/components/card-render/src/components/index.d.ts

@@ -143,29 +143,6 @@ declare function getComponent(type: COMPONENT_TYPE): import("vue").DefineCompone
         default: () => {};
         type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "button-click"[], "button-click", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    config: {
-        default: () => {};
-        type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
-    };
-    data: {
-        default: () => {};
-        type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
-    };
-}>> & {
-    "onButton-click"?: ((...args: any[]) => any) | undefined;
-}, {
-    data: import("../../../../shared/types").AnyObject;
-    config: import("../../../../shared/types").AnyObject;
-}> | import("vue").DefineComponent<{
-    config: {
-        default: () => {};
-        type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
-    };
-    data: {
-        default: () => {};
-        type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
-    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         config: {
@@ -491,6 +468,29 @@ declare function getComponent(type: COMPONENT_TYPE): import("vue").DefineCompone
         default: () => {};
         type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
     };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "button-click"[], "button-click", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    config: {
+        default: () => {};
+        type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
+    };
+    data: {
+        default: () => {};
+        type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
+    };
+}>> & {
+    "onButton-click"?: ((...args: any[]) => any) | undefined;
+}, {
+    data: import("../../../../shared/types").AnyObject;
+    config: import("../../../../shared/types").AnyObject;
+}> | import("vue").DefineComponent<{
+    config: {
+        default: () => {};
+        type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
+    };
+    data: {
+        default: () => {};
+        type: import("vue").PropType<import("../../../../shared/types").AnyObject>;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         config: {

package/es/components/classification/src/components/table-modal/index.vue.d.ts

@@ -175,6 +175,9 @@ declare const _default: import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     } & {
+        /**
+         * 改变弹窗大小
+         */
         itemKey?: string | Function | undefined;
     }>, {
         move: Function;

package/es/components/form-config/index.d.ts

@@ -2322,6 +2322,11 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                     text: string;
                     value: string;
                 }[] | undefined;
+                elementExtraSetting?: {
+                    allowPartial?: boolean | undefined;
+                    partialLevel?: number | undefined;
+                    maxLevel?: number | undefined;
+                } | undefined;
                 __new?: boolean | undefined;
                 __isCombinationChild?: boolean | undefined;
                 __extra?: boolean | undefined;
@@ -2570,6 +2575,11 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 text: string;
                 value: string;
             }[] | undefined;
+            elementExtraSetting?: {
+                allowPartial?: boolean | undefined;
+                partialLevel?: number | undefined;
+                maxLevel?: number | undefined;
+            } | undefined;
             __new?: boolean | undefined;
             __isCombinationChild?: boolean | undefined;
             __extra?: boolean | undefined;

package/es/components/form-config/src/FormConfig.vue.d.ts

@@ -2325,6 +2325,11 @@ declare const _default: import("vue").DefineComponent<{
                     text: string;
                     value: string;
                 }[] | undefined;
+                elementExtraSetting?: {
+                    allowPartial?: boolean | undefined;
+                    partialLevel?: number | undefined;
+                    maxLevel?: number | undefined;
+                } | undefined;
                 __new?: boolean | undefined;
                 __isCombinationChild?: boolean | undefined;
                 __extra?: boolean | undefined;
@@ -2573,6 +2578,11 @@ declare const _default: import("vue").DefineComponent<{
                 text: string;
                 value: string;
             }[] | undefined;
+            elementExtraSetting?: {
+                allowPartial?: boolean | undefined;
+                partialLevel?: number | undefined;
+                maxLevel?: number | undefined;
+            } | undefined;
             __new?: boolean | undefined;
             __isCombinationChild?: boolean | undefined;
             __extra?: boolean | undefined;

package/es/components/form-config/src/components/FormConfigEdit.vue.d.ts

@@ -767,6 +767,11 @@ declare const _default: import("vue").DefineComponent<{
                 text: string;
                 value: string;
             }[] | undefined;
+            elementExtraSetting?: {
+                allowPartial?: boolean | undefined;
+                partialLevel?: number | undefined;
+                maxLevel?: number | undefined;
+            } | undefined;
             __new?: boolean | undefined;
             __isCombinationChild?: boolean | undefined;
             __extra?: boolean | undefined;
@@ -1015,6 +1020,11 @@ declare const _default: import("vue").DefineComponent<{
             text: string;
             value: string;
         }[] | undefined;
+        elementExtraSetting?: {
+            allowPartial?: boolean | undefined;
+            partialLevel?: number | undefined;
+            maxLevel?: number | undefined;
+        } | undefined;
         __new?: boolean | undefined;
         __isCombinationChild?: boolean | undefined;
         __extra?: boolean | undefined;

package/es/components/form-config/src/components/FormConfigEdit.vue2.js

@@ -1,5 +1,5 @@
 import { defineComponent, computed, ref, inject, watch, toRaw, openBlock, createElementBlock, Fragment, createVNode, unref, mergeProps, withCtx, createElementVNode, toDisplayString, renderList, h } from 'vue';
-import { cloneDeep, isEmpty, isArray } from 'lodash-es';
+import { cloneDeep, set, isEmpty, isArray } from 'lodash-es';
 import { InjectionActiveFieldItem, EditAbleField } from '../constants/index.js';
 import '../../../../shared/components/VueDraggable/src/vuedraggable.js';
 import { findFieldItemByKey } from '../utils/index.js';
@@ -40,7 +40,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     expose
   }) {
     const props = __props;
-    computed(() => `#${props.uuid} .form-config__config`);
+    const wrapperSelector = computed(() => `#${props.uuid} .form-config__config`);
     const formRenderRef = ref();
     const currentActiveField = inject(InjectionActiveFieldItem);
     const fieldList = ref([]);
@@ -69,7 +69,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }) {
       if (!currentActiveField.value)
         return;
-      currentActiveField.value[fieldKey] = value;
+      set(currentActiveField.value, fieldKey, value);
     }
     function createLabelRender(originOptions) {
       return (label) => {
@@ -173,7 +173,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         show: showOptionModal.value,
         "onUpdate:show": _cache[0] || (_cache[0] = ($event) => showOptionModal.value = $event),
         preset: "dialog",
-        to: "body",
+        to: unref(wrapperSelector),
         "close-on-esc": false,
         "mask-closable": false,
         title: unref(useFormConfigLocale)("configArea.modifyOptionTitle"),

package/es/components/form-config/src/constants/index.d.ts

@@ -17,7 +17,9 @@ export declare enum EditAbleField {
     SHOW = "show",
     ROWS = "initialHigh",
     TITLE_RED = "fieldTitleRed",
-    CONFIRM = "confirmBeforeValueChange"
+    CONFIRM = "confirmBeforeValueChange",
+    ALLOW_PARTIAL = "elementExtraSetting.allowPartial",
+    PARTIAL_LEVEL = "elementExtraSetting.partialLevel"
 }
 export declare function widgetWidthOptionConfig(): {
     option: {

package/es/components/form-config/src/constants/index.js

@@ -21,6 +21,8 @@ var EditAbleField = /* @__PURE__ */ ((EditAbleField2) => {
   EditAbleField2["ROWS"] = "initialHigh";
   EditAbleField2["TITLE_RED"] = "fieldTitleRed";
   EditAbleField2["CONFIRM"] = "confirmBeforeValueChange";
+  EditAbleField2["ALLOW_PARTIAL"] = "elementExtraSetting.allowPartial";
+  EditAbleField2["PARTIAL_LEVEL"] = "elementExtraSetting.partialLevel";
   return EditAbleField2;
 })(EditAbleField || {});
 function widgetWidthOptionConfig() {

package/es/components/form-config/src/hooks/useConfigurationField.js

@@ -1,4 +1,4 @@
-import { omit, pick } from 'lodash-es';
+import { omit, pick, range } from 'lodash-es';
 import { EditAbleField, widgetWidthOptionConfig, isShowOptionConfig, isNotFoldOptionConfig, isEditOptionConfig, isNullOptionConfig, isVisibleOptionConfig, rowsOptionConfig } from '../constants/index.js';
 import { useFormConfigLocale } from './useLocale.js';
 import '../../../form-render/index.js';
@@ -117,7 +117,24 @@ function useConfigurationField() {
     elem_width: 6,
     default_val: false,
     html_type: "SWITCH"
-  })]]);
+  })], [EditAbleField.ALLOW_PARTIAL, () => ({
+    alias: useFormConfigLocale("configArea.allowPartial"),
+    elem_width: 6,
+    html_type: "SWITCH"
+  })], [EditAbleField.PARTIAL_LEVEL, (field) => {
+    var _a, _b;
+    return {
+      alias: useFormConfigLocale("configArea.partialLevel"),
+      elem_width: 6,
+      html_type: "SELECT",
+      componentProps: {
+        options: range((_b = (_a = field == null ? void 0 : field.elementExtraSetting) == null ? void 0 : _a.maxLevel) != null ? _b : 10).map((item) => ({
+          text: item + 1 + "",
+          value: item + 1
+        }))
+      }
+    };
+  }]]);
   function generateFieldListByKeys(keyList, formConfigItem, fieldItem) {
     return keyList.map((key) => {
       var _a, _b;
@@ -130,11 +147,14 @@ function useConfigurationField() {
   const htmlMap = new Map([["LINE_BAR", [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.LAYOUT_WIDTH_ENUM, EditAbleField.NOTES, EditAbleField.DEFAULT_EXPAND, EditAbleField.FOLD]], ["NEWLINE", [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS]], ...["COMPLEX", "COMBINATION"].map((key) => [key, [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.LAYOUT_WIDTH_ENUM]])]);
   const defaultItems = [EditAbleField.KEY, EditAbleField.NAME, EditAbleField.ALIAS, EditAbleField.DEFAULT_VALUE, EditAbleField.LAYOUT_WIDTH_ENUM, EditAbleField.DESC, EditAbleField.NOTES, EditAbleField.EDITABLE, EditAbleField.CONFIRM, EditAbleField.REQUIRED, EditAbleField.SHOW, EditAbleField.TITLE_RED];
   function generateFieldListByFormConfigItem(formConfigItem, fieldItem) {
-    var _a;
-    const keys = htmlMap.get(formConfigItem.type) || defaultItems;
+    var _a, _b, _c;
+    const keys = [...htmlMap.get(formConfigItem.type) || defaultItems];
     if ((fieldItem ? fieldItem.html_type : (_a = formConfigItem.originalSetting) == null ? void 0 : _a.html_type) === "TEXTAREA") {
       keys.splice(3, 0, EditAbleField.ROWS);
     }
+    if (["SEARCH_CASCADE", "LEVEL_SEARCH_CASCADE", "LEVEL_SEARCH_CASCADE2"].includes(fieldItem ? fieldItem.html_type : (_c = (_b = formConfigItem.originalSetting) == null ? void 0 : _b.html_type) != null ? _c : "")) {
+      keys.splice(9, 0, EditAbleField.ALLOW_PARTIAL, EditAbleField.PARTIAL_LEVEL);
+    }
     return generateFieldListByKeys(keys, formConfigItem, fieldItem);
   }
   return {

package/es/components/form-config/src/hooks/useLocale.d.ts

@@ -35,6 +35,8 @@ declare const formConfigLocale: {
         rowsTips: string;
         confirm: string;
         titleRed: string;
+        allowPartial: string;
+        partialLevel: string;
         positiveBtn: string;
         negativeBtn: string;
         fullLine: string;

package/es/components/form-config/src/hooks/useLocale.js

@@ -224,6 +224,8 @@ const formConfigLocale = reactive({
     }(),
     confirm: "\u662F\u5426\u5728\u4FEE\u6539\u503C\u540E\u5F39\u7A97\u63D0\u9192",
     titleRed: "\u6807\u9898\u663E\u793A\u7EA2\u8272",
+    allowPartial: "\u5141\u8BB8\u9009\u62E9\u4E2D\u95F4\u5C42\u7EA7",
+    partialLevel: "\u81F3\u5C11\u9009\u62E9\u591A\u5C11\u7EA7",
     positiveBtn: function() {
       var _a, _b, _c;
       try {

package/es/components/form-config/src/types/index.d.ts

@@ -48,6 +48,11 @@ export type FormConfigItem = {
         text: string;
         value: string;
     }[];
+    elementExtraSetting: Partial<{
+        allowPartial: boolean;
+        partialLevel: number;
+        maxLevel: number;
+    }>;
     __new: boolean;
     __isCombinationChild: boolean;
     __extra: boolean;

package/es/components/form-render/src/components/renderer/formItem.d.ts

@@ -27,6 +27,7 @@ export declare const FORM_ITEM: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    onClickOutside: PropType<(...args: any[]) => void>;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     label: StringConstructor;
     propertyKey: StringConstructor;
@@ -54,6 +55,7 @@ export declare const FORM_ITEM: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    onClickOutside: PropType<(...args: any[]) => void>;
 }>>, {
     showFeedback: boolean;
     span: number;

package/es/components/form-render/src/components/renderer/formItem.js

@@ -3,7 +3,7 @@ import { arrayed, getStringWidth, widthAppend } from '../../../../../shared/util
 import { isVoidField } from '@formily/core';
 import { observe, autorun } from '@formily/reactive';
 import { connect, mapProps } from '@formily/vue';
-import { useDebounceFn } from '@vueuse/core';
+import { useDebounceFn, onClickOutside } from '@vueuse/core';
 import { isString, isArray, isObject, isNumber, isFunction, uniq } from 'lodash-es';
 import { NFormItem, NTooltip, NButton } from 'naive-ui';
 import Annotation from '../../../../annotation-edit/index.js';
@@ -43,7 +43,8 @@ const script = /* @__PURE__ */ defineComponent({
     showTooltipFeedback: {
       type: Boolean,
       default: true
-    }
+    },
+    onClickOutside: Function
   },
   setup(props, {
     slots,
@@ -326,8 +327,14 @@ const script = /* @__PURE__ */ defineComponent({
         return props.showFeedback;
       return !!props.feedback && props.feedback !== " " && props.showFeedback;
     });
+    const formItemRef = ref();
+    props.onClickOutside && onClickOutside(formItemRef, (event) => {
+      var _a;
+      return (_a = props.onClickOutside) == null ? void 0 : _a.call(props, event);
+    });
     return () => {
       return createVNode(NFormItem, mergeProps({
+        "ref": formItemRef,
         "class": ["form-render__formItem", {
           "form-render--no-border": !borderedRef.value,
           "form-render--underline": borderedRef.value === "underline",

package/es/components/form-render/src/components/renderer/levelSearchCascader/index.js

@@ -112,8 +112,10 @@ const script = /* @__PURE__ */ defineComponent({
       if (!props.validateLastNode || !isField(field.value))
         return;
       const tempValidator = field.value.validator ? castArray(field.value.validator) : [];
-      if (tempValidator.some((item) => isObject(item) && item.isLastOptionValidator))
-        return;
+      const lastOptionValidatorIndex = tempValidator.findIndex((item) => isObject(item) && item.isLastOptionValidator);
+      if (lastOptionValidatorIndex !== -1) {
+        tempValidator.splice(lastOptionValidatorIndex, 1);
+      }
       field.value.validator = [{
         async validator() {
           var _a;

package/es/components/form-render/src/components/renderer/searchCascade.js

@@ -253,6 +253,7 @@ const script = /* @__PURE__ */ defineComponent({
       target.dispatchEvent(new CustomEvent("scroll"));
     }
     function filterValue(pattern, option) {
+      var _a;
       if (!pattern || !option)
         return false;
       const {
@@ -260,6 +261,8 @@ const script = /* @__PURE__ */ defineComponent({
       } = option;
       if (props.checkStrategy.includes("child") && option.depth < maxDepthValue.value)
         return false;
+      if (!mergeItemValue)
+        return (_a = option[labelKey.value]) == null ? void 0 : _a.includes(pattern.trim());
       return mergeItemValue.length > 0 && mergeItemValue.some((item) => item.includes(pattern.trim()));
     }
     const {

package/es/components/form-render/src/hooks/useFieldListAdaptor.js

@@ -1,5 +1,5 @@
 import { arrayed, deepOmit } from '../../../../shared/utils/index.js';
-import { cloneDeep, castArray, pick } from 'lodash-es';
+import { cloneDeep, castArray, omit, pick } from 'lodash-es';
 import '../../index.js';
 import { isPositive, isNegative, isValidWidgetCombination, parseNumberFromMaybeString, formRenderLog } from '../utils/index.js';
 import { useFieldNormalize } from './useFieldNormalize.js';
@@ -318,7 +318,10 @@ function useFieldListAdaptor(collector, globProps) {
         hide_title: "1",
         is_show: isNegative(suffix.is_show) ? "0" : item.is_show
       };
-    })];
+    })].map((item2) => {
+      item2.decoratorProps = omit(item2.decoratorProps, ["onClickOutside"]);
+      return item2;
+    });
     const groupSpan = fieldList.reduce((res, item2) => {
       return res + +(item2.elem_width || 3) * 2;
     }, 0);