jufubao-base 1.0.9 → 1.0.10

package/commands.js

@@ -0,0 +1,23 @@
+'use strict';
+
+const path = require('path');
+const clog = require('./build/clog');
+const fileHelper = require('./build/fileHepler');
+const fromBuildPath = path.resolve('./node_modules/gxd-uni-commands/build');
+const toBuildPath = path.resolve('./build');
+const fromCommandsPath = path.resolve('./node_modules/gxd-uni-commands/commands');
+const toCommandsPath = path.resolve('./commands');
+const utils = require('./build/lib/utils');
+
+const init = ()=>{
+  utils.logsLine(clog, 'start');
+  fileHelper.copySync(fromBuildPath, toBuildPath);
+  fileHelper.copySync(fromCommandsPath, toCommandsPath);
+  clog(`拷贝命令行操作成功，目录:${toBuildPath}`, 'green');
+  clog(`拷贝命令行操作成功，目录:${toCommandsPath}`, 'green');
+  utils.logsLine(clog);
+};
+
+init();
+
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-base",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "private": false,
   "description": "聚福宝业务组件基础插件包",
   "main": "index.js",
@@ -9,6 +9,13 @@
     "test": "cross-env type=test cross-env NODE_ENV=development UNI_PLATFORM=h5 npm run init.entry && npm run dev:h5",
     "dev": "cross-env type=test cross-env NODE_ENV=development UNI_PLATFORM=h5 npm run init.entry &&  npm run dev:h5",
     "build": "cross-env type=build cross-env NODE_ENV=production UNI_PLATFORM=h5 npm run init.entry  && npm run build:h5",
+    "update": "node ./commands/update.pack.js",
+    "create": "node ./commands/create.pack.js",
+    "commands": "npm i && node ./commands.js",
+    "release": "node ./commands/npmignore && npm publish",
+    "upload.bus.static": "node ./build/commands/upload.business.static.js",
+    "init.entry": "node ./build/commands/entry.init.js",
+    "init": "node ./build/commands/copy.init.js",
     "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
     "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch --minimize",
     "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
@@ -16,18 +23,11 @@
     "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build  --minimize",
     "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
     "init.commands": "cp -rf ./node_modules/gxd-uni-commands/build ./",
-    "init.entry": "node ./build/commands/entry.init.js",
-    "init": "node ./build/commands/copy.init.js",
+    "init.editx": "node ./build/commands/editx.init.js",
     "copy": "cross-env isOpenDir=true node build/commands/copy.js",
     "oss": "cross-env bucket=xxx region=oss-cn-beijing name=基础项目 node ./build/commands/oss.js",
     "oss.dev": "cross-env bucket=dev-xxx region=oss-cn-qingdao name=基础项目 node ./build/commands/oss.js",
-    "oss.test": "cross-env bucket=test-xxx region=oss-cn-qingdao name=基础项目 node ./build/commands/oss.js",
-    "coder": "node ./build/commands/coder.js",
-    "coder:page": "node ./build/commands/coder.page.js",
-    "init.editx": "node ./build/commands/editx.init.js",
-    "publish": "node ./commands/npmignore && npm publish",
-    "update.package": "node ./commands/update.pack.js",
-    "create.package": "node ./commands/create.pack.js"
+    "oss.test": "cross-env bucket=test-xxx region=oss-cn-qingdao name=基础项目 node ./build/commands/oss.js"
   },
   "dependencies": {
     "@dcloudio/uni-app-plus": "2.0.1-33920220208001",
@@ -48,8 +48,8 @@
     "color": "^3.1.3",
     "core-js": "^2.6.5",
     "flyio": "^0.6.2",
-    "gxd-uni-commands": "1.0.21",
-    "gxd-uni-library": "1.0.34",
+    "gxd-uni-commands": "1.0.29",
+    "gxd-uni-library": "1.0.39",
     "jweixin-module": "^1.6.0",
     "md5": "^2.3.0",
     "qs": "^6.9.6",
@@ -105,7 +105,9 @@
     "art-template": "^4.13.2",
     "mockjs": "1.0.1-beta3",
     "vue-baidu-map": "^0.21.22",
-    "copy-webpack-plugin": "5.1.2"
+    "copy-webpack-plugin": "5.1.2",
+    "copy-dir": "^1.3.0",
+    "md5": "^2.3.0"
   },
   "browserslist": [
     "Android >= 4",

package/src/components/JfbBaseBlock/Attr.js

@@ -1,48 +1,44 @@
 'use strict';
 
-export default [
-  {
-    label: '颜色:', //label
-    ele: 'el-input', //package 名称
-    type: 'text',
-    valueKey: 'color', //form[valueKey]
-    value: '#fff', //v-model
-    placeholder: '请输入占位框颜色',
-    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-    disabled: true,
-    rules: [
-      {
-        required: true,
-        message: '请输入占位框颜色',
-        trigger: 'blur'
-      },
-    ]
-  },
-  {
-    label: '高度:', //label
-    ele: 'el-input', //package 名称
-    type: 'number',
-    valueKey: 'height', //form[valueKey]
-    value: 1, //v-model
-    placeholder: '请输入占位框高度，单位像素',
-    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
-    disabled: true,
-    rules: [
-      {
-        required: true,
-        message: '请输入占位框高度',
-        trigger: 'blur'
-      },
-    ]
-  },
-  {
-    label: '设置引用:', //label
-    ele: 'xd-switch', //package 名称
-    valueKey: 'is_reference', //form[valueKey]
-    value: false, //v-model
-    list: ['', ''], //左右文本
-    showTips: false, //是否显示文本
-    disabled: true,
-    backValueType: 2,
-  },
-]
+export default {
+  style: [],
+  advanced: [],
+  content: [
+    {
+      label: '背景颜色:', //label
+      ele: 'xd-board-color', //package 名称
+      valueKey: 'bgcolor', //form[valueKey]
+      value: '', //v-model
+      placeholder: '请输入占位框背景颜色',
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      rules: [
+        {
+          required: true,
+          message: '请输入占位框背景颜色',
+          trigger: 'blur'
+        },
+      ]
+    },
+    {
+      label: '高度:', //label
+      ele: 'el-input', //package 名称
+      type: 'number',
+      valueKey: 'height', //form[valueKey]
+      value: null, //v-model
+      placeholder: '请输入占位框高度，单位像素，默认：10px',
+      classNmae: 'input80', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+      rules: [
+        {
+          required: true,
+          message: '请输入占位框高度',
+          trigger: 'blur'
+        },
+      ]
+    },
+    {
+      label: '', //label
+      ele: 'slot', //package 名称
+      slot: 'is_reference',
+    },
+  ],
+};

package/src/components/JfbBaseBlock/JfbBaseBlock.vue

@@ -14,7 +14,7 @@
     </view>
     <!-- #endif -->
     <view class="jfb-base-block__body">
-      <view :style="{height: height * 2 + 'rpx', background: color}"></view>
+      <view :style="{height: height * 2 + 'rpx', background: bgcolor}"></view>
     </view>
   </view>
 </template>
@@ -23,6 +23,8 @@
   import XdFontIcon from "@/components/XdFontIcon/XdFontIcon";
   import { jfbRootExec } from "@/utils/xd.event";
   import JfbBaseBlockMixin from "./JfbBaseBlockMixin";
+  import {getContainerPropsValue} from "@/utils/xd.base";
+  
   export default {
     name: "JfbBaseBlock",
     components: {
@@ -33,51 +35,34 @@
     ],
     data() {
       return {
-        height: 20,
-        color: '#fff'
+        height: 10,
+        bgcolor: '#fff'
+      }
+    },
+    watch: {
+      container(value) {
+        this.init(value)
       }
     },
     created() {
+      this.init(this.container);
     },
     methods: {
+      init(value) {
+        let bgcolor = getContainerPropsValue(value, 'content.bgcolor');
+        let height = getContainerPropsValue(value, 'content.height');
+        if (bgcolor) this.bgcolor = bgcolor;
+        if (height) this.height = height;
+      },
     }
   }
 
 </script>
 
 <style scoped lang="less">
-  .jfb-base-block {
-    border: 1px dashed rgba(0,0,0,0);
-    box-sizing: border-box;
-
-    &.editx {
-      position: relative;
-      border: 1px dashed red;
-      box-sizing: border-box;
-    }
-
-    &__edit {
-      position: absolute;
-      right: unit(0, rpx);
-      top: unit(-52, rpx);
-      height: unit(50, rpx);
-      line-height: unit(50, rpx);
-      padding: 0 unit(20,rpx);
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      background: rgba(0,0,0,.6);
-      border-radius: unit(10,rpx);
-      box-shadow: 0 0 10px rbga(0,0,0,0.3);
-      color: #fff;
-      font-size: unit(22,rpx);
+  @import "./JfbBaseBlockLess.less";
 
-
-      &.editx {
-        box-sizing: border-box;
-
-      }
-    }
+  .jfb-base-block {
 
     &__body{
 

package/src/components/JfbBaseBlock/JfbBaseBlockLess.less

@@ -0,0 +1,59 @@
+/**
+* @desc 获取绝对路径完整地址
+* @param @path
+**/
+//例如：https://image.jufubao.cn/20220501010108/image/bg/default_gonghui_bg.png
+@basePath: 'business/';
+@doMain: '//sandbox-img.jufubao.cn/';
+
+.getBusinessImageUrl(@path, @size: 'size8') {
+  @url: "@{doMain}@{basePath}@{path}?x-oss-process=style/@{size}";
+  background-image: url(@url);
+}
+
+.getBusinessImageUrl('base_qr.png');
+
+//start
+.jfb-base-block {
+  border: 1px dashed rgba(0, 0, 0, 0);
+  box-sizing: border-box;
+
+  &.editx {
+    position: relative;
+    border: 1px dashed blue;
+    box-sizing: border-box;
+
+  }
+
+  &:hover {
+    border: 1px dashed blue;
+  }
+
+
+  &__edit {
+    cursor: pointer;
+    position: absolute;
+    right: unit(0, rpx);
+    top: unit(-52, rpx);
+    height: unit(50, rpx);
+    line-height: unit(50, rpx);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(0, 0, 0, .6);
+    border-radius: unit(10, rpx);
+    box-shadow: 0 0 10px rbga(0, 0, 0, 0.3);
+    color: #fff;
+    font-size: unit(22, rpx);
+
+    &-icon{
+      padding: 0 unit(20, rpx);
+    }
+
+    &.editx {
+      box-sizing: border-box;
+
+    }
+  }
+}
+//end

package/src/components/JfbBaseBlock/JfbBaseBlockMixin.js

@@ -4,52 +4,89 @@
 import Attr from "./Attr";
 //@EndAttrImport
 
+import {getContainerPropsValue} from "@/utils/xd.base";
 export default {
   props: {
+    /**
+     * @description 插件在页面中到唯一ID
+     */
     cid:{
       type: null|String|Number,
       default: null,
     },
+    /**
+     * @description 业务插件相关数据集合
+     */
+    container:{
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    /**
+     * @description 页面框架属性
+     */
     layoutInfo: {
       type: Object,
       default() {
         return {}
       }
     },
-    pageAtrr: {
+    /**
+     * @description 页面属性
+     */
+    pageAttr: {
       type: Object,
       default() {
         return {}
       }
     },
-    componentAtrr: {
+    /**
+     * @description 业务插件元素属性（插件管理时候填写属性）
+     */
+    componentAttr: {
       type: Object|Array,
       default() {
         return {}
       }
     },
-    appAtrr: {
+    /**
+     * @description 业务插件所属插件库属性（业务插件库）
+     */
+    appAttr: {
       type: Object|Array,
       default() {
         return {}
       }
     },
+    /**
+     * @description 项目配置
+     */
     settings: {
       type: Object,
       default() {
         return {}
       }
+    },
+    /**
+     * @description 业务插件库所用风格属性
+     */
+    styles: {
+      type: Object || null,
+      default() {
+        return {}
+      }
     }
   },
   data() {
     return {
       containerId: null, //容器ID
       //#ifdef H5
-
+      
       //@AttrData
       Attr, //对外开发编辑属性
       //@EndAttrData
-
+      
       active: false, //是否选择当前状态
       isEditx: true, //当前为Editx模式
       edit: false, //是否开启编辑模式
@@ -63,13 +100,19 @@ export default {
     } else {
       this.containerId = this.$xdUniHelper.randomChar(20);
     }
-    console.log('created',this.containerId, this.cid)
 
     //#ifdef H5
     //监听用户点击状态显示虚框
     XdBus.addEvent('select', ({containerId}) => {
       this.active = containerId === this.containerId;
     });
+
+    //业务面板选中插件操作
+    XdBus.addEvent('onBoardSelect', ({containerId}) => {
+      if (containerId === this.containerId) {
+        this.handleSelect()
+      }
+    });
     // #endif
   },
   methods: {
@@ -88,7 +131,8 @@ export default {
       XdBus.send('onDelPackage', {
         containerId: this.containerId,
         componentAtrr: this.componentAtrr,
-        cid: this.cid
+        cid: this.cid,
+        container: this.container
       })
     },
     //#endif
@@ -100,12 +144,25 @@ export default {
       //#ifdef H5
       if (this.active) return;
       this.active = true;
-      console.log('handleSelect', Attr);
+      let AttrObj = this.$xdUniHelper.checkVarType(Attr) === 'object' ?
+        Attr: { style: [], advanced: [], content: []};
+      console.log('handleSelect.Attr', AttrObj);
+
+      //设置已绑定数据
+      Object.keys(AttrObj).map(type=>{
+        AttrObj[type].map(item=>{
+           item.value = getContainerPropsValue(this.container, `${type}.${item.valueKey}`, item.value);
+        })
+      });
+
+      //发送点击组件事件
       XdBus.send('onSelectPackage', {
         containerId: this.containerId,
-        Attr: Attr,
+        Attr: AttrObj,
+        container: this.container
       });
 
+      //绑定选中插件事件
       XdBus.message('select', {
         containerId: this.containerId,
       })

package/src/components/JfbBaseCard/Api.js

@@ -0,0 +1,34 @@
+'use strict';
+
+/**
+ * @description API模型
+ * 建议：Ffff=>模块  Xxxx=>自定义名字
+ * 获取单记录(getByIdFfffXxxx)
+ * 获取列表记录(getByListFfffXxxx)
+ * 添加列表记录(addFfffXxxxx)
+ * 删除列表记录(removeFfffXxxxx|deleteFfffXxxx)
+ * 更新列表记录(updateFfffXxxxx)
+ * @type {*[]}
+ */
+module.exports = [
+  {
+    mapFnName: 'getListCardBind', //自定义方法名字（必选）
+    isRule: false,
+    title: '获得绑定卡',
+    prefix: 'list',
+    path: '/card/v1/card-bind/list-bind-card',
+    params: {},
+    disabled: true,
+  },
+  {
+    mapFnName: 'loginCardBind', //自定义方法名字（必选）
+    isRule: false,
+    title: '登录卡',
+    prefix: 'login',
+    path: '/card/v1/card-bind/login-card',
+    data: {
+      card_number: ['卡号', 'String', '必选'],
+    },
+    disabled: true,
+  },
+];

package/src/components/JfbBaseCard/Attr.js

@@ -0,0 +1,150 @@
+'use strict';
+
+export default [
+  //文本信息
+  {
+    label: '标题名称:', //label
+    ele: 'el-input', //package 名称
+    type: 'text',
+    valueKey: 'title', //form[valueKey]
+    value: '', //v-model
+    placeholder: '请输入标题名称',
+    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+    disabled: true,
+    rules: [
+      {
+        required: true,
+        type: 'url',
+        message: '请输入域名地址',
+        trigger: 'blur'
+      },
+    ]
+  },
+
+  //远程获取内容选择
+  {
+    label: '跳转路径:', //label
+    ele: 'xd-select-list', //package 名称
+    valueKey: 'jumpToLink', //form[valueKey]
+    value: '', //v-model
+    placeholder: '请选择加盟商',
+    multiple: false, //多选
+    collapseTags: false,
+    remoteApi: '/api/editx/pages',
+    remote: true,
+  },
+
+  //本地固定内容选择
+  {
+    label: '选择内容:', //label
+    ele: 'xd-select-list', //package 名称
+    valueKey: 'select', //form[valueKey]
+    value: '', //v-model
+    placeholder: '请选择选择内容',
+    multiple: false, //多选
+    remote: false,
+    list: [
+      {"label": "订单详情", "value": '/main/order/order'},
+      {"label": "购物车详情", "value": '/main/cart/cart'},
+      {"label": "商品详情", "value": '/main/product/product'},
+      {"label": "商品分类", "value": '/main/producttype/producttype'},
+    ],
+  },
+
+  //本地固定单选选择
+  {
+    label: '单选列表（固定）:', //label
+    ele: 'xd-radio', //package 名称
+    valueKey: 'radio_status_list', //form[valueKey]
+    value: 6, //v-model
+    disabled: true,
+    rules: [
+      {required: true, message: '请选择', trigger: ['blur', 'change']}
+    ],
+    list: [
+      {"label": "万利达集团", "value": 4},
+      {"label": "中国联通", "value": 5},
+      {"label": "中国移动", "value": 6},
+      {"label": "味多美", "value": 7},
+    ]
+  },
+
+  //远程固定单选选择
+  {
+    label: '单选列表（固定）:', //label
+    ele: 'xd-radio', //package 名称
+    valueKey: 'radio_status_list', //form[valueKey]
+    value: 6, //v-model
+    disabled: false,
+    remoteApi: '/api/editx/pages',
+    remote: true,
+    rules: [
+      {required: true, message: '请选择', trigger: ['blur', 'change']}
+    ],
+  },
+
+  //本地固定多选选择
+  {
+    label: '多选列表（固定）:', //label
+    ele: 'xd-check', //package 名称
+    valueKey: 'xd-check_list', //form[valueKey]
+    value: 6, //v-model
+    disabled: true,
+    rules: [
+      {required: true, message: '请选择', trigger: ['blur', 'change']}
+    ],
+    list: [
+      {"label": "万利达集团", "value": 4},
+      {"label": "中国联通", "value": 5},
+      {"label": "中国移动", "value": 6},
+      {"label": "味多美", "value": 7},
+    ]
+  },
+
+  //远程多选选选择
+  {
+    label: '多选列表:', //label
+    ele: 'xd-check', //package 名称
+    valueKey: 'xd-check_remote-list', //form[valueKey]
+    value: 6, //v-model
+    disabled: false,
+    remoteApi: '/api/editx/pages',
+    remote: true,
+    rules: [
+      {required: true, message: '请选择', trigger: ['blur', 'change']}
+    ],
+  },
+
+  //状态(二选一)单选选择
+  {
+    label: '状态(二选一):', //label
+    ele: 'xd-radio-status', //package 名称
+    valueKey: 'radio_status', //form[valueKey]
+    value: 'Y', //v-model
+    isall: true,
+    disabled: true,
+    backValueType: '', //返回值类型 1=>返回（Y,N）2=> [true|false] 3=>[1,0] 4=>[1,2]
+    placeholder: '请选择',
+    list: 'status', //status=>状态  best=>推荐  associate=>关联 yes=>是否 open=> 是否开启  check=>审核
+  },
+
+  //文本信息
+  {
+    label: '标题名称:', //label
+    ele: 'el-input', //package 名称
+    type: 'text',
+    valueKey: 'title', //form[valueKey]
+    value: '', //v-model
+    placeholder: '请输入标题名称',
+    classNmae: 'input40', //样式名称 //input100,input80,input70,input60,input50,input40,input30,input20,
+    disabled: true,
+    rules: [
+      {
+        required: true,
+        type: 'url',
+        message: '请输入域名地址',
+        trigger: 'blur'
+      },
+    ]
+  },
+]