vap1 0.6.0 → 0.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -79,7 +79,7 @@ var _UInfo = function (props) {
79
79
  if (state.isGroup)
80
80
  return renderGroup(props, props.fields, state, data);
81
81
  // @ts-ignore
82
- return react_1.default.createElement(UDescriptions_1.UDescriptions, { labelWidth: state.maxLabel > 20 ? 20 : state.maxLabel, column: state.cols, theme: props.theme, hideBorder: props.hideBorder, className: props.className }, renderFields(props.fields, state, data));
82
+ return react_1.default.createElement(UDescriptions_1.UDescriptions, { labelWidth: state.maxLabel > 20 ? 20 : state.maxLabel, column: state.cols, style: props.style, theme: props.theme, hideBorder: props.hideBorder, className: props.className }, renderFields(props.fields, state, data));
83
83
  };
84
84
  var UInfo = function (props) { return react_1.default.createElement(FormWrapper_1.FormWrapper, __assign({ isInfo: true }, props),
85
85
  react_1.default.createElement(_UInfo, __assign({}, props))); };
@@ -97,9 +97,9 @@ var useAjaxQuery = function (options) {
97
97
  loading: config.autoLoad != undefined ? true : false,
98
98
  data: config.defaultValue,
99
99
  param: lodash_1.default.isArray(config.autoLoad) ? config.autoLoad : []
100
- }), 2), _b = _a[0], loading = _b.loading, data = _b.data, param = _b.param, setData = _a[1];
100
+ }), 2), _b = _a[0], loading = _b.loading, data = _b.data, param = _b.param, setState = _a[1];
101
101
  var isFirstMount = (0, useFirstMountState_1.useFirstMountState)();
102
- var _fetch = function () {
102
+ var query = (0, react_1.useCallback)(function () {
103
103
  var args = [];
104
104
  for (var _i = 0; _i < arguments.length; _i++) {
105
105
  args[_i] = arguments[_i];
@@ -110,16 +110,18 @@ var useAjaxQuery = function (options) {
110
110
  switch (_a.label) {
111
111
  case 0:
112
112
  _a.trys.push([0, 2, , 3]);
113
- setData(function (prev) { return (__assign(__assign({}, prev), { loading: true })); });
113
+ setState(function (prev) {
114
+ return (__assign(__assign({}, prev), { loading: true }));
115
+ });
114
116
  return [4 /*yield*/, config.fn.apply(config, __spreadArray([], __read(args), false))];
115
117
  case 1:
116
118
  response = _a.sent();
117
119
  if (config.valueHander) {
118
120
  if (lodash_1.default.isString(config.valueHander)) {
119
- setData({ loading: false, param: args, data: lodash_1.default.get(response, config.valueHander) });
121
+ setState({ loading: false, param: args, data: lodash_1.default.get(response, config.valueHander) });
120
122
  }
121
123
  else {
122
- setData({ loading: false, param: args, data: config.valueHander.apply(config, __spreadArray([response], __read(args), false)) });
124
+ setState({ loading: false, param: args, data: config.valueHander.apply(config, __spreadArray([response], __read(args), false)) });
123
125
  }
124
126
  return [2 /*return*/];
125
127
  }
@@ -129,40 +131,35 @@ var useAjaxQuery = function (options) {
129
131
  ) {
130
132
  antd_1.message.error(response.message);
131
133
  }
132
- setData(function (prev) { return (__assign(__assign({}, prev), { loading: false })); });
134
+ setState(function (prev) { return (__assign(__assign({}, prev), { loading: false })); });
133
135
  return [2 /*return*/];
134
136
  }
135
137
  if (lodash_1.default.has(response, 'data')) {
136
- setData({ loading: false, param: args, data: response.data });
138
+ setState({ loading: false, param: args, data: response.data });
137
139
  }
138
140
  else if (lodash_1.default.has(response, 'list')) {
139
- setData({ loading: false, param: args, data: response.list });
141
+ setState({ loading: false, param: args, data: response.list });
140
142
  }
141
143
  else {
142
- setData({ loading: false, param: args, data: response });
144
+ setState({ loading: false, param: args, data: response });
143
145
  }
144
146
  return [3 /*break*/, 3];
145
147
  case 2:
146
148
  err_1 = _a.sent();
147
149
  console.error(err_1);
148
- setData(function (prev) { return (__assign(__assign({}, prev), { loading: false })); });
150
+ setState(function (prev) { return (__assign(__assign({}, prev), { loading: false })); });
149
151
  return [3 /*break*/, 3];
150
152
  case 3: return [2 /*return*/];
151
153
  }
152
154
  });
153
155
  });
154
- };
155
- if (isFirstMount && config.autoLoad) {
156
- var params = lodash_1.default.isArray(config.autoLoad) ? config.autoLoad : [];
157
- _fetch.apply(void 0, __spreadArray([], __read(params), false));
158
- }
159
- var query = function () {
160
- var args = [];
161
- for (var _i = 0; _i < arguments.length; _i++) {
162
- args[_i] = arguments[_i];
156
+ }, []);
157
+ (0, react_1.useEffect)(function () {
158
+ if (isFirstMount && config.autoLoad) {
159
+ var params = lodash_1.default.isArray(config.autoLoad) ? config.autoLoad : [];
160
+ query.apply(void 0, __spreadArray([], __read(params), false));
163
161
  }
164
- _fetch.apply(void 0, __spreadArray([], __read(args), false));
165
- };
162
+ }, []);
166
163
  return [loading, data, query, param];
167
164
  };
168
165
  exports.useAjaxQuery = useAjaxQuery;
package/package.json CHANGED
@@ -1 +1 @@
1
- {"name":"vap1","version":"0.6.0","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
1
+ {"name":"vap1","version":"0.6.1","description":"vap1, Both support MicroService and SAP FrameWork, Support IE>9","main":"index.js","author":"Xiang da","license":"ISC"}
@@ -360,3 +360,4 @@ export declare const ratio: (count: number, total: number) => number;
360
360
  * rise(80, 100) // => -0.2
361
361
  */
362
362
  export declare const rise: (current: number, prev: number) => number;
363
+ export declare const txtWidth: (txt: string, enDiff?: number) => number;
@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
28
28
  return (mod && mod.__esModule) ? mod : { "default": mod };
29
29
  };
30
30
  Object.defineProperty(exports, "__esModule", { value: true });
31
- exports.rise = exports.ratio = exports.getFileType = exports.getSuffix = exports.getFileName = exports.getFloat = exports.getInteger = exports.getBoolean = exports.getString = exports.copy = exports.px = exports.replaceAll = exports.className = exports.searchText = exports.spellMatch = exports.trimLower = exports.isBoolean = exports.isBTCAddress = exports.uuid = exports.genKey = exports.isId = exports.isId15 = exports.isId18 = exports.REG_ID_15 = exports.REG_ID_18 = exports.isIP = exports.isIP6 = exports.isIP4 = exports.isPhone = exports.isMAC = exports.isURL = exports.isEmail = exports.isTelePhone = exports.isMobilePhone = exports.REG_PORT = exports.REG_URL = exports.REG_IPV6 = exports.REG_IPV4 = exports.LETTERS = exports.REG_TELEPHONE = exports.REG_PHONE = exports.REG_EMAIL = void 0;
31
+ exports.txtWidth = exports.rise = exports.ratio = exports.getFileType = exports.getSuffix = exports.getFileName = exports.getFloat = exports.getInteger = exports.getBoolean = exports.getString = exports.copy = exports.px = exports.replaceAll = exports.className = exports.searchText = exports.spellMatch = exports.trimLower = exports.isBoolean = exports.isBTCAddress = exports.uuid = exports.genKey = exports.isId = exports.isId15 = exports.isId18 = exports.REG_ID_15 = exports.REG_ID_18 = exports.isIP = exports.isIP6 = exports.isIP4 = exports.isPhone = exports.isMAC = exports.isURL = exports.isEmail = exports.isTelePhone = exports.isMobilePhone = exports.REG_PORT = exports.REG_URL = exports.REG_IPV6 = exports.REG_IPV4 = exports.LETTERS = exports.REG_TELEPHONE = exports.REG_PHONE = exports.REG_EMAIL = void 0;
32
32
  var lodash_1 = __importDefault(require("lodash"));
33
33
  var dayjs_1 = __importDefault(require("dayjs"));
34
34
  var _Support_1 = require("./_Support");
@@ -662,3 +662,18 @@ var rise = function (current, prev) {
662
662
  return (current - prev) / prev;
663
663
  };
664
664
  exports.rise = rise;
665
+ var txtWidth = function (txt, enDiff) {
666
+ if (enDiff === void 0) { enDiff = 0.6; }
667
+ var len = 0;
668
+ for (var i = 0; i < txt.length; i++) {
669
+ var char = txt.charCodeAt(i);
670
+ if (char < 127) {
671
+ len += enDiff;
672
+ }
673
+ else {
674
+ len += 1;
675
+ }
676
+ }
677
+ return Math.ceil(len);
678
+ };
679
+ exports.txtWidth = txtWidth;