cnhis-design-vue 3.1.9-beta.10 → 3.1.9-beta.11

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -1258,7 +1258,7 @@ var script = /* @__PURE__ */ defineComponent({
       let forbiddenBatchSelect = !checkMethod(data);
       if (state.selectType == "checkbox" && forbiddenBatchSelect) {
         table == null ? void 0 : table.setAllCheckboxRow(false);
-        const checked2 = getRowClassName()({
+        const checked2 = getRowClassName({
           row
         }) == "single--checked";
         const value = !checked2 ? [] : [row];

package/es/packages/form-render/index.d.ts

@@ -308,11 +308,11 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         "x-read-pretty"?: boolean | undefined;
         "x-compile-omitted"?: string[] | undefined;
     }>>;
-    validate: () => any;
+    validate: () => Promise<void>;
+    FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     FormProvider: import("vue").DefineComponent<Record<"form", any>, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Record<"form", any>>>, {
         form: any;
     }>;
-    FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     NForm: import("vue").DefineComponent<{
         readonly inline: BooleanConstructor;
         readonly labelWidth: import("vue").PropType<string | number>;

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -1,6 +1,6 @@
 import { AnyObject } from '../../../../es/src/types';
-import { FieldItem, FieldVisitor } from './types';
 import { Component, FunctionalComponent, PropType } from 'vue';
+import { FieldItem, FieldVisitor } from './types';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -308,11 +308,11 @@ declare const _default: import("vue").DefineComponent<{
         "x-read-pretty"?: boolean | undefined;
         "x-compile-omitted"?: string[] | undefined;
     }>>;
-    validate: () => any;
+    validate: () => Promise<void>;
+    FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     FormProvider: import("vue").DefineComponent<Record<"form", any>, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Record<"form", any>>>, {
         form: any;
     }>;
-    FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     NForm: import("vue").DefineComponent<{
         readonly inline: BooleanConstructor;
         readonly labelWidth: PropType<string | number>;

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -1,11 +1,11 @@
 import { defineComponent, provide, computed, openBlock, createBlock, unref, normalizeStyle, withCtx, createVNode, renderSlot, createElementVNode, toDisplayString, createCommentVNode } from 'vue';
-import { injectOrProvide } from './utils/index.js';
-import { cloneDeep } from 'lodash-es';
-import { InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index.js';
-import * as index from './components/index.js';
 import { createForm, onFieldValueChange } from '@formily/core';
 import { FormProvider, FormConsumer, createSchemaField } from '@formily/vue';
+import { cloneDeep } from 'lodash-es';
 import { NForm } from 'naive-ui';
+import * as index from './components/index.js';
+import { InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index.js';
+import { injectOrProvide } from './utils/index.js';
 import { useBusinessBinding } from './hooks/useBusinessBinding.js';
 import { useAsyncQueue } from './hooks/useAsyncQueue.js';
 import { useChangeContext } from './hooks/useChangeContext.js';
@@ -76,7 +76,16 @@ var script = /* @__PURE__ */ defineComponent({
       return { type: "object", properties: {} };
     });
     function validate() {
-      return formModel.validate();
+      return formModel.validate().catch((err) => {
+        if (Array.isArray(err)) {
+          return Promise.reject(err.map((e) => {
+            e.title = formModel.query(e.path).get("title");
+            return e;
+          }));
+        } else {
+          return Promise.reject(err);
+        }
+      });
     }
     expose({
       validate,

package/es/packages/form-render/src/components/cascader.js

@@ -26,7 +26,6 @@ const script = defineComponent({
   emits: ["update:value"],
   setup(props, {
     slots,
-    attrs,
     emit
   }) {
     const _options = ref(null);

package/es/packages/form-render/src/hooks/useAsyncQueue.js

@@ -120,7 +120,7 @@ function useAsyncQueue() {
           const res = await http[method](url, params);
           const { data, success } = res;
           if (!success)
-            throw new Error(`Request error => ${res}`);
+            throw res;
           cb(void 0, data);
         } catch (e) {
           cb(new Error(`Request error => ${e}`));

package/es/packages/form-render/src/hooks/useFieldList2Schema.js

@@ -157,7 +157,7 @@ function useFieldList2Schema(collector) {
   const createWidgetCombinationSchema = (item) => {
     const suffixList = arrayed(item.suffixConfig);
     const fieldList = [{ ...item, suffixConfig: void 0 }].concat(suffixList.map((suffix) => {
-      return { ...suffix, is_show: "1", hide_title: "1" };
+      return { ...suffix, is_show: item.is_show, alias: " " };
     }));
     return {
       type: "void",

package/es/packages/form-render/src/hooks/useFormField.js

@@ -6,9 +6,7 @@ function useFormField() {
   return {
     field,
     title: computed(() => field.value.title),
-    fieldKey: computed(() => {
-      return field.value.props.name.toString();
-    })
+    fieldKey: computed(() => field.value.props.name.toString())
   };
 }
 

package/es/packages/form-render/src/types/index.d.ts

@@ -20,7 +20,7 @@ export interface FormAsyncQueueItem {
 export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObject[]>;
 export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & Record<'age' | 'day' | 'month' | 'year', number>;
 export declare type FormRenderExpose = {
-    validate(): Promise<unknown>;
+    validate(): Promise<void>;
     getFormValues(): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
 };

package/es/packages/form-render/style/index.css

@@ -30,7 +30,7 @@
 .form-render__inputGroup {
   grid-column: span var(--column) / span var(--column);
   display: flex;
-  align-items: flex-end;
+  align-items: flex-start;
 }
 .form-render__inputGroup > div {
   flex: 1;

package/es/packages/index.css

@@ -2617,7 +2617,7 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__inputGroup {
   grid-column: span var(--column) / span var(--column);
   display: flex;
-  align-items: flex-end;
+  align-items: flex-start;
 }
 .form-render__inputGroup > div {
   flex: 1;

package/es/packages/scale-view/src/components/formitem/r-datetime.js

@@ -40,8 +40,9 @@ var scriptDatetime = defineComponent({
       return "daterange";
     });
     const defaultValue = (val) => {
+      console.log(val, "time---val---");
       vexutils.isJSON(val) && (val = JSON.parse(val));
-      if (vexutils.isEmpty(val))
+      if (!val || vexutils.isEmpty(val))
         return;
       let value = JSON.parse(JSON.stringify(val));
       if (type === "TIME" || dateType == "time") {

package/es/src/assets/img/failure.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/icon-asc.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/icon-desc.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/no-permission.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/nodata.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/notfound.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/qr.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/success.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/video.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/video_default_cover.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/video_hover.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/video_play_hover.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/xb_big.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/es/src/assets/img/xb_small.d.ts

@@ -1 +1,2 @@
-type source = string;export default source;
+type source = string;
+export default source;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.9-beta.10",
+  "version": "3.1.9-beta.11",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",

package/test.ts

@@ -0,0 +1,326 @@
+import { createElementVNode as _createElementVNode, resolveComponent as _resolveComponent, createVNode as _createVNode, withCtx as _withCtx, openBlock as _openBlock, createElementBlock as _createElementBlock } from "vue";
+const _hoisted_1 = {
+  class: "markdown"
+};
+
+const _hoisted_2 = /*#__PURE__*/_createElementVNode("p", null, null, -1
+  /* HOISTED */
+);
+
+const _hoisted_3 = /*#__PURE__*/_createElementVNode("h1", null, "信息展示头(CInfoHeader)", -1
+  /* HOISTED */
+);
+
+const _hoisted_4 = ["innerHTML"];
+
+const _hoisted_5 = /*#__PURE__*/_createElementVNode("h2", null, "Props", -1
+  /* HOISTED */
+);
+
+const _hoisted_6 = /*#__PURE__*/_createElementVNode("h2", null, "Emits", -1
+  /* HOISTED */
+);
+
+const _hoisted_7 = /*#__PURE__*/_createElementVNode("h2", null, "Slots", -1
+  /* HOISTED */
+);
+
+const _hoisted_8 = /*#__PURE__*/_createElementVNode("h2", null, "Expose", -1
+  /* HOISTED */
+);
+
+export function render(_ctx, _cache) {
+  const _component_Component0 = _resolveComponent("Component0");
+
+  const _component_demo_collapse = _resolveComponent("demo-collapse");
+
+  const _component_n_data_table = _resolveComponent("n-data-table");
+
+  const _component_anchor_list = _resolveComponent("anchor-list");
+
+  return _openBlock(), _createElementBlock("div", _hoisted_1, [_createVNode(_component_anchor_list, null, {
+    default: _withCtx(() => [_hoisted_2, _hoisted_3, _createElementVNode("p", null, [_createVNode(_component_demo_collapse, null, {
+      source: _withCtx(() => [_createElementVNode("pre", null, [_createElementVNode("code", {
+          class: "hljs",
+          innerHTML: _ctx.code__Component0
+        }, null, 8
+        /* PROPS */
+        , _hoisted_4)])]),
+      default: _withCtx(() => [_createVNode(_component_Component0)]),
+      _: 1
+      /* STABLE */
+
+    })]), _hoisted_5, _createVNode(_component_n_data_table, {
+        striped: "",
+        size: "small",
+        data: [{
+          [`name`]: `compact`,
+          [`type`]: `Boolean`,
+          [`defaultValue`]: `-`,
+          [`description`]: ` 是否为紧凑模式`
+        }, {
+          [`name`]: `separator`,
+          [`type`]: `String`,
+          [`defaultValue`]: `':'`,
+          [`description`]: ` info区域分隔符`
+        }, {
+          [`name`]: `patientInfo`,
+          [`type`]: `Object`,
+          [`defaultValue`]: `() => ({})`,
+          [`description`]: ` 患者信息`
+        }, {
+          [`name`]: `infoList`,
+          [`type`]: `Array`,
+          [`defaultValue`]: `-`,
+          [`description`]: ` info区数据源`
+        }, {
+          [`name`]: `labelField`,
+          [`type`]: `String`,
+          [`defaultValue`]: `'label'`,
+          [`description`]: ` info区数据源label字段`
+        }, {
+          [`name`]: `valueField`,
+          [`type`]: `String`,
+          [`defaultValue`]: `'value'`,
+          [`description`]: ` info区数据源value字段`
+        }, {
+          [`name`]: `minColumnWidth`,
+          [`type`]: `[String, Number]`,
+          [`defaultValue`]: `240`,
+          [`description`]: ` info区列最小宽度`
+        }, {
+          [`name`]: `rowHeight`,
+          [`type`]: `[String, Number]`,
+          [`defaultValue`]: `32`,
+          [`description`]: ` info区行高`
+        }],
+        columns: [{
+          [`title`]: `属性`,
+          [`key`]: `name`
+        }, {
+          [`title`]: `类型`,
+          [`key`]: `type`
+        }, {
+          [`title`]: `默认值`,
+          [`key`]: `defaultValue`
+        }, {
+          [`title`]: `描述`,
+          [`key`]: `description`
+        }]
+      }, null, 8
+      /* PROPS */
+      , ["data"]), _hoisted_6, _createVNode(_component_n_data_table, {
+      striped: "",
+      size: "small",
+      data: [{
+        [`name`]: `openPatientInfo`,
+        [`description`]: ` 点击患者信息图标回调`
+      }, {
+        [`name`]: `fieldSet`,
+        [`description`]: ` 点击修改field图标回调`
+      }, {
+        [`name`]: `update:compact`,
+        [`description`]: ` 点击模式切换按钮回调`
+      }],
+      columns: [{
+        [`title`]: `事件名`,
+        [`key`]: `name`
+      }, {
+        [`title`]: `描述`,
+        [`key`]: `description`
+      }]
+    }), _hoisted_7, _createVNode(_component_n_data_table, {
+      striped: "",
+      size: "small",
+      data: [{
+        [`name`]: `operation`,
+        [`description`]: `-`
+      }, {
+        [`name`]: `patientModule`,
+        [`description`]: `-`
+      }, {
+        [`name`]: `avatar`,
+        [`description`]: `-`
+      }, {
+        [`name`]: `avatarInfo`,
+        [`description`]: `-`
+      }, {
+        [`name`]: `info`,
+        [`description`]: `-`
+      }, {
+        [`name`]: `setting`,
+        [`description`]: `-`
+      }, {
+        [`name`]: `patientInfoIcon`,
+        [`description`]: `-`
+      }, {
+        [`name`]: `fieldSetIcon`,
+        [`description`]: `-`
+      }, {
+        [`name`]: `compactIcon`,
+        [`description`]: `-`
+      }],
+      columns: [{
+        [`title`]: `属性`,
+        [`key`]: `name`
+      }, {
+        [`title`]: `描述`,
+        [`key`]: `description`
+      }]
+    }), _hoisted_8, _createVNode(_component_n_data_table, {
+      striped: "",
+      size: "small",
+      data: [{
+        [`name`]: `update`,
+        [`params`]: `-`,
+        [`description`]: ` 手动触发info区域宽度重新计算`
+      }],
+      columns: [{
+        [`title`]: `属性`,
+        [`key`]: `name`
+      }, {
+        [`title`]: `参数`,
+        [`key`]: `params`
+      }, {
+        [`title`]: `描述`,
+        [`key`]: `description`
+      }]
+    })]),
+    _: 1
+    /* STABLE */
+
+  })]);
+}
+import { defineComponent } from 'vue';
+import Component0 from "examples/views/6-info-header/demo/index.demo.vue";
+import hljs from 'highlight.js';
+import { NDataTable } from 'naive-ui';
+
+const __script = defineComponent({
+  components: {
+    Component0,
+    NDataTable
+  },
+
+  setup() {
+    const code__Component0 = hljs.highlight(`<!-- 整个组件从左到右分为 操作区 患者信息区 基本信息区 设置区 4个区域 -->
+<template>
+  <!-- compact 表示组件是否为收缩状态 -->
+  <!-- patientInfo 表示患者基本信息 -->
+  <!-- infoList
+  1.表示基本信息区描述列表数据, 如果需要在描述列表的内容中使用插槽, 那么在单项中传入slot字段即可
+  2.同时, 组件会对label中包含 电话｜身份证 的项进行特殊处理(点击眼睛图标隐藏)
+  3如果需要自己实现info区的内容, 使用info插槽即可
+  -->
+  <c-info-header
+    v-model:compact="compact"
+    :patientInfo="patientInfo"
+    :infoList="infoList"
+    min-column-width="180"
+    @open-patient-info="onOpenPatientInfo"
+    @field-set="onFieldSet"
+  >
+    <!-- 操作区插槽, 需要全量使用插槽实现   -->
+    <template #operation>
+      <div>operation1</div>
+      <!-- 为组件中的元素添加 compact-hidden 属性后, 该元素将自动在紧凑模式下隐藏-->
+      <div compact-hidden>operation2</div>
+    </template>
+
+    <!--  患者信息区的头像插槽 -->
+    <template #avatar>avatar</template>
+
+    <!-- 患者信息区的底部描述插槽-->
+    <template #avatarInfo>
+      <div compact-hidden>avatarInfo</div>
+    </template>
+
+    <!-- 患者信息插槽, 需要自己实现整个患者信息区时使用, 一般情况不需要   -->
+    <template #patientModule></template>
+
+    <!-- 基本信息区插槽, 一般情况不需要   -->
+    <template #info></template>
+
+    <!--  设置区插槽, 一般情况不需要  -->
+    <!-- <template #setting></template>-->
+
+    <!--  信息区医师插槽,插槽名称由infoList中的配置指定,一般情况不需要  -->
+    <template #doctor="{item,style,width}">
+      <div :style="{color:'red',width:width+'px',maxWidth:width+'px',...style}">{{ item.value || '-' }}</div>
+    </template>
+  </c-info-header>
+</template>
+
+&#60;script lang="ts">
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  setup() {
+    import { ref, h } from 'vue';
+
+    const compact = ref(false);
+
+    const patientInfo = ref({
+      name: '患者',
+      sex: '男',
+      age: '12',
+      ageUnit: '月',
+      tagList: [{ type: 'warning', content: '自费' }]
+    });
+
+    const infoList = ref([
+      { "label": "电话", "value": "15625635269" },
+      { "label": "门诊号", "value": "MZ103570", /* 指定内容区样式 */contentStyle: { color: 'red' } },
+      { "label": "就诊号", "value": "R0000200658" },
+      { "label": "医师", "value": "王烁", /* 指定该项的内容使用doctor插槽 */ slot: 'doctor' },
+      { "label": "所在科室", "value": "社康(全科)" },
+      {
+        "label": "过敏史", "value": undefined,
+        /**
+         *
+         * @param {Object} item --当前item
+         * @param {number} width --组件计算所得的当前项的最大宽度,使用插槽后,需要自行实现ellipsis逻辑,否则宽度过长时会导致错位
+         * @returns {VNode}
+         */
+        slot({ item, width }) {
+          return h('div', { style: { color: 'red', width: width + 'px', maxWidth: width + 'px' } }, item.value);
+        }
+      },
+      { "label": "血压", "value": null },
+      { "label": "基本余额", "value": null },
+      { "label": "积分", "value": null }
+    ]);
+
+    function onOpenPatientInfo() {
+      // ...
+    }
+
+    function onFieldSet() {
+      // ...
+    }
+
+    return { compact, onFieldSet, onOpenPatientInfo, patientInfo, infoList };
+  }
+});
+&#60;/script>
+`.replace(/&#60;/g, '<'), {
+      language: 'xml'
+    }).value;
+    return {
+      code__Component0
+    };
+  }
+
+});
+
+__script.render = render;
+export default __script;
+__script.__hmrId = "75d252c3";
+
+__VUE_HMR_RUNTIME__.createRecord("75d252c3", __script);
+
+import.meta.hot.accept(({
+                          default: __default
+                        }) => {
+  __VUE_HMR_RUNTIME__.reload("75d252c3", __default);
+});