kts-components-document-access-point 1.3.22 → 1.3.26

package/package.json

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

package/src/DocumentWhiteList/ui/pageheader/BlackHeader.tsx

@@ -64,11 +64,12 @@ export default () => {
                         "value": 2
                     }],
                 },
-                '[beginCreateTime,endCreateTime]': {
-                    key: "[beginCreateTime,endCreateTime]",
-                    name: "[beginCreateTime,endCreateTime]",
+                createTime: {
                     type: "daterange",
                     title: "创建时间",
+                    'x-props':{
+                        extendsFields: ['beginCreateTime', 'endCreateTime'],
+                    }
                 },
                 // '[beginUpdateTime,endUpdateTime]': {
                 //     key: "[beginUpdateTime,endUpdateTime]",

package/src/DocumentWhiteList/ui/pageheader/WhiteHeader.tsx

@@ -72,11 +72,12 @@ export default () => {
                         "value": 2
                     }],
                 },
-                '[beginCreateTime,endCreateTime]': {
-                    key: "[beginCreateTime,endCreateTime]",
-                    name: "[beginCreateTime,endCreateTime]",
+                createTime: {
                     type: "daterange",
                     title: "创建时间",
+                    'x-props':{
+                        extendsFields: ['beginCreateTime', 'endCreateTime'],
+                    }
                 },
                 // '[beginUpdateTime,endUpdateTime]': {
                 //     key: "[beginUpdateTime,endUpdateTime]",

package/src/DocumentsCont/___demo___/base/index.tsx

@@ -3,6 +3,6 @@ import React from "react";
 
 export default () => {
   return (
-    <DocumentsCont path='/billwhiteliest'/>
+    <DocumentsCont path=''/>
   );
 };

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

@@ -12,21 +12,20 @@ export default async (s: DocumentsEditControllerState, options?: { current?: IPr
         return
     }
 
-    let obj: any;
-    // 对象 还是 数组
+    const info = current.items ? current.items : current;
+
+    // let obj: any;
+    // 创建 properties (对象 还是 数组)
     if (current.type === 'object') {
         if (!current.properties) current.properties = {};
-        obj = current.properties;
     } else if (current.type === 'array' && current.items) {
         if (!current.items.properties) current.items.properties = {};
-        obj = current.items.properties;
     }
 
-    if (!current.required) current.required = [];
-
-    values.required && current.required.push(values.$name);
+    if (!info.required) info.required = [];
+    values.required && info.required.push(values.$name);
 
-    obj[values.$name] = {
+    (info.properties as any)[values.$name] = {
         alias: values.title,
         detailed: values.description,
         $ref: properties.$id,

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

@@ -1,27 +1,48 @@
 
 import DocumentsEditControllerState, { IDataSource } from '../../DocumentsEditControllerState';
+import IProperties from '../../DocumentsEditControllerState/IProperties';
 
 export default async (s: DocumentsEditControllerState, options?: IDataSource) => {
-    if (!options) return;
+    if (!options || !s.propertyTableState.current) return;
 
-    const properties = s.propertyTableState.current?.items
-        ? s.propertyTableState.current?.items.properties
-        : s.propertyTableState.current?.properties;
+    const current = s.propertyTableState.current?.items
+        ? s.propertyTableState.current?.items
+        : s.propertyTableState.current
 
-    // 删除必填
-    (() => {
-        const p = options.required.indexOf(options.value.$name);
-        options.required.splice(p, 1);
-    })()
+    _del(current, options.value.$name, options.value.$refName);
 
-    // 删除引用
-    if (!properties) return;
-    delete properties[options.value.$name];
+    function _del(current: IProperties, name: string, refName: string) {
+        // 删除必填
+        (() => {
+            if (!current.required) return;
+            const p = current.required.indexOf(name);
+            current.required.splice(p, 1);
+        })();
+
+        // 删除引用
+        (() => {
+            if (!current.properties) return;
+            delete current.properties[name];
+            s.schema.definitions[refName].$count--;
+        })();
+
+        // 删除孩子
+        (() => {
+            const items = s.schema.definitions[refName].items;
+            const current: IProperties = items ? items : s.schema.definitions[refName];
+            const properties = current.properties;
+            if (!properties) return;
+            for (let name in properties) {
+                _del(current, name, properties[name].$refName);
+            }
+        })();
+    }
 
     // 删除对象
-    s.schema.definitions[options.value.$refName].$count--;
-    if (s.schema.definitions[options.value.$refName].$count <= 0) {
-        delete s.schema.definitions[options.value.$refName];
+    for (let key in s.schema.definitions) {
+        if (s.schema.definitions[key].$count <= 0) {
+            delete s.schema.definitions[key];
+        }
     }
 
     s.schema = { ...s.schema }

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

@@ -5,24 +5,23 @@ import * as tools from '../../../tools';
 export default async (s: DocumentsEditControllerState, options: any) => {
     if (!options) return;
 
-    const { editProperties, properties, current } = options;
+    const { editProperties, properties } = options;
+    const current = options.current.properties ? options.current : options.current.items;
 
     // 对象数据
     current.properties[properties.$name].alias = properties.title;
     current.properties[properties.$name].detailed = properties.description;
 
-
-
     // 设置必填
-    const required = current.required as string[];
+    const required = (current.required as string[] || (current.required = []));
     if (properties.required) {
         if (required.indexOf(properties.$name) < 0) {
-            current.required.push(properties.$name)
+            current.required.push(properties.$name);
         }
     } else {
         const p = required.indexOf(properties.$name)
         if (p >= 0) {
-            required.splice(p, 1)
+            required.splice(p, 1);
         }
     }
 
@@ -64,7 +63,7 @@ export default async (s: DocumentsEditControllerState, options: any) => {
     const editProperties_type = editProperties.ref.items ? editProperties.ref.items.type : editProperties.ref.type;
 
     const editProperties_format = editProperties.ref.items ? editProperties.ref.items.format : editProperties.ref.format;
-    const properties_format =  properties.items ? properties.items.format : properties.format;
+    const properties_format = properties.items ? properties.items.format : properties.format;
 
     // 内部规则 修改了类型 清空规则
     if (editProperties_type !== properties_type || editProperties_format !== properties_format) {

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

@@ -1,16 +1,16 @@
-
-import { Switch } from 'kts-components-antd-x4';
-import React from 'react';
-import { DocumentsEdit } from '../../../';
-
-export default () => {
-
-  const [readOnly, setReadOnly] = React.useState(false)
-
-  return (
-    <>
-      <Switch style={{}} onChange={e => { setReadOnly(e) }} />
-      <DocumentsEdit readOnly={readOnly} />
-    </>
-  );
-};
+
+import { Switch } from 'kts-components-antd-x4';
+import React from 'react';
+import { DocumentsEdit } from '../../../';
+
+export default () => {
+
+  const [readOnly, setReadOnly] = React.useState(false)
+
+  return (
+    <>
+      <Switch style={{}} onChange={e => { setReadOnly(e) }} />
+      <DocumentsEdit readOnly={readOnly} />
+    </>
+  );
+};

package/src/DocumentsEdit/index.md

@@ -1,10 +1,10 @@
-# DocumentsEdit
-
-## 普通使用
-<code src="./___demo___/conventional/index.tsx" ></code>
-
-## 监听问题编号 和 导入数据
-<code src="./___demo___/monitor/index.tsx" ></code>
-
-## 只读模式
-<code src="./___demo___/readOnly/index.tsx" ></code>
+# DocumentsEdit
+
+## 普通使用
+<code src="./___demo___/conventional/index.tsx" ></code>
+
+## 监听问题编号 和 导入数据
+<code src="./___demo___/monitor/index.tsx" ></code>
+
+## 只读模式
+<code src="./___demo___/readOnly/index.tsx" ></code>

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

@@ -51,19 +51,7 @@ export default () => {
         type: values.isArray ? 'array' : tools.getType(values.type),
         format: values.isArray ? undefined : tools.getFormat(values.type),
         items: tools.getItems({ ...values, $name: name }),
-        // required: values.required,
         description: values.description,
-        // rules: values.isArray ? [{
-        //   _index: 0,
-        //   name: '数组容量校验',
-        //   checkType: 'control',
-        //   message: '数组超过最大容量',
-        //   algorithm: 'array-0',
-        //   minItems: values.minItems ? parseInt(values.minItems) : undefined,
-        //   maxItems: values.maxItems ? parseInt(values.maxItems) : undefined,
-        //   exclusiveMinItems: values.exclusiveMinItems,
-        //   exclusiveMaxItems: values.exclusiveMaxItems,
-        // }] : [],
         rules: values.isArray ? [{
           _index: 0,
           name: '数组容量校验(Min)',

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

@@ -88,6 +88,8 @@ export default () => {
 
     React.useEffect(() => {
         if (!editProperties) return;
+        
+        const info = current?.items ? current?.items : current;
 
         setIsArray(!!editProperties.ref.items);
 
@@ -95,11 +97,12 @@ export default () => {
             $name: editProperties.value.$name,
             title: editProperties.value.alias,
             isArray: !!editProperties.ref.items,
-            required: editProperties.required.indexOf(editProperties.value.$name as any) >= 0,
+            required: (info?.required ?? ([] as string[])).indexOf(editProperties.value.$name as any) >= 0,
             description: editProperties.value.detailed,
             type: tools.initType(editProperties.ref),
         })
 
+        // 数组的设置
         if (!!editProperties.ref.items && editProperties.ref.rules) {
             const values = { ...editProperties.ref.rules[0], ...editProperties.ref.rules[1] };
             form.setFieldsValue({
@@ -120,7 +123,7 @@ export default () => {
         return () => {
             setIsChangeType(false);
         }
-    }, [editProperties, form]);
+    }, [editProperties, form, current]);
 
     const submitButton = React.useMemo(() => {
         if (isChangeType) {

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

@@ -11,9 +11,8 @@ export default (props: { index: number }) => {
         e.stopPropagation()
         await controller.wait();
         await controller.pipeline(async s => {
-            debugger;
             if (!s.ruleState.ruleProperties) return;
-
+            
             if (s.ruleState.ruleProperties.ref.items) {
                 s.ruleState.ruleProperties.ref.items.rules?.splice(props.index, 1);
                 s.ruleState.ruleProperties.ref.items.rules = s.ruleState.ruleProperties.ref.items.rules?.slice() ?? [];

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

@@ -43,6 +43,8 @@ export default () => {
     const current = s.propertyTableState.current;
     if (!current) return [];
 
+    const info = current.items ? current.items : current;
+
     const properties = current.type === 'object'
       ? current.properties
       : current.items?.properties
@@ -55,7 +57,7 @@ export default () => {
         return {
           value: { ...e[1], $name: e[0] },
           ref: s.schema.definitions[e[1].$refName],
-          required: current.required || [],
+          required: info.required || [],
         };
       });
   }, [])

package/src/DocumentsList/ui/PageHeader/index.tsx

@@ -113,17 +113,19 @@ export default () => {
                             mode: "multiple"
                         }
                     },
-                    '[beginCreateTime,endCreateTime]': {
-                        key: "[beginCreateTime,endCreateTime]",
-                        name: "[beginCreateTime,endCreateTime]",
+                    createTime: {
                         type: "daterange",
                         title: "创建时间",
+                        'x-props':{
+                            extendsFields: ['beginCreateTime', 'endCreateTime'],
+                        }
                     },
-                    '[beginSendTime,endSendTime]': {
-                        key: "[beginSendTime,endSendTime]",
-                        name: "[beginSendTime,endSendTime]",
+                    sendTime: {
                         type: "daterange",
                         title: "更新时间",
+                        'x-props':{
+                            extendsFields: ['beginSendTime', 'endSendTime'],
+                        }
                     },
                 }
             }
@@ -187,12 +189,12 @@ export default () => {
                         enum: profileEnum,
                         visible: false
                     },
-
-                    '[beginCreateTime,endCreateTime]': {
-                        key: "[beginCreateTime,endCreateTime]",
-                        name: "[beginCreateTime,endCreateTime]",
+                    createTime: {
                         type: "daterange",
                         title: "发布时间",
+                        'x-props':{
+                            extendsFields: ['beginCreateTime', 'endCreateTime'],
+                        }
                     },
                     // '[beginSendTime,endSendTime]': {
                     //     key: "[beginSendTime,endSendTime]",

package/src/DocumentsList/ui/RuleTable/index.tsx

@@ -102,7 +102,7 @@ export default function validaterule(props: any) {
             render: (text: any) => moment(text).format('YYYY-MM-DD HH:mm')
         },
         {
-            title: '最近更新时间',
+            title: '更新时间',
             dataIndex: 'updateAt',
             render: (text: any) => moment(text).format('YYYY-MM-DD HH:mm')
         },

package/src/DocumentsRule/index.md

@@ -1 +1 @@
-# DocumentsRule
+# DocumentsRule