ronds-metadata 1.2.34 → 1.2.35

package/es/comps/FormGenerator/index.js

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2023-02-04 13:45:31
- * @LastEditTime: 2023-04-06 10:38:34
+ * @LastEditTime: 2023-04-18 16:27:45
  */
 import React from 'react';
 import { DndProvider } from 'react-dnd';
@@ -32,19 +32,24 @@ var FormGenerator = function FormGenerator(props) {
 
   var typesRef = React.useRef({});
   React.useEffect(function () {
-    var robot = new FormRobot(); // const name = robot.input('name').label('名称').require().placeholder('请输入名称').valueOf();
-    // const age = robot.input('age').label('年龄').defaultValue(1).valueOf();
-    // const address = robot.textarea('address').label('地址').help('详细地址').valueOf();
-    // const sex = robot.select('sex').label('性别').valueOf();
-    // const birthday = robot.date('birthday').label('出身年月').require().valueOf();
-    // const detail = robot.object([name, age], 'detail').valueOf();
-    // const arr = robot.create([name, age, address, sex, birthday, detail]).grid(2).toString();
+    var robot = new FormRobot();
 
-    var project = robot.select('project').label('归档标签库').valueOf();
-    var group = robot.select('group').label('标签组').valueOf();
-    var label = robot.select('label').label('标签').valueOf();
+    var name = robot.input('name').label('名称').require().placeholder('请输入名称').valueOf();
 
-    var _res = robot.create([project, group, label]).toString();
+    var age = robot.input('age').label('年龄').defaultValue(1).valueOf();
+    var address = robot.textarea('address').showCount().label('地址').help('详细地址').valueOf();
+    var sex = robot.select('sex').label('性别').enum([{
+      key: '1',
+      value: '男'
+    }, {
+      key: '2',
+      value: '女'
+    }]).valueOf();
+
+    var birthday = robot.date('birthday').label('出身年月').require().valueOf();
+
+    var detail = robot.object([name, age], 'detail').valueOf();
+    var arr = robot.create([name, age, address, sex, birthday, detail]).grid(2).toString();
   }, []);
   React.useEffect(function () {
     if (defaultSchema) {

package/es/comps/FormGenerator/transformer.js

@@ -4,7 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /*
  * @Author: wangxian
  * @Date: 2023-02-08 14:45:46
- * @LastEditTime: 2023-04-06 10:38:43
+ * @LastEditTime: 2023-04-18 15:56:59
  */
 import { deepClone } from '../../utils';
 import { basicComps, complexComps, layoutComps } from './settings';
@@ -85,7 +85,7 @@ export var transFG2Schema = function transFG2Schema(nodes, settings, _types, sch
         };
       }
 
-      var _prop = renderProp(nodes[i], settings[nodes[i].id] ? settings[nodes[i].id] : nodes[i].param.setting);
+      var _prop = renderProp(nodes[i], settings && settings[nodes[i].id] ? settings[nodes[i].id] : nodes[i].param.setting);
 
       props.push(_prop);
     }
@@ -105,7 +105,9 @@ export var transFG2Schema = function transFG2Schema(nodes, settings, _types, sch
         var _type = transFG2Schema(__types__[typeKeys[_i]].nodes, // 没有传入内部类的情况 不需要传
         _types && settings["".concat(typeKeys[_i], "_ref")], undefined, "".concat(__types__[typeKeys[_i]].id, "_ref"));
 
-        types.push(_type[0]);
+        if (_type) {
+          types.push(_type[0]);
+        }
       }
     }
 

package/es/comps/MetadataForm/utils.js

@@ -7,7 +7,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-02-24 15:32:47
+ * @LastEditTime: 2023-04-18 17:15:39
  */
 import React from 'react';
 import Input from './DataCell/Input';
@@ -102,9 +102,15 @@ export function assign(pathArr, val, obj) {
   var len = pathArr.length - 1;
   pathArr.reduce(function (cur, key, index) {
     if (index === len) {
-      cur[key] = val;
+      if (cur.hasOwnProperty(key)) {
+        Object.assign(cur[key], val);
+      } else {
+        cur[key] = val;
+      }
     } else {
-      cur[key] = {};
+      if (!cur.hasOwnProperty(key)) {
+        cur[key] = {};
+      }
     }
 
     return cur[key];

package/es/framework/fg/index.d.ts

@@ -161,6 +161,8 @@ export declare class FormRobot implements IFormRobot {
     disabled<T>(this: T): Omit<T, 'disabled'> & IReturnMethod;
     br<T>(this: T): Omit<T, 'br'> & IReturnMethod;
     hidden<T>(this: T): Omit<T, 'hidden'> & IReturnMethod;
+    showCount<T>(this: T): Omit<T, 'showCount'> & IReturnMethod;
+    maxLength<T>(this: T, _value: number): Omit<T, 'maxLength'> & IReturnMethod;
     enum<T>(this: T, _value: {
         key: number | string;
         value: string;

package/es/framework/fg/index.js

@@ -263,14 +263,32 @@ export var FormRobot = /*#__PURE__*/function () {
 
       return new FormRobot(_data);
     } // textarea
-    // select
+
+  }, {
+    key: "showCount",
+    value: function showCount() {
+      var _init = this._hasInitData ? this._data : {};
+
+      var _data = renderSetting(_init, 'text.showCount', true);
+
+      return new FormRobot(_data);
+    }
+  }, {
+    key: "maxLength",
+    value: function maxLength(_value) {
+      var _init = this._hasInitData ? this._data : {};
+
+      var _data = renderSetting(_init, 'text.maxLength', _value);
+
+      return new FormRobot(_data);
+    } // select
 
   }, {
     key: "enum",
     value: function _enum(_value) {
       var _init = this._hasInitData ? this._data : {};
 
-      var _data = renderSetting(_init, 'enum', _value);
+      var _data = renderSetting(_init, 'enum.value', _value);
 
       return new FormRobot(_data);
     } //*********************************提供的扩展规则完善表单__END************************************//

package/es/framework/fg/utils.js

@@ -1,13 +1,13 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 
 /*
  * @Author: wangxian
  * @Date: 2023-03-21 15:44:45
- * @LastEditTime: 2023-04-04 17:21:07
+ * @LastEditTime: 2023-04-18 18:53:34
  */
 import { deepClone } from '../../utils';
 import { basicComps, layoutComps } from './../../comps/FormGenerator/settings/index';
+import { assign } from '../../comps/MetadataForm/utils';
 export var renderBasicFormProps = function renderBasicFormProps(_id, _type) {
   var _basicComps = deepClone(basicComps);
 
@@ -34,9 +34,21 @@ export var renderLayoutFormProps = function renderLayoutFormProps(_arr, _id, _ty
   });
 };
 export var renderSetting = function renderSetting(_init, _type, _value) {
+  var _init$param;
+
+  var _setting = (_init === null || _init === void 0 ? void 0 : (_init$param = _init.param) === null || _init$param === void 0 ? void 0 : _init$param.setting) || {};
+
+  if (_type.indexOf('.') > -1) {
+    var _arr = _type.split('.');
+
+    assign(_arr, _value, _setting);
+  } else {
+    _setting[_type] = _value;
+  }
+
   var _ = _objectSpread(_objectSpread({}, _init), {}, {
     param: _objectSpread(_objectSpread({}, _init === null || _init === void 0 ? void 0 : _init.param), {}, {
-      setting: _objectSpread(_objectSpread({}, _init.param.setting), {}, _defineProperty({}, _type, _value))
+      setting: _objectSpread(_objectSpread({}, _init.param.setting), _setting)
     })
   });
 

package/es/utils.js

@@ -7,7 +7,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author: wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2023-04-13 09:51:21
+ * @LastEditTime: 2023-04-20 15:15:56
  */
 import saveAs from 'file-saver';
 import { asBlob } from 'html-docx-js-typescript';
@@ -201,6 +201,27 @@ function _handleMd2Doc() {
         switch (_context.prev = _context.next) {
           case 0:
             md = new MarkdownIt();
+
+            md.renderer.rules.image = function (tokens, index, options, env, self) {
+              var token = tokens[index];
+
+              if (!token || !token.attrGet('src')) {
+                // 如果 token 不存在，或者缺少必要的属性，则直接返回空字符串
+                return '';
+              }
+
+              var src = token.attrGet('src');
+              var width = '900'; // 自定义宽度
+
+              var height = 'auto'; // 自适应高度
+              // 添加自定义宽高属性
+
+              token.attrSet('width', width);
+              token.attrSet('height', height); // 渲染图片标签
+
+              return self.renderToken(tokens, index, options);
+            };
+
             html = md.render(mdText);
             opt = {
               margin: {
@@ -208,14 +229,14 @@ function _handleMd2Doc() {
               },
               orientation: 'landscape'
             };
-            _context.next = 5;
+            _context.next = 6;
             return asBlob(html, opt);
 
-          case 5:
+          case 6:
             blob = _context.sent;
             saveAs(blob, "".concat(fileName, ".doc"));
 
-          case 7:
+          case 8:
           case "end":
             return _context.stop();
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.2.34",
+  "version": "1.2.35",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",