cnhis-design-vue 3.1.12-beta.5 → 3.1.12-beta.6

package/es/packages/big-table/index.d.ts

@@ -2563,14 +2563,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
-            beforeEditMethod?: ((params: {
-                row: any;
-                rowIndex: number;
-                column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                columnIndex: number;
-                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
-                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
-            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -2562,14 +2562,6 @@ declare const _default: import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
-            beforeEditMethod?: ((params: {
-                row: any;
-                rowIndex: number;
-                column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                columnIndex: number;
-                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
-                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
-            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -14,3 +14,4 @@ export * from './radio';
 export * from './labelSelect';
 export * from './slider';
 export * from './complex';
+export * from './simpleComponent';

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

@@ -14,3 +14,4 @@ export { RADIO } from './radio.js';
 export { LABEL } from './labelSelect.js';
 export { SLIDER } from './slider.js';
 export { COMPLEX } from './complex.js';
+export { BUTTON, TEXT } from './simpleComponent.js';

package/es/packages/form-render/src/components/renderer/linebar.js

@@ -58,7 +58,7 @@ const script = defineComponent({
       }) : createVNode("header", {
         "class": "form-render__linebarHeader",
         "onClick": toggleShow
-      }, [" ", props.title, " "]), createVNode(NCollapseTransition, {
+      }, [props.title]), createVNode(NCollapseTransition, {
         "class": "form-render__linebarItem",
         "show": _show.value
       }, slots)]);

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

@@ -0,0 +1,2 @@
+export declare const TEXT: (props: any) => JSX.Element;
+export declare const BUTTON: (props: any) => JSX.Element;

package/es/packages/form-render/src/components/renderer/simpleComponent.js

@@ -0,0 +1,65 @@
+import { createVNode, mergeProps, isVNode } from 'vue';
+import { connect, mapProps } from '@formily/vue';
+import { isObject, isFunction } from 'lodash-es';
+import { NButton } from 'naive-ui';
+
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !isVNode(s);
+}
+function createPropFor(props) {
+  return (property) => {
+    var _a;
+    return (_a = props.fieldItem) == null ? void 0 : _a[property];
+  };
+}
+function createSlot(renderer, props) {
+  if (isObject(renderer)) {
+    const result = {};
+    Object.entries(renderer).forEach(([key, renderer2]) => {
+      isFunction(renderer2) && (result[key] = () => renderer2(props));
+    });
+    return result;
+  }
+  return {
+    default() {
+      return isFunction(renderer) ? renderer(props) : renderer;
+    }
+  };
+}
+const textScript = (props) => {
+  var _a, _b, _c;
+  const propFor = createPropFor(props);
+  return createVNode("div", (_a = propFor("componentProps")) != null ? _a : {}, [(_c = (_b = createSlot(props.content, props)).default) == null ? void 0 : _c.call(_b)]);
+};
+const TEXT = connect(textScript, mapProps((props) => {
+  var _a;
+  return {
+    ...props,
+    content: (_a = props.fieldItem) == null ? void 0 : _a.content
+  };
+}));
+const buttonScript = (props) => {
+  var _a;
+  let _slot;
+  const propFor = createPropFor(props);
+  function onClick() {
+    var _a2;
+    const cb = propFor("onClick") || ((_a2 = propFor("componentProps")) == null ? void 0 : _a2.onClick);
+    return () => isFunction(cb) && cb(props.fieldItem);
+  }
+  console.log(props.content);
+  return createVNode(NButton, mergeProps((_a = propFor("componentProps")) != null ? _a : {}, {
+    "onClick": onClick()
+  }), _isSlot(_slot = createSlot(props.content, props)) ? _slot : {
+    default: () => [_slot]
+  });
+};
+const BUTTON = connect(buttonScript, mapProps((props) => {
+  var _a;
+  return {
+    ...props,
+    content: (_a = props.fieldItem) == null ? void 0 : _a.content
+  };
+}));
+
+export { BUTTON, TEXT };

package/es/packages/form-render/src/components/renderer/slider.js

@@ -6,7 +6,7 @@ const SLIDER = connect(NSlider, mapProps((props, field) => {
   const _props = assignUpdateValue(props, field);
   if (Array.isArray(_props.option)) {
     _props.marks = _props.option.reduce((fin, option) => {
-      fin[option.value] = option.text;
+      fin[+option.value] = option.text;
       return fin;
     }, {});
   }

package/es/packages/form-render/src/hooks/useFieldListAdaptor.d.ts

@@ -1,5 +1,5 @@
-import { FieldItem } from '../types';
 import { BusinessCollector } from '../../../../../es/packages/form-render';
+import { FieldItem } from '../types';
 /**
  * @description 胶水层, 将低代码平台中的fieldList转换为JSONSchema
  */

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

@@ -1,7 +1,7 @@
+import { isObject } from '@vueuse/core';
 import { isArray, pick } from 'lodash-es';
-import { arrayed, transformDateFormat } from '../utils/index.js';
 import { useFormValidator, useTypeNormalize } from '../../../../packages/form-render';
-import { isObject } from '@vueuse/core';
+import { arrayed, transformDateFormat } from '../utils/index.js';
 
 function useFieldListAdaptor(collector, uuid) {
   const { createValidatorSchema } = useFormValidator();
@@ -10,12 +10,6 @@ function useFieldListAdaptor(collector, uuid) {
       name: item.val_key,
       type: "string",
       title: item.alias || item.name,
-      "x-decorator": "FORM_ITEM",
-      "x-decorator-props": {
-        span: item.elem_width,
-        showLabel: item.hide_title !== "1",
-        id: `${uuid}-${item.val_key}`
-      },
       "x-component": item.html_type,
       "x-component-props": {
         placeholder: item.placeholder,
@@ -28,6 +22,17 @@ function useFieldListAdaptor(collector, uuid) {
     if (isObject(item.reactions)) {
       result["x-reactions"] = item.reactions;
     }
+    if (!item.noDecorator) {
+      Object.assign(result, {
+        "x-decorator": "FORM_ITEM",
+        "x-decorator-props": {
+          span: item.elem_width,
+          showLabel: item.hide_title !== "1",
+          id: `${uuid}-${item.val_key}`,
+          ...item.decoratorProps || {}
+        }
+      });
+    }
     const rules = createValidatorSchema(item);
     rules && (result["x-validator"] = rules);
     item.is_null === "0" && (result.required = true);
@@ -108,9 +113,9 @@ function useFieldListAdaptor(collector, uuid) {
   const createSliderSchema = (item) => {
     const schema = createStandardSchema(item);
     Object.assign(schema["x-component-props"], {
-      step: item.step_length,
-      max: item.max_length,
-      min: item.min_length,
+      step: +item.step_length,
+      max: +item.max_length,
+      min: +item.min_length,
       option: item.option
     });
     return schema;
@@ -183,22 +188,26 @@ function useFieldListAdaptor(collector, uuid) {
   const { normalize } = useTypeNormalize();
   function schemaAdaptor(fieldList) {
     let prevLinebar = null;
-    return fieldList.reduce((fin, cur) => {
+    return fieldList.reduce((fin, cur, idx) => {
       var _a;
       normalize(cur);
       const obj_type = (_a = cur.validate) == null ? void 0 : _a.obj_type;
       obj_type && collector.collect(obj_type, cur.val_key);
       if (cur.html_type === "LINEBAR") {
-        fin[createFieldName(cur)] = createLinebarSchema(cur);
+        fin[createFieldName(cur)] = bindIndex(createLinebarSchema(cur), idx);
         prevLinebar = fin[createFieldName(cur)].properties = {};
       } else if (prevLinebar) {
-        prevLinebar[createFieldName(cur)] = createWidgetSchema(cur);
+        prevLinebar[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
       } else {
         prevLinebar = null;
-        fin[createFieldName(cur)] = createWidgetSchema(cur);
+        fin[createFieldName(cur)] = bindIndex(createWidgetSchema(cur), idx);
       }
       return fin;
     }, {});
+    function bindIndex(schema, idx) {
+      schema["x-index"] = idx;
+      return schema;
+    }
     function createFieldName(fieldItem) {
       if (isArray(fieldItem.suffixConfig)) {
         return [fieldItem.val_key, fieldItem.suffixConfig.map((f) => f.val_key)].join("-");

package/es/packages/index.css

@@ -1129,6 +1129,13 @@ body > .vxe-table--tooltip-wrapper {
 .n-dialog__title .svg-wrap {
   margin: 0 0 0 auto;
 }
+.n-dialog__title .svg-wrap .svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
 .n-dialog__title .svg-wrap svg {
   font-size: 14px;
   cursor: pointer;

package/es/packages/select-label/style/index.css

@@ -148,6 +148,13 @@
 .n-dialog__title .svg-wrap {
   margin: 0 0 0 auto;
 }
+.n-dialog__title .svg-wrap .svg-icon {
+  width: 1em;
+  height: 1em;
+  vertical-align: -0.15em;
+  fill: currentColor;
+  overflow: hidden;
+}
 .n-dialog__title .svg-wrap svg {
   font-size: 14px;
   cursor: pointer;

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "cnhis-design-vue",
 	"private": false,
-	"version": "3.1.12-beta.5",
+	"version": "3.1.12-beta.6",
 	"license": "ISC",
 	"module": "es/packages/index.js",
 	"main": "es/packages/index.js",
@@ -59,7 +59,7 @@
 		"vue": "^3.2.0",
 		"vue-simple-uploader": "^1.0.0-beta.5",
 		"vuedraggable": "4.1.0",
-		"vxe-table": "^4.2.5",
+		"vxe-table": "4.2.5",
 		"xe-utils": "^3.5.4"
 	},
 	"devDependencies": {