瀏覽代碼

草图一些调整

laiguoran 5 年之前
父節點
當前提交
ed7c9df889
共有 2 個文件被更改,包括 8 次插入5 次删除
  1. 7 4
      app/public/js/stage.js
  2. 1 1
      sql/update.sql

+ 7 - 4
app/public/js/stage.js

@@ -2406,6 +2406,9 @@ $(document).ready(() => {
         }
         _initImageRela() {
             const self = this;
+            $('#edit-detail').click(function () {
+                loadImageItem();
+            });
             function setdraggrable(){
                 $( ".img-item" ).draggable({ containment: "parent" },{stop: function( event, ui ) {
                     }}).resizable({ containment: "parent" },{ handles: 'n, e, s, w, ne, se, sw, nw' },{ maxWidth: parseFloat($('#imgwidth').val())},{maxHeight: parseFloat($('#imgheight').val())},{
@@ -2451,7 +2454,7 @@ $(document).ready(() => {
                 $(this).parent().remove();
             };
             // 加载草图组成
-            $('#edit-img').on('show.bs.modal', function () {
+            const loadImageItem = function () {
                 self.updateImageData = null;
                 const data = SpreadJsObj.getSelectObject(self.spread.getActiveSheet());
                 const items = data.calc_img_org ? JSON.parse(data.calc_img_org) : [];
@@ -2468,7 +2471,7 @@ $(document).ready(() => {
                 $('.img-view').html(html.join(''));
                 $('.img-bar').click(removeImageItem);
                 setdraggrable();
-            });
+            };
             // 上传图片
             $('#upload-img').click(function () {
                 $('#upload-img-file').trigger('click');
@@ -2682,8 +2685,8 @@ $(document).ready(() => {
             $('#calc-img').attr('src', calcImgSrc);
             $('#view-calc-img').attr('src', calcImgSrc);
 
-            const calcImgRemark = data && data.calc_img_remark || ''
-            $('#view-calc-remark').text(calcImgRemark)
+            const calcImgRemark = data && data.calc_img_remark || '';
+            $('#view-calc-remark').text(calcImgRemark);
             $("#view-calc-remark").attr('readonly', true);
             // 处理 编辑 -> 添加草图中textarea多余的空格
             $('#text-edit').val(calcImgRemark)

+ 1 - 1
sql/update.sql

@@ -82,4 +82,4 @@ ADD COLUMN `pre_sf_tp`  decimal(24,8) NULL DEFAULT NULL COMMENT '截止上期实
 -- ----------------------------
 
 ALTER TABLE `zh_stage_detail`
-ADD COLUMN `calc_img_remark` TEXT NULL DEFAULT NULL AFTER `custom_define`;
+ADD COLUMN `calc_img_remark` TEXT NULL DEFAULT NULL COMMENT '草图备注' AFTER `custom_define`;