plugin.xml

@@ -3,15 +3,12 @@
     <id>com.fr.solution.plugin.db.redis.v10</id>
     <name><![CDATA[Redis数据集]]></name>
     <active>yes</active>
-    <version>7.4.6</version>
+    <version>7.4.1</version>
     <env-version>10.0</env-version>
     <jartime>2020-01-20</jartime>
     <vendor>richie</vendor>
     <description><![CDATA[可以连接Redis数据库，支持哈希表、列表、集合以及有序集合]]></description>
     <change-notes><![CDATA[
-        [2021-03-18]适配最新的数据连接锁特性。<br/>
-        [2021-02-04]更换平台redis图片。<br/>
-        [2020-12-29]解决平台数据集参数公式识别错误。<br/>
         [2020-11-16]修复保存数据连接后平台测试连接报错的问题。<br/>
         [2020-10-28]支持单一主机的集群模式连接选项。<br/>
         [2020-07-07]修复了数据集没有随着参数的变化而变化的问题。<br>

src/main/java/com/fr/plugin/db/redis/RedisUniversalConnectionImpl.java

@@ -27,7 +27,7 @@ public class RedisUniversalConnectionImpl extends AbstractUniversalConnectionPro
 
     @Override
     public String iconPathForConnection() {
-        return "/com/fr/plugin/db/redis/images/redis.jpg";
+        return "/com/fr/plugin/db/redis/images/redis.png";
     }
 
     @Override

src/main/java/com/fr/plugin/db/redis/bean/ParameterBean.java

@@ -1,9 +1,7 @@
 package com.fr.plugin.db.redis.bean;
 
 import com.fanruan.api.cal.ParameterKit;
-import com.fanruan.api.util.GeneralKit;
 import com.fanruan.api.util.StringKit;
-import com.fr.general.GeneralUtils;
 import com.fr.stable.ParameterProvider;
 
 import java.util.ArrayList;
@@ -63,7 +61,7 @@ public class ParameterBean {
 
     public static ParameterBean createBean(ParameterProvider parameterProvider) {
         if (parameterProvider.getValue() != null) {
-            return new ParameterBean(parameterProvider.getValue().getClass().getSimpleName(), parameterProvider.getName(), GeneralKit.objectToString(parameterProvider.getValue()));
+            return new ParameterBean(parameterProvider.getValue().getClass().getSimpleName(), parameterProvider.getName(), parameterProvider.valueToString());
         } else {
             return new ParameterBean(String.class.getSimpleName(), parameterProvider.getName(), StringKit.EMPTY);
         }

src/web/src/index.ts

@@ -3,28 +3,30 @@ import { RedisEdit } from './modules/app.edit';
 import { RedisDataset } from './modules/app.dataset';
 import { RedisProgram } from './modules/app.program';
 
-BI.config('dec.connection.provider.datebase', provider => {
-    provider.registerDatabaseType({
-        text: 'Redis',
-        databaseType: 'Redis',
-        iconUrl: 'com/fr/plugin/db/redis/images/redis.jpg',
-        edit: RedisEdit.xtype,
-        show: RedisShow.xtype,
+BI.DOM.ready(() => {
+    BI.config('dec.connection.provider.datebase', provider => {
+        provider.registerDatabaseType({
+            text: 'Redis',
+            databaseType: 'Redis',
+            iconUrl: 'com/fr/plugin/db/redis/images/redis.png',
+            edit: RedisEdit.xtype,
+            show: RedisShow.xtype,
+        });
     });
-});
 
-BI.config('dec.provider.data.set', provider => {
-    provider.registerDataSetType({
-        value: 'Redis',
-        text: 'Redis数据集',
-        cardType: RedisDataset.xtype,
+    BI.config('dec.provider.data.set', provider => {
+        provider.registerDataSetType({
+            value: 'Redis',
+            text: 'Redis数据集',
+            cardType: RedisDataset.xtype,
+        });
     });
-});
 
-BI.config('dec.provider.data.set', provider => {
-    provider.registerDataSetType({
-        value: 'RedisScript',
-        text: 'Redis程序数据集',
-        cardType: RedisProgram.xtype,
+    BI.config('dec.provider.data.set', provider => {
+        provider.registerDataSetType({
+            value: 'RedisScript',
+            text: 'Redis程序数据集',
+            cardType: RedisProgram.xtype,
+        });
     });
 });

src/web/src/less/background.less

@@ -1,2 +1,2 @@
-@import "@fui/core/src/less/image.less";
+@import "../../node_modules/@fui/core/src/less/image.less";
 @import "./lib/background.less";

src/web/src/less/font.less

@@ -1,19 +1,6 @@
+@import "../../node_modules/@fui/core/src/less/resource/font.less";
 @import "./lib/font.less";
 
-.font(@class, @content, @color: @color-bi-font-native) {
-  @fc: "\@{content}";
-  .@{class} {
-    & .b-font:before {
-      content: @fc;
-      color: @color;
-    }
-    &.disabled .b-font:before {
-      content: @fc;
-      color: @color;
-    }
-  }
-}
-
 .font(redis-refresh-font, @font-redis-refresh);
 .font(input-string-font, @font-input-string);
 .font(input-formula-font, @font-input-formula);

src/web/src/less/utils.less

@@ -1 +1 @@
-@import '@fui/core/src/less/visual.less';
+@import '../../node_modules/@fui/core/src/less/visual.less';

src/web/src/modules/app.less

@@ -1,5 +1,4 @@
 @import '../less/index.less';
-@import "@fui/core/src/less/lib/colors.less";
 
 .param-table {
     .dec-dynamic-date-combo .even-row {

src/web/webpack/webpack.common.js

@@ -59,7 +59,6 @@ module.exports = {
                     {
                         loader: 'less-loader',
                         options: {
-                            paths: [dirs.NODE_MODULES],
                             relativeUrls: false
                         }
                     }