kts-components-document-access-point 1.1.16 → 1.1.17

package/dist/index.esm.js

@@ -1,5 +1,5 @@
 import React, { createElement, useState, useEffect, useCallback, useMemo, useRef, createContext } from 'react';
-import { Breadcrumb as Breadcrumb$1, Button, Select, Input, Form, Drawer, Space, Radio, Switch, Table, Popconfirm, Tooltip, DatePicker, Collapse, Divider, message, Menu, ConfigProvider, PageHeader as PageHeader$1, Card, Row, Col, Modal as Modal$1 } from 'kts-components-antd-x4';
+import { Breadcrumb as Breadcrumb$1, Button, Select, Input, Form, Drawer, Space, Radio, Switch, Table, Popconfirm, Tooltip, DatePicker, Collapse, message, Divider, Menu, ConfigProvider, PageHeader as PageHeader$1, Card, Row, Col, Modal as Modal$1 } from 'kts-components-antd-x4';
 import GreyReactBox from 'grey-react-box';
 import { v4 } from 'uuid';
 import Icon, { InfoCircleOutlined } from '@ant-design/icons';
@@ -655,7 +655,8 @@ var editProperties = /*#__PURE__*/(function () {
             return _context.abrupt("return");
 
           case 2:
-            editProperties = options.editProperties, properties = options.properties, current = options.current; // 对象数据
+            editProperties = options.editProperties, properties = options.properties, current = options.current;
+            debugger; // 对象数据
 
             current.properties[properties.$name].alias = properties.title;
             current.properties[properties.$name].detailed = properties.description; // 修改了类型 清空规则
@@ -696,11 +697,13 @@ var editProperties = /*#__PURE__*/(function () {
                 title: properties.items.title,
                 properties: pro
               });
+            } else {
+              delete s.schema.definitions[editProperties.ref.$name]['items'];
             }
 
             s.schema = _objectSpread2({}, s.schema);
 
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }
@@ -867,6 +870,7 @@ var Breadcrumb = (function () {
       };
     }())();
   }, []);
+  if (breadcrumbState.length === 0) return /*#__PURE__*/React.createElement("span", null);
   return /*#__PURE__*/React.createElement(Breadcrumb$1, {
     separator: ">"
   }, /*#__PURE__*/React.createElement(Breadcrumb$1.Item, {
@@ -1195,6 +1199,7 @@ var propertyColumns = [{
   }
 }, {
   title: '是否必填',
+  width: 80,
   render: function render(_, v) {
     return /*#__PURE__*/React.createElement(MySpan, null, v.required.indexOf(v.value.$name) >= 0 ? '是' : '否');
   }
@@ -1206,6 +1211,7 @@ var propertyColumns = [{
 }, {
   title: '是否已添加校验规则',
   key: 'isRules',
+  width: 130,
   render: function render(_, v) {
     return /*#__PURE__*/React.createElement(MySpan, null, v.ref.rules ? v.ref.rules.length > 0 ? '是' : '否' : '否');
   }
@@ -1413,7 +1419,7 @@ function styleInject(css, ref) {
   }
 }
 
-var css_248z = ".kts-documents-edit-property-table-button-list .ktsAntX-btn-link {\n  padding: 4px;\n}\n";
+var css_248z = ".kts-documents-edit-property-table-button-list .ktsAntX-btn-link {\n  padding: 4px !important;\n}\n";
 styleInject(css_248z);
 
 var useTableProps = (function () {
@@ -1472,7 +1478,7 @@ var PropertyTable = (function () {
     rowKey: "$name",
     pagination: false,
     scroll: {
-      y: 240,
+      y: '100%',
       x: true
     }
   }, useTableProps()));
@@ -1700,8 +1706,10 @@ var EditProperty = (function () {
     help: isChangeType ? "修改类型后，系统将自动清空该字段的校验规则。" : undefined,
     validateStatus: isChangeType ? "warning" : ''
   }, /*#__PURE__*/React.createElement(Select, {
-    onSelect: function onSelect() {
-      setIsChangeType(true);
+    onChange: function onChange(e) {
+      var _editProperties$ref$t;
+
+      setIsChangeType(e !== getType((_editProperties$ref$t = editProperties === null || editProperties === void 0 ? void 0 : editProperties.ref.type) !== null && _editProperties$ref$t !== void 0 ? _editProperties$ref$t : ''));
     }
   }, /*#__PURE__*/React.createElement(Option$1, {
     key: "00",
@@ -2308,7 +2316,7 @@ var EditRule = (function () {
     }())();
   }, [controller]);
   var onSubmit = React.useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-    var formList, sum, i;
+    var formList, sum, i, ms;
     return regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -2323,8 +2331,8 @@ var EditRule = (function () {
           case 2:
             formList = controller.state.ruleState.formList;
             sum = [];
-            _context3.prev = 4;
             i = 0;
+            _context3.prev = 5;
 
           case 6:
             if (!(i < formList.length)) {
@@ -2384,20 +2392,25 @@ var EditRule = (function () {
             }())();
 
           case 21:
-            _context3.next = 26;
+            _context3.next = 28;
             break;
 
           case 23:
             _context3.prev = 23;
-            _context3.t6 = _context3["catch"](4);
-            console.error('===> 表单有错', _context3.t6);
+            _context3.t6 = _context3["catch"](5);
+            ms = "[\u89C4\u5219".concat(i + 1, "] ").concat(_context3.t6.errorFields[0].errors[0]);
+            message.error({
+              key: ms,
+              content: ms
+            });
+            console.error('===> 表单有错', _context3.t6.errorFields[0].errors[0], i);
 
-          case 26:
+          case 28:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[4, 23]]);
+    }, _callee3, null, [[5, 23]]);
   })), [controller, operatorMap, ruleProperties]);
   return /*#__PURE__*/React.createElement(Drawer, {
     title: "\u7F16\u8F91\u9A8C\u8BC1\u89C4\u5219",
@@ -2474,7 +2487,7 @@ function algorithmFormat(operator, operatorMap, type) {
   return operator;
 }
 
-var css_248z$2 = ".kts-documents-edit .kts-documents-edit-head {\n  display: flex;\n  margin-bottom: 10px;\n}\n.kts-documents-edit .kts-documents-edit-head .ktsAntX-space-item:first-child {\n  flex: 1;\n}\n";
+var css_248z$2 = ".kts-documents-edit {\n  min-height: 600px;\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n}\n.kts-documents-edit .kts-documents-edit-head {\n  display: flex;\n  margin-bottom: 10px;\n}\n.kts-documents-edit .kts-documents-edit-head .ktsAntX-space-item:first-child {\n  flex: 1;\n}\n.kts-documents-edit .kts-documents-edit-property {\n  flex: 1;\n  overflow: auto;\n}\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table,\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-spin-container,\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-spin-nested-loading,\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table-wrapper {\n  height: 100%;\n  overflow: auto;\n}\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table-container {\n  height: 100%;\n  overflow: auto;\n  display: flex;\n  flex-direction: column;\n}\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table-container .ktsAntX-table-header {\n  flex: none;\n}\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table-container .ktsAntX-table-body {\n  flex: 1;\n  overflow: auto;\n}\n";
 styleInject(css_248z$2);
 
 /** 发票组件的上下文 */
@@ -2661,10 +2674,7 @@ var Main = function Main(props) {
   return /*#__PURE__*/React.createElement(DocumentsEditContext.Provider, {
     value: controller
   }, /*#__PURE__*/React.createElement("div", {
-    className: "kts-documents-edit",
-    style: {
-      minHeight: 600
-    }
+    className: "kts-documents-edit"
   }, /*#__PURE__*/React.createElement(Space, {
     className: "kts-documents-edit-head"
   }, /*#__PURE__*/React.createElement(Breadcrumb, null), /*#__PURE__*/React.createElement(AddPropertyButton, null)), /*#__PURE__*/React.createElement("div", {

package/dist/index.js

@@ -669,7 +669,8 @@ var editProperties = /*#__PURE__*/(function () {
             return _context.abrupt("return");
 
           case 2:
-            editProperties = options.editProperties, properties = options.properties, current = options.current; // 对象数据
+            editProperties = options.editProperties, properties = options.properties, current = options.current;
+            debugger; // 对象数据
 
             current.properties[properties.$name].alias = properties.title;
             current.properties[properties.$name].detailed = properties.description; // 修改了类型 清空规则
@@ -710,11 +711,13 @@ var editProperties = /*#__PURE__*/(function () {
                 title: properties.items.title,
                 properties: pro
               });
+            } else {
+              delete s.schema.definitions[editProperties.ref.$name]['items'];
             }
 
             s.schema = _objectSpread2({}, s.schema);
 
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }
@@ -881,6 +884,7 @@ var Breadcrumb = (function () {
       };
     }())();
   }, []);
+  if (breadcrumbState.length === 0) return /*#__PURE__*/React__default['default'].createElement("span", null);
   return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Breadcrumb, {
     separator: ">"
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Breadcrumb.Item, {
@@ -1209,6 +1213,7 @@ var propertyColumns = [{
   }
 }, {
   title: '是否必填',
+  width: 80,
   render: function render(_, v) {
     return /*#__PURE__*/React__default['default'].createElement(MySpan, null, v.required.indexOf(v.value.$name) >= 0 ? '是' : '否');
   }
@@ -1220,6 +1225,7 @@ var propertyColumns = [{
 }, {
   title: '是否已添加校验规则',
   key: 'isRules',
+  width: 130,
   render: function render(_, v) {
     return /*#__PURE__*/React__default['default'].createElement(MySpan, null, v.ref.rules ? v.ref.rules.length > 0 ? '是' : '否' : '否');
   }
@@ -1427,7 +1433,7 @@ function styleInject(css, ref) {
   }
 }
 
-var css_248z = ".kts-documents-edit-property-table-button-list .ktsAntX-btn-link {\n  padding: 4px;\n}\n";
+var css_248z = ".kts-documents-edit-property-table-button-list .ktsAntX-btn-link {\n  padding: 4px !important;\n}\n";
 styleInject(css_248z);
 
 var useTableProps = (function () {
@@ -1486,7 +1492,7 @@ var PropertyTable = (function () {
     rowKey: "$name",
     pagination: false,
     scroll: {
-      y: 240,
+      y: '100%',
       x: true
     }
   }, useTableProps()));
@@ -1714,8 +1720,10 @@ var EditProperty = (function () {
     help: isChangeType ? "修改类型后，系统将自动清空该字段的校验规则。" : undefined,
     validateStatus: isChangeType ? "warning" : ''
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Select, {
-    onSelect: function onSelect() {
-      setIsChangeType(true);
+    onChange: function onChange(e) {
+      var _editProperties$ref$t;
+
+      setIsChangeType(e !== getType((_editProperties$ref$t = editProperties === null || editProperties === void 0 ? void 0 : editProperties.ref.type) !== null && _editProperties$ref$t !== void 0 ? _editProperties$ref$t : ''));
     }
   }, /*#__PURE__*/React__default['default'].createElement(Option$1, {
     key: "00",
@@ -2322,7 +2330,7 @@ var EditRule = (function () {
     }())();
   }, [controller]);
   var onSubmit = React__default['default'].useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-    var formList, sum, i;
+    var formList, sum, i, ms;
     return regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
         switch (_context3.prev = _context3.next) {
@@ -2337,8 +2345,8 @@ var EditRule = (function () {
           case 2:
             formList = controller.state.ruleState.formList;
             sum = [];
-            _context3.prev = 4;
             i = 0;
+            _context3.prev = 5;
 
           case 6:
             if (!(i < formList.length)) {
@@ -2398,20 +2406,25 @@ var EditRule = (function () {
             }())();
 
           case 21:
-            _context3.next = 26;
+            _context3.next = 28;
             break;
 
           case 23:
             _context3.prev = 23;
-            _context3.t6 = _context3["catch"](4);
-            console.error('===> 表单有错', _context3.t6);
+            _context3.t6 = _context3["catch"](5);
+            ms = "[\u89C4\u5219".concat(i + 1, "] ").concat(_context3.t6.errorFields[0].errors[0]);
+            ktsComponentsAntdX4.message.error({
+              key: ms,
+              content: ms
+            });
+            console.error('===> 表单有错', _context3.t6.errorFields[0].errors[0], i);
 
-          case 26:
+          case 28:
           case "end":
             return _context3.stop();
         }
       }
-    }, _callee3, null, [[4, 23]]);
+    }, _callee3, null, [[5, 23]]);
   })), [controller, operatorMap, ruleProperties]);
   return /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Drawer, {
     title: "\u7F16\u8F91\u9A8C\u8BC1\u89C4\u5219",
@@ -2488,7 +2501,7 @@ function algorithmFormat(operator, operatorMap, type) {
   return operator;
 }
 
-var css_248z$2 = ".kts-documents-edit .kts-documents-edit-head {\n  display: flex;\n  margin-bottom: 10px;\n}\n.kts-documents-edit .kts-documents-edit-head .ktsAntX-space-item:first-child {\n  flex: 1;\n}\n";
+var css_248z$2 = ".kts-documents-edit {\n  min-height: 600px;\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n}\n.kts-documents-edit .kts-documents-edit-head {\n  display: flex;\n  margin-bottom: 10px;\n}\n.kts-documents-edit .kts-documents-edit-head .ktsAntX-space-item:first-child {\n  flex: 1;\n}\n.kts-documents-edit .kts-documents-edit-property {\n  flex: 1;\n  overflow: auto;\n}\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table,\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-spin-container,\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-spin-nested-loading,\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table-wrapper {\n  height: 100%;\n  overflow: auto;\n}\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table-container {\n  height: 100%;\n  overflow: auto;\n  display: flex;\n  flex-direction: column;\n}\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table-container .ktsAntX-table-header {\n  flex: none;\n}\n.kts-documents-edit .kts-documents-edit-property .ktsAntX-table-container .ktsAntX-table-body {\n  flex: 1;\n  overflow: auto;\n}\n";
 styleInject(css_248z$2);
 
 /** 发票组件的上下文 */
@@ -2675,10 +2688,7 @@ var Main = function Main(props) {
   return /*#__PURE__*/React__default['default'].createElement(DocumentsEditContext.Provider, {
     value: controller
   }, /*#__PURE__*/React__default['default'].createElement("div", {
-    className: "kts-documents-edit",
-    style: {
-      minHeight: 600
-    }
+    className: "kts-documents-edit"
   }, /*#__PURE__*/React__default['default'].createElement(ktsComponentsAntdX4.Space, {
     className: "kts-documents-edit-head"
   }, /*#__PURE__*/React__default['default'].createElement(Breadcrumb, null), /*#__PURE__*/React__default['default'].createElement(AddPropertyButton, null)), /*#__PURE__*/React__default['default'].createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kts-components-document-access-point",
-  "version": "1.1.16",
+  "version": "1.1.17",
   "private": false,
   "scripts": {
     "start": "dumi dev",

package/src/DocumentsEdit/DocumentsEditController/actions/editProperties/index.ts

@@ -7,6 +7,8 @@ export default async (s: DocumentsEditControllerState, options: any) => {
 
     const { editProperties, properties, current } = options;
 
+    debugger;
+
     // 对象数据
     current.properties[properties.$name].alias = properties.title;
     current.properties[properties.$name].detailed = properties.description;
@@ -29,7 +31,7 @@ export default async (s: DocumentsEditControllerState, options: any) => {
             return editProperties.ref.properties;
         }
     })()
-    
+
     // 设置数据
     s.schema.definitions[editProperties.ref.$name] = {
         ...editProperties.ref,
@@ -47,6 +49,8 @@ export default async (s: DocumentsEditControllerState, options: any) => {
             title: properties.items.title,
             properties: pro,
         }
+    } else {
+        delete s.schema.definitions[editProperties.ref.$name]['items']
     }
 
     s.schema = { ...s.schema };

package/src/DocumentsEdit/___demo___/monitor/index.tsx

@@ -8,19 +8,19 @@ const { createSchema } = DocumentsEdit;
 
 export default () => {
 
-  const [schema, setScheme] = React.useState(createSchema('对账单'));
+  const [schema, setScheme] = React.useState<any>();
 
   const onChange = React.useCallback((schema: ISchema) => {
-    console.log(schema);
+    console.log('===> onChange', schema);
   }, [])
 
   return (
     <div>
       <Button onClick={() => { setScheme(createSchema('对账单')) }} >更新文档</Button>
-      <DocumentsEdit
-        schema={schema} // 初始化文档
-        onChange={onChange}    // 文档变化事件
-      />
+      {schema && <DocumentsEdit
+        schema={schema}       // 初始化文档
+        onChange={onChange}   // 文档变化事件
+      />}
     </div>
   );
 };

package/src/DocumentsEdit/constant/propertyColumns/index.tsx

@@ -25,6 +25,7 @@ const propertyColumns: ColumnType<any>[] = [
   },
   {
     title: '是否必填',
+    width: 80,
     render: (_, v) => {
       return <MySpan>{v.required.indexOf(v.value.$name) >= 0 ? '是' : '否'}</MySpan>;
     },
@@ -38,6 +39,7 @@ const propertyColumns: ColumnType<any>[] = [
   {
     title: '是否已添加校验规则',
     key: 'isRules',
+    width: 130,
     render: (_, v) => {
       return <MySpan>{v.ref.rules ? v.ref.rules.length > 0 ? '是' : '否' : '否'}</MySpan>;
     },

package/src/DocumentsEdit/index.less

@@ -1,4 +1,10 @@
 .kts-documents-edit {
+
+  min-height: 600px;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
   .kts-documents-edit-head {
     display: flex;
     margin-bottom: 10px;
@@ -7,4 +13,33 @@
       flex: 1;
     }
   }
+
+  .kts-documents-edit-property {
+    flex: 1;
+    overflow: auto;
+
+    .ktsAntX-table,
+    .ktsAntX-spin-container,
+    .ktsAntX-spin-nested-loading,
+    .ktsAntX-table-wrapper{
+      height: 100%;
+      overflow: auto;
+    }
+
+    .ktsAntX-table-container{
+      height: 100%;
+      overflow: auto;
+      display: flex;
+      flex-direction: column;
+
+      .ktsAntX-table-header{
+        flex: none;
+      }
+
+      .ktsAntX-table-body{
+        flex: 1;
+        overflow: auto;
+      }
+    }
+  }
 }

package/src/DocumentsEdit/index.tsx

@@ -101,7 +101,7 @@ const Main = (props: IDocumentsEdit) => {
 
   return (
     <DocumentsEditContext.Provider value={controller}>
-      <div className="kts-documents-edit" style={{ minHeight: 600 }} >
+      <div className="kts-documents-edit" >
         <Space className="kts-documents-edit-head">
           <Breadcrumb />
           <AddPropertyButton />

package/src/DocumentsEdit/ui/Breadcrumb/index.tsx

@@ -1,14 +1,14 @@
 import React from 'react';
 import { Breadcrumb, Button } from 'kts-components-antd-x4';
 import DocumentsEdit from '../../';
-import IProperties from '../../DocumentsEditController/DocumentsEditControllerState/IProperties';
+// import IProperties from '../../DocumentsEditController/DocumentsEditControllerState/IProperties';
 import { IDataSource } from '../../../DocumentsEdit/DocumentsEditController/DocumentsEditControllerState';
 
 export default () => {
 
   const controller = DocumentsEdit.useDocumentsEditController();
 
-  const title = controller.useMemo(s=>s.schema.title, [])
+  const title = controller.useMemo(s => s.schema.title, [])
 
   const breadcrumbState = controller.useMemo(s => s.breadcrumbState, []);
 
@@ -30,6 +30,8 @@ export default () => {
     })()
   }, [])
 
+  if (breadcrumbState.length === 0) return <span></span>;
+
   return (
     <Breadcrumb separator=">">
       <Breadcrumb.Item key="root" >

package/src/DocumentsEdit/ui/EditProperty/index.tsx

@@ -162,7 +162,7 @@ export default () => {
                     help={isChangeType ? "修改类型后，系统将自动清空该字段的校验规则。" : undefined}
                     validateStatus={isChangeType ? "warning" : ''}
                 >
-                    <Select onSelect={() => { setIsChangeType(true) }} >
+                    <Select onChange={e => { setIsChangeType(e !== tools.getType(editProperties?.ref.type ?? '')) }} >
                         <Option key="00" value="string">{tools.getTypeName('string')}</Option>
                         <Option key="01" value="string|date">{tools.getTypeName('string|date')}</Option>
                         <Option key="02" value="string|time">{tools.getTypeName('string|time')}</Option>

package/src/DocumentsEdit/ui/EditRule/index.tsx

@@ -5,6 +5,7 @@ import {
     Drawer,
     Space,
     Divider,
+    message,
 } from 'kts-components-antd-x4';
 import DocumentsEdit from '../../';
 import AddRuleButton from './ui/AddRuleButton';
@@ -30,7 +31,7 @@ export default () => {
 
     /** 正在编辑规则的字段 */
     const rules = controller.useMemo(s => s.ruleState.ruleProperties?.ref?.rules ?? [], []);
-    
+
     const onClose = React.useCallback(() => { controller.pipeline(async s => s.ruleState.ruleProperties = undefined)() }, [controller]);
 
     const onSubmit = React.useCallback(async () => {
@@ -38,8 +39,9 @@ export default () => {
 
         const formList = controller.state.ruleState.formList;
         const sum: any[] = [];
+        let i = 0
         try {
-            for (let i = 0; i < formList.length; i++) {
+            for (; i < formList.length; i++) {
                 sum.push(algorithmFormat(await formList[i].validateFields(), operatorMap, ruleProperties.ref.type))
             }
             await controller.pipeline(async s => {
@@ -48,8 +50,10 @@ export default () => {
                 s.schema = { ...s.schema };
                 s.ruleState.ruleProperties = undefined;
             })()
-        } catch (error) {
-            console.error('===> 表单有错', error)
+        } catch (error: any) {
+            const ms = `[规则${i + 1}] ${error.errorFields[0].errors[0]}`
+            message.error({ key: ms, content: ms });
+            console.error('===> 表单有错', error.errorFields[0].errors[0], i);
         }
     }, [controller, operatorMap, ruleProperties])
 

package/src/DocumentsEdit/ui/PropertyTable/hooks/useTableProps/index.less

@@ -1,5 +1,5 @@
 .kts-documents-edit-property-table-button-list{
     .ktsAntX-btn-link{
-        padding: 4px;
+        padding: 4px !important;
     }
 }

package/src/DocumentsEdit/ui/PropertyTable/index.tsx

@@ -11,7 +11,7 @@ export default () => {
       size="small"
       rowKey="$name"
       pagination={false}
-      scroll={{ y: 240, x: true }}
+      scroll={{ y: '100%', x: true }}
       {...useTableProps()}
     />
   );