cnhis-design-vue 3.1.14-beta.7 → 3.1.14-beta.9

package/es/packages/form-render/src/utils/index.js

@@ -1,11 +1,11 @@
-import { isObject, isFunction } from 'lodash-es';
+import { inject, provide, computed, createVNode, Fragment } from 'vue';
+import { isArray, isObject, isString, isFunction } from 'lodash-es';
 import { FIELD_SEX_VALUE } from '../constants/index.js';
 import { isField } from '@formily/core';
 import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.js';
 import differenceInMonths from '../../../../node_modules/date-fns/esm/differenceInMonths/index.js';
 import differenceInYears from '../../../../node_modules/date-fns/esm/differenceInYears/index.js';
 import '../../../../node_modules/date-fns/esm/parse/_lib/parsers/index.js';
-import { inject, provide } from 'vue';
 
 function formRenderLog(message, type = "log") {
   console[type](`[FormRender]: ${message}`);
@@ -16,7 +16,9 @@ function arrayed(maybeArray) {
   return [maybeArray];
 }
 function assignUpdateValue(props, field) {
-  const _props = { ...props };
+  const _props = {
+    ...props
+  };
   if (isField(field)) {
     Object.assign(_props, {
       "onUpdate:value"(value) {
@@ -69,17 +71,29 @@ function injectOrProvide(key, creator) {
   }
   return injected;
 }
-function generateUrlParams(field, dependKeys) {
-  const result = {};
-  if (dependKeys) {
-    arrayed(dependKeys).forEach((dependKey) => {
-      const _field = field.query(dependKey).take();
-      if (isField(_field)) {
-        result[dependKey] = _field.value;
-      }
-    });
+function traverseDependKey(dependKeys, handler) {
+  if (!dependKeys)
+    return;
+  Object.entries(createDependKeyMap()).forEach(([dependKey, valueKey]) => {
+    handler(dependKey, valueKey);
+  });
+  function createDependKeyMap() {
+    let result = {};
+    if (isArray(dependKeys)) {
+      dependKeys.forEach((k) => {
+        if (isObject(k)) {
+          result[k.paramName] = k.paramValue;
+        } else {
+          result[k] = k;
+        }
+      });
+    } else if (isObject(dependKeys)) {
+      result = dependKeys;
+    } else if (isString(dependKeys)) {
+      result[dependKeys] = dependKeys;
+    }
+    return result;
   }
-  return result;
 }
 function traverseSchema(schema, handler) {
   handler(schema);
@@ -142,5 +156,17 @@ function createLinebarId(id) {
 function fieldKeyEscape(fieldList) {
   return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
 }
+function createInputSlot(props) {
+  return computed(() => {
+    const res = {};
+    if (props.prefix) {
+      res.prefix = () => createVNode(Fragment, null, [createSlot(props.prefix, props).default()]);
+    }
+    if (props.suffix) {
+      res.suffix = () => createVNode(Fragment, null, [createSlot(props.suffix, props).default()]);
+    }
+    return res;
+  });
+}
 
-export { arrayed, assignUpdateValue, createLinebarId, createSlot, fieldKeyEscape, formRenderLog, generateUrlParams, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseSchema, uuidGenerator };
+export { arrayed, assignUpdateValue, createInputSlot, createLinebarId, createSlot, fieldKeyEscape, formRenderLog, getParentLinebar, injectOrProvide, isIdCard, isMobile, parseBirthday, parseIdCard, queryDecorator, queryInput, transformDateFormat, traverseDependKey, traverseSchema, uuidGenerator };

package/es/packages/index.css

@@ -18,7 +18,7 @@
   margin-top: 6px;
 }
 .big-table-filter-wrap .sort-item {
-  line-height: 32px;
+  height: 32px;
   padding: 0 13px;
   display: flex;
   align-items: center;
@@ -97,7 +97,7 @@
 }
 .big-table-filter-wrap .checkbox-btn-wrap {
   display: flex;
-  padding: 9px 10px 19px 14px;
+  padding: 9px 10px 9px 14px;
 }
 .big-table-filter-wrap .checkbox-btn-wrap .checkbox-btn {
   width: 56px;
@@ -131,6 +131,16 @@
   width: 25px;
   height: 20px;
 }
+.big-table__separate {
+  padding: 4px;
+}
+.big-table__separatePlaceholder {
+  display: inline-block;
+  visibility: hidden;
+  max-width: 0;
+  word-break: keep-all;
+  width: 0;
+}
 body > .vxe-table--tooltip-wrapper {
   display: none !important;
 }

package/es/packages/info-header/index.d.ts

@@ -1406,7 +1406,7 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     }>;
     SlotRender: import("vue").DefineComponent<{
         renderer: {
-            type: (StringConstructor | FunctionConstructor)[];
+            type: import("vue").PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../es/src/types").Func<any[], any>>;
             required: true;
         };
         rootSlots: {
@@ -1414,7 +1414,7 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         };
     }, () => any, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         renderer: {
-            type: (StringConstructor | FunctionConstructor)[];
+            type: import("vue").PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../es/src/types").Func<any[], any>>;
             required: true;
         };
         rootSlots: {

package/es/packages/info-header/src/InfoHeader.vue.d.ts

@@ -1407,7 +1407,7 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     SlotRender: import("vue").DefineComponent<{
         renderer: {
-            type: (StringConstructor | FunctionConstructor)[];
+            type: PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../../es/src/types").Func<any[], any>>;
             required: true;
         };
         rootSlots: {
@@ -1415,7 +1415,7 @@ declare const _default: import("vue").DefineComponent<{
         };
     }, () => any, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         renderer: {
-            type: (StringConstructor | FunctionConstructor)[];
+            type: PropType<string | import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("../../../../es/src/types").Func<any[], any>>;
             required: true;
         };
         rootSlots: {

package/es/src/components/SlotRender/SlotRender.d.ts

@@ -1,8 +1,8 @@
 import { Func } from '../../../../es/src/types';
-import { PropType } from 'vue';
+import { Component, PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     renderer: {
-        type: (StringConstructor | FunctionConstructor)[];
+        type: PropType<string | Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | Func<any[], any>>;
         required: true;
     };
     rootSlots: {
@@ -10,7 +10,7 @@ declare const _default: import("vue").DefineComponent<{
     };
 }, () => any, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     renderer: {
-        type: (StringConstructor | FunctionConstructor)[];
+        type: PropType<string | Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | Func<any[], any>>;
         required: true;
     };
     rootSlots: {

package/es/src/components/SlotRender/SlotRender.js

@@ -1,11 +1,11 @@
 import { isString, isFunction } from 'lodash-es';
-import { defineComponent } from 'vue';
+import { defineComponent, h, toRaw } from 'vue';
 
 var script = defineComponent({
   name: "SlotRender",
   props: {
     renderer: {
-      type: [String, Function],
+      type: [String, Function, Object],
       required: true
     },
     rootSlots: {
@@ -21,13 +21,13 @@ var script = defineComponent({
       return isFunction(renderer) ? renderer(attrs) : null;
     }
     function renderVNode(renderer) {
-      return isFunction(renderer) ? renderer(attrs) : null;
+      return renderer ? h(toRaw(renderer), attrs) : null;
     }
     return () => {
       const {
         renderer
       } = props;
-      return isString(renderer) ? renderSlots(renderer) : isFunction(renderer) ? renderVNode(renderer) : null;
+      return isString(renderer) ? renderSlots(renderer) : renderVNode(renderer);
     };
   }
 });

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.14-beta.7",
+  "version": "3.1.14-beta.9",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -129,7 +129,7 @@
     "standard-version": "^9.3.2",
     "ts-morph": "^15.1.0",
     "typescript": "4.6.4",
-    "vite": "^2.9.9",
+    "vite": "3.0.4",
     "vitest": "^0.16.0",
     "vue-tsc": "^0.29.8"
   },