cnhis-design-vue 3.1.23-beta.4 → 3.1.23-beta.7

package/README.md

@@ -1,123 +1,123 @@
-# 安装
-
-```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. 注意
-
-由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
-
-```typescript
-// main.ts
-import { createApp } from 'vue';
-import App from './App.vue';
-
-import { CGrid } from 'cnhis-design-vue';
-// 或者
-import { CBigTable } from 'cnhis-design-vue';
-
-const app = createApp(App);
-app.use(CGrid);
-// 或者
-app.use(CBigTable);
-app.mount('#app');
-```
-
-## 4.FAQ
-
-### 4.1 项目打包后样式丢失
-
-> 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  rollupOptions: {
-    // ..otherOptions
-    output: {
-      dir: './dist',
-      manualChunks(id: string) {
-        if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
-          return 'vendor';
-        }
-      }
-    }
-  }
-});
-```
-
-### 4.2 找不到文件
-
-> 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
-
-```javascript
-// vite.config.ts
-const config = {
-  // ...otherOptions
-  resolve: {
-    // ...otherOptions
-    // 如果没有配置, 则不用考虑
-    extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
-  }
-};
-```
+# 安装
+
+```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. 注意
+
+由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
+
+```typescript
+// main.ts
+import { createApp } from 'vue';
+import App from './App.vue';
+
+import { CGrid } from 'cnhis-design-vue';
+// 或者
+import { CBigTable } from 'cnhis-design-vue';
+
+const app = createApp(App);
+app.use(CGrid);
+// 或者
+app.use(CBigTable);
+app.mount('#app');
+```
+
+## 4.FAQ
+
+### 4.1 项目打包后样式丢失
+
+> 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  rollupOptions: {
+    // ..otherOptions
+    output: {
+      dir: './dist',
+      manualChunks(id: string) {
+        if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
+          return 'vendor';
+        }
+      }
+    }
+  }
+});
+```
+
+### 4.2 找不到文件
+
+> 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
+
+```javascript
+// vite.config.ts
+const config = {
+  // ...otherOptions
+  resolve: {
+    // ...otherOptions
+    // 如果没有配置, 则不用考虑
+    extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
+  }
+};
+```

package/es/components/fabric-chart/src/components/PopupMenu.js

@@ -87,6 +87,11 @@ var PopupMenu = defineComponent({
     watch(() => props.show, (value) => {
       if (value) {
         setNoShow = true;
+        props.list.forEach((item) => {
+          if (typeof item === "object" && Reflect.has(item, "value") && typeof item.value !== "boolean") {
+            item.value = void 0;
+          }
+        });
       }
     });
     return () => {
@@ -98,12 +103,12 @@ var PopupMenu = defineComponent({
           "class": "c-fabric-chart-popup-menu",
           "style": pointStyle.value
         }, [props.list.map((item) => {
-          return createVNode("li", {
+          return props.show ? createVNode("li", {
             "class": {
               "no-click": setNoClick(item)
             },
             "onClick": (event) => clickItem(event, item)
-          }, [getItemContent(item)]);
+          }, [getItemContent(item)]) : null;
         })]), [[vShow, props.show]])]
       });
     };

package/es/components/fabric-chart/src/hooks/useCenter2.js

@@ -20,6 +20,12 @@ function getPointArr(arr) {
     return pre;
   }, []);
 }
+function deleteProperty(data, list) {
+  list.map((v) => v.type).forEach((key) => {
+    if (Reflect.has(data, key))
+      Reflect.deleteProperty(data, key);
+  });
+}
 function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem) {
   useGrid(canvas, propItems);
   const {
@@ -138,7 +144,6 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       if (event2.button === 3) {
         const { x = 0, y = 0 } = event2.pointer || {};
         if (x >= originX && x <= endX && y >= originY && y <= endY) {
-          pointTipProps.show = false;
           pointMenuProps.point = { x, y };
           pointMenuProps.show = true;
           const { type } = ((_a = event2.target) == null ? void 0 : _a.origin) || {};
@@ -552,10 +557,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         ...item.origin
       });
     } else {
-      const data = {
-        time: target.origin.data.time,
-        value: target.origin.data.value
-      };
+      const data = { ...target.origin.data };
+      deleteProperty(data, TEMPERATURE_MENU);
+      deleteProperty(data, PAIN_MENU);
       data[`${item.type}`] = item.value;
       if (target.origin.type === "temperature") {
         data["key"] = target.origin.key;

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

@@ -943,7 +943,7 @@ declare const FormConfig: SFCWithInstall<import("vue").DefineComponent<{
                 level_key?: string | undefined;
                 link_key?: string | undefined;
                 link_key_split?: string | undefined;
-                show_key?: string | undefined;
+                show_key?: string[] | undefined;
                 conObj?: import("../../../es/shared/types").AnyObject[] | undefined;
                 conObjFirstLevel?: import("../../../es/shared/types").AnyObject[] | undefined;
             } | undefined;

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

@@ -945,7 +945,7 @@ declare const _default: import("vue").DefineComponent<{
                 level_key?: string | undefined;
                 link_key?: string | undefined;
                 link_key_split?: string | undefined;
-                show_key?: string | undefined;
+                show_key?: string[] | undefined;
                 conObj?: import("../../../../es/shared/types").AnyObject[] | undefined;
                 conObjFirstLevel?: import("../../../../es/shared/types").AnyObject[] | undefined;
             } | undefined;

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

@@ -72,7 +72,7 @@ declare const _default: import("vue").DefineComponent<{}, {
             level_key?: string | undefined;
             link_key?: string | undefined;
             link_key_split?: string | undefined;
-            show_key?: string | undefined;
+            show_key?: string[] | undefined;
             conObj?: import("../../../../../es/shared/types").AnyObject[] | undefined;
             conObjFirstLevel?: import("../../../../../es/shared/types").AnyObject[] | undefined;
         } | undefined;

package/es/components/form-render/index2.js

@@ -26,7 +26,7 @@ import './src/components/renderer/inputNumber.js';
 import './src/components/renderer/linebar.js';
 import './src/components/renderer/inputGroup2.js';
 import './src/components/renderer/date.js';
-import './src/components/renderer/cascader.js';
+import './src/components/renderer/levelSearchCascade.js';
 import './src/components/renderer/jsonCombination/index.js';
 import './src/components/renderer/combination.js';
 import './src/components/renderer/checkbox.js';
@@ -37,6 +37,7 @@ import './src/components/renderer/slider.js';
 import './src/components/renderer/complex.js';
 import './src/components/renderer/simpleComponent.js';
 import './src/components/renderer/search.js';
+import './src/components/renderer/searchCascade.js';
 
 const FormRender = script;
 FormRender.install = function(app) {

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

@@ -6,7 +6,7 @@ export * from './inputNumber';
 export * from './linebar';
 export * from './inputGroup';
 export * from './date';
-export * from './cascader';
+export * from './levelSearchCascade';
 export * from './jsonCombination';
 export * from './combination';
 export * from './checkbox';
@@ -17,3 +17,4 @@ export * from './slider';
 export * from './complex';
 export * from './simpleComponent';
 export * from './search';
+export * from './searchCascade';

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

@@ -6,7 +6,7 @@ export { INPUT_NUMBER } from './inputNumber.js';
 export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup2.js';
 export { DATE } from './date.js';
-export { SEARCH_CASCADE } from './cascader.js';
+export { LEVEL_SEARCH_CASCADE } from './levelSearchCascade.js';
 export { JSON_COMBINATION } from './jsonCombination/index.js';
 export { COMBINATION } from './combination.js';
 export { CHECKBOX } from './checkbox.js';
@@ -17,3 +17,4 @@ export { SLIDER } from './slider.js';
 export { COMPLEX } from './complex.js';
 export { BUTTON, LINE_BREAKS, TEXT } from './simpleComponent.js';
 export { SEARCH } from './search.js';
+export { SEARCH_CASCADE } from './searchCascade.js';

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

@@ -6,7 +6,7 @@ export { INPUT_NUMBER } from './inputNumber.js';
 export { LINEBAR } from './linebar.js';
 export { INPUT_GROUP } from './inputGroup2.js';
 export { DATE } from './date.js';
-export { SEARCH_CASCADE } from './cascader.js';
+export { LEVEL_SEARCH_CASCADE } from './levelSearchCascade.js';
 export { JSON_COMBINATION } from './jsonCombination/index.js';
 export { COMBINATION } from './combination.js';
 export { CHECKBOX } from './checkbox.js';
@@ -17,3 +17,4 @@ export { SLIDER } from './slider.js';
 export { COMPLEX } from './complex.js';
 export { BUTTON, LINE_BREAKS, TEXT } from './simpleComponent.js';
 export { SEARCH } from './search.js';
+export { SEARCH_CASCADE } from './searchCascade.js';

package/es/components/form-render/src/components/renderer/{searchCascader.d.ts → levelSearchCascade.d.ts}

@@ -1,6 +1,7 @@
 import { AnyObject, Func } from '../../../../../../es/shared/types';
 import { PropType } from 'vue';
-export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
+declare type ValueType = string | AnyObject[];
+export declare const LEVEL_SEARCH_CASCADE: import("vue").DefineComponent<{
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -8,6 +9,14 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
     onFocus: {
         type: PropType<Func<any[], any>>;
     };
+    autograph: {
+        type: StringConstructor;
+        required: true;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     wordbook: {
         type: PropType<Partial<{
             level_num: number;
@@ -20,15 +29,17 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
             level_key: string;
             link_key: string;
             link_key_split: string;
-            show_key: string;
+            show_key: string[];
             conObj: AnyObject[];
             conObjFirstLevel: AnyObject[];
         }>>;
         required: true;
     };
     onChange: {};
-    value: {};
-}, () => void, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    value: {
+        type: PropType<ValueType>;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "update:value"[], "update:value", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
@@ -36,6 +47,14 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
     onFocus: {
         type: PropType<Func<any[], any>>;
     };
+    autograph: {
+        type: StringConstructor;
+        required: true;
+    };
+    lazyRequest: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     wordbook: {
         type: PropType<Partial<{
             level_num: number;
@@ -48,16 +67,20 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
             level_key: string;
             link_key: string;
             link_key_split: string;
-            show_key: string;
+            show_key: string[];
             conObj: AnyObject[];
             conObjFirstLevel: AnyObject[];
         }>>;
         required: true;
     };
     onChange: {};
-    value: {};
+    value: {
+        type: PropType<ValueType>;
+    };
 }>> & {
     "onUpdate:value"?: ((...args: any[]) => any) | undefined;
 }, {
     options: AnyObject[];
+    lazyRequest: boolean;
 }>;
+export {};